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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -77,12 +77,17 @@
                      jri.PRODUCT_NAME                                                       as productName,
                      jri.EQU_TYPE                                                           as equType,
                      jri.PRODUCT_PHOTO                                                      as proDuctPhoto,
+                     jri.BRAND_NAME                                                         as brandName,
+                     jri.EQU_PRICE                                                          as equPrice,
                      jfi.FACTORY_NUM                                                        as factoryNum,
                      jfi.PRODUCE_UNIT_NAME                                                  as produceUnitName,
                      date_format(jfi.PRODUCE_DATE,'%Y-%m-%d')                               as produceDate,
                      jfi.FACTORY_STANDARD                                                   as factoryStandard,
                      jfi.PRODUCT_QUALITY_YIELD_PROVE                                        as productQualityYieldProve,
-                     jfi.INS_USE_MAINTAIN_EXPLAIN                                           as insUseMaintainExplanin,
+                     jfi.INS_USE_MAINTAIN_EXPLAIN                                           as insUseMaintainExplain,
+                     jfi.IMPORTED                                                           as imported,
+                     jfi.PRODUCE_LICENSE_NUM                                                as produceLicenseNum,
+                     jfi.PRODUCE_COUNTRY                                                    as produceCountry,
                      jci.USC_UNIT_NAME                                                      as uscUnitName,
                      jci.USC_UNIT_CREDIT_CODE                                               as uscUnitCreditCode
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -924,6 +924,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
         jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
+        jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+        jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         this.updateById(jgInstallationNotice);
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -247,7 +247,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     private void createTaskModel(JgScrapCancel scrapCancel, String taskName, String submitType, String nextUserIds) {
-        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        ReginParams reginParams = this.getSelectedOrgInfo();
         TaskModelDto taskModelDto = new TaskModelDto();
         if ("1".equals(submitType)) {
             taskModelDto.setFlowCreateDate(scrapCancel.getCreateDate());
@@ -368,7 +368,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 createTaskModel(bean, taskName, "1", nextUserIds);
             } else {
                 // 已经在流程中，执行一步
-                ProcessTaskDTO processTaskDTO = submit(op, jgScrapCancelDto.getNextTaskId());
+                ProcessTaskDTO processTaskDTO = submit(jgScrapCancelDto.getNextTaskId());
                 String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
                 String taskName = processTaskDTO.getNextTask().get(0).getName();
                 this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -494,14 +494,13 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         }
     }
 
-    public ProcessTaskDTO submit(String op, String taskId) {
+    public ProcessTaskDTO submit(String taskId) {
         //组装信息
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
         dto.setTaskId(taskId);
-        dto.setComment("提交流程");
         HashMap<String, Object> map = new HashMap<>();
-        map.put("approvalStatus", op);
+        map.put("approvalStatus", "提交");
         dto.setVariable(map);
         return cmWorkflowService.complete(taskId, dto);
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTransferNoticeServiceImpl.java

@@ -759,6 +759,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
         jgTransferNotice.setNextTaskId(workflowResultDto.getNextTaskId());
+        jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+        jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         jgTransferNoticeMapper.updateById(jgTransferNotice);
 
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -514,7 +514,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
         detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
         detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
-        detail.put("insUseMaintainExplanin", JSON.parse(String.valueOf(detail.get("insUseMaintainExplanin"))));
+        detail.put("insUseMaintainExplain", JSON.parse(String.valueOf(detail.get("insUseMaintainExplain"))));
         detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
         detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
         detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));