Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java

@@ -76,6 +76,11 @@ public enum OperatorTypeEnum {
     LAWS_INVENTORY_STUDIO_EXPEDITING("法规清单-studio催办","lawsInventoryStudioExpediting"),
     LAWS_INVENTORY_REGULATION_OWNER_EXPEDITING("法规清单-法规工程师催办","lawsInventoryRegulationOwnerExpediting"),
     LAWS_INVENTORY_ENGINEERING_INTERFACE_PERSON_EXPEDITING("法规清单-工程接口人催办","lawsInventoryEngineeringInterfacePersonExpediting"),
+
+    /**
+     * 待办中心-将法规工程师的法规清单确认待办任务转为已办
+     */
+    TO_DO_CENTER_FG_CONVERT_TO_HAVE_DONE("待办中心，法规工程师待办任务转为已办","toDoCenterFgConvertToHaveDone"),
     ;
 
     String name;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -3194,6 +3194,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			this.sendMessageByTemplateId(templateId,prarams);
 		}
 
+		// 将法规工程师的 法规清单确认待办中心任务转为已办
+		if(StringUtils.equals(operatorType,OperatorTypeEnum.TO_DO_CENTER_FG_CONVERT_TO_HAVE_DONE.getValue())){
+			String projectLawsInventoryId = jsonObject.getString("id");
+			ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectById(projectLawsInventoryId);
+			if(StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+					||StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){
+				// 如果该条法规清单的设计、验证符合性流程都发起了，将法规工程师在待办中心的待办任务转为已办
+				LambdaUpdateWrapper<ProcessInfoDetailEO> pidUpdateWrap = new LambdaUpdateWrapper<>();
+				pidUpdateWrap.eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.QDQR.getValue());
+				pidUpdateWrap.eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryId);
+				pidUpdateWrap.set(ProcessInfoDetailEO::getStatus,TaskStatusEnum.HAVE_DONE.getValue());
+				this.processInfoDetailEOService.update(pidUpdateWrap);
+			}
+		}
+
 		return new Result<>().success("调用成功！");
 	}
 

jero-web/src/common/lang/en-us.js

@@ -1739,5 +1739,5 @@ module.exports = {
   verifyConformanceConfirmation:'Verify conformance confirmation',
   designConformanceVerification:'Design conformance verification',
   nomorethan:'No more than 10',
-  uploadedfilelarger:'The uploaded file is larger than 50 MB',
+  uploadedfilelarger:'The uploaded file is larger than',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1841,5 +1841,5 @@ module.exports = {
   verifyConformanceConfirmation:'验证符合性确认',
   designConformanceVerification:'设计符合性确认',
   nomorethan:'不能超过10个',
-  uploadedfilelarger:'文件大于50M',
+  uploadedfilelarger:'文件大于',
 }

jero-web/src/components/uploadFile/file.vue

@@ -103,7 +103,7 @@
           const isLt2KB = file.size / 1024 /1024 < this.size
           let name = file.name
           if (!isLt2KB) {
-            this.$message.error(name + this.$t('uploadedfilelarger'))
+            this.$message.error(name + this.$t('uploadedfilelarger') + this.size + 'M')
             return false
           }
         }

jero-web/src/components/uploadFileOta/file.vue

@@ -34,7 +34,7 @@
 
   export default {
     name: 'file',
-    props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'],
+    props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl','size', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'],
     data() {
       return {
         visible: false,
@@ -98,6 +98,15 @@
             return false
           }
         }
+        // 根据大小拦截
+        if(this.size){
+          const isLt2KB = file.size / 1024 /1024 < this.size
+          let name = file.name
+          if (!isLt2KB) {
+            this.$message.error(name + this.$t('uploadedfilelarger')  + this.size + 'M')
+            return false
+          }
+        }
         if (this.isMultiple) {
           if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) {
             this.$message.warning(this.$t('onlyOnefileUploaded'))