Commit 65dcee8b authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.19' into MVP1.7.19

parents 1fde7221 dec577f6
......@@ -27,8 +27,13 @@ spec:
#dapr.io/sidecar-memory-limit: "800Mi" #Dapr sidecar可以使用的最大内存量。默认情况下未设置 请参阅 https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/ 的有效值。
#dapr.io/sidecar-cpu-request: 1 #Dapr sidecar要求的 CPU 数量
#dapr.io/sidecar-memory-request #Dapr sidecar 请求的内存数量
dapr.io/http-max-request-size: "100" #增加http和grpc服务器请求正文参数的最大大小,单位为MB,以处理大文件的上传。 默认值为 4 MB
dapr.io/http-read-buffer-size: "16" #Dapr has a default limit of 4KB for the http header read buffer size. When sending http headers that are bigger than the default 4KB, you can increase this value. Otherwise, you may encounter a Too big request header
dapr.io/app-max-request-size: "600" # 明确指定应用请求大小
dapr.io/http-max-request-size: "600" #增加http和grpc服务器请求正文参数的最大大小,单位为MB,以处理大文件的上传。 默认值为 4 MB
dapr.io/http-read-buffer-size: "4096" #Dapr has a default limit of 4KB for the http header read buffer size. When sending http headers that are bigger than the default 4KB, you can increase this value. Otherwise, you may encounter a Too big request header
# 新增gRPC配置
dapr.io/grpc-max-request-size: "600"
dapr.io/grpc-max-response-size: "600"
dapr.io/grpc-read-buffer-size: "32768"
#dapr.io/sidecar-listen-addresses: "0.0.0.0"
# 更多dapr配置请参考 https://www.bookstack.cn/read/dapr-1.5-zh/cc77b74e2cc2f4d4.md
spec:
......
......@@ -36,6 +36,10 @@ spec: # 资源规范字段
dapr.io/app-max-request-size: "600" # 明确指定应用请求大小
dapr.io/http-max-request-size: "600" #增加http和grpc服务器请求正文参数的最大大小,单位为MB,以处理大文件的上传。 默认值为 4 MB
dapr.io/http-read-buffer-size: "4096" #Dapr has a default limit of 4KB for the http header read buffer size. When sending http headers that are bigger than the default 4KB, you can increase this value. Otherwise, you may encounter a Too big request header
# 新增gRPC配置
dapr.io/grpc-max-request-size: "600"
dapr.io/grpc-max-response-size: "600"
dapr.io/grpc-read-buffer-size: "32768"
#dapr.io/sidecar-listen-addresses: "0.0.0.0" 开通外部访问,仅限测试环境
# 更多dapr配置请参考 https://www.bookstack.cn/read/dapr-1.5-zh/cc77b74e2cc2f4d4.md
......
......@@ -185,7 +185,6 @@ public class TFascTemplate extends BaseEntity {
@ExcelProperty("当前必填总数量")
private String isMustAll;
/**
* 是否删除0否1是
*/
......@@ -195,4 +194,5 @@ public class TFascTemplate extends BaseEntity {
@Schema(description = "是否删除0否1是")
private String deleteFlag;
}
......@@ -16,6 +16,7 @@
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -55,4 +56,8 @@ public class TFascTemplateSearchVo extends TFascTemplate {
@Schema(description = "查询limit 数据条数")
private int limitEnd;
//必填是否已配置0未配置1部分配置2已配置
@Schema(description = "必填是否已配置多个")
@TableField(exist = false)
private String[] isMustEditArray;
}
......@@ -293,8 +293,10 @@ public class TSettleDomainController {
.eq(TSettleDomain::getDepartNo, tSettleDomainSelectVo.getDepartNo())
.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
BeanUtils.copyProperties(tSettleDomain,tSettleDomainSelectVo);
if (tSettleDomain != null) {
BeanUtils.copyProperties(tSettleDomain, tSettleDomainSelectVo);
tSettleDomainSelectVo.setCustomerCode(tSettleDomain.getCustomerNo());
}
list.add(tSettleDomainSelectVo);
TSettleDomainListVo listVo = new TSettleDomainListVo();
listVo.setListSelectVO(list);
......
......@@ -41,11 +41,12 @@ public interface TFascTemplateMapper extends BaseMapper<TFascTemplate> {
* @param tFascTemplate 法大大专业版模板表
* @return
*/
IPage<TFascTemplate> getTFascTemplatePage(Page<TFascTemplate> page, @Param("tFascTemplate") TFascTemplate tFascTemplate);
IPage<TFascTemplate> getTFascTemplatePage(Page<TFascTemplate> page, @Param("tFascTemplate") TFascTemplateSearchVo tFascTemplate);
List<TFascTemplate> getTFascTemplateListAll(@Param("tFascTemplate") TFascTemplate tFascTemplate);
List<TFascTemplate> getTFascTemplateList(@Param("tFascTemplate") TFascTemplate tFascTemplate);
long getTFascTemplateExportCount(@Param("tFascTemplate") TFascTemplateSearchVo tFascTemplate, @Param("idList") List<String> idList);
List<TFascTemplateExportVo> getTFascTemplateExport(@Param("tFascTemplate") TFascTemplateSearchVo tFascTemplate, @Param("idList") List<String> idList);
/**
......
......@@ -101,7 +101,7 @@ public class TFascTemplateServiceImpl extends ServiceImpl<TFascTemplateMapper, T
//获取要导出的列表
List<TFascTemplateExportVo> list = new ArrayList<>();
List<String> idList = Common.getList(searchVo.getIds());
long count = noPageCountDiy(searchVo, idList);
long count = baseMapper.getTFascTemplateExportCount(searchVo, idList);
ServletOutputStream out = null;
try {
out = response.getOutputStream();
......
......@@ -137,6 +137,15 @@
<if test="tFascTemplate.isMustEdit != null and tFascTemplate.isMustEdit.trim() != ''">
AND a.is_must_edit = #{tFascTemplate.isMustEdit}
</if>
<if test="tFascTemplate.isMustEditArray != null and tFascTemplate.isMustEditArray.length > 0">
AND a.is_must_edit in
<foreach item="statusStr" index="index" collection="tFascTemplate.isMustEditArray" open="("
separator="," close=")">
#{statusStr}
</foreach>
</if>
<if test="tFascTemplate.createBy != null and tFascTemplate.createBy.trim() != ''">
AND a.CREATE_BY = #{tFascTemplate.createBy}
</if>
......@@ -222,6 +231,23 @@
</if>
</select>
<!--导出条数-->
<select id="getTFascTemplateExportCount" resultType="java.lang.Long">
SELECT
count(1)
FROM t_fasc_template a
<where>
a.delete_flag = '0'
<include refid="tFascTemplate_where"/>
<if test="idList != null and idList.size>0">
AND a.id in
<foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")">
#{idStr}
</foreach>
</if>
</where>
</select>
<!--获取所有要更新是否必填的模板数据-->
<select id="getTFascTemplateResutList" resultMap="tFascTemplateMap">
SELECT
......
......@@ -420,7 +420,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
// 1. 校验ZIP大小
long fileSize = file.getSize();
if (fileSize > ArchiveConstants.ZIP_MAX_SIZE) {
return R.failed("ZIP文件大小不能超过500M");
return R.failed("ZIP文件大小不能超过200M");
}
// 2. 校验ZIP不为空
......@@ -463,7 +463,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
// 调用异步处理(通过self代理对象调用,使@Async生效)
// 传递用户ID和用户名,因为异步线程无法获取用户上下文
self.asyncProcessUpload(taskId, user.getId(), user.getNickname());
asyncProcessUpload(taskId, user.getId(), user.getNickname());
return R.ok("ZIP文件提交成功,正在处理中");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment