更新

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

@@ -22,7 +22,7 @@
         ur.instance_id as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
-       ifnull(ur.next_execute_ids,'') as nextExecuteIds,
+       ur.next_execute_ids as nextExecuteIds,
         ur.promoter
         from tzs_jg_use_registration ur
         LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id

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

@@ -98,8 +98,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setSupervisoryCode(supervisoryCode);
         jgUseRegistration.setUseUnitName(useInfo.getUseUnitName());
         jgUseRegistration.setUseUnitCreditCode(useInfo.getUseUnitCreditCode());
+        jgUseRegistration.setUseUnitCreditCode("91610131628001738N");
+        if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))){
             jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
+        }
+        if (!ObjectUtils.isEmpty(map.get("inspectOrgName"))){
             jgUseRegistration.setInspectUnitName(map.get("inspectOrgName").toString());
+        }
 
 
         if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
@@ -129,7 +134,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 // 启动并执行流程
                 instanceId = startByVariable();
                 jgUseRegistration.setInstanceStatus("1460532889249755137");
-                jgUseRegistration.setUseUnitCreditCode("91610131628001738N");
                 jgUseRegistration.setReceiveCompanyCode("610000");
             }
 
@@ -283,7 +287,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         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("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+//        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
         return detail;
     }