1.工作台详情url参数处理bug

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

@@ -234,13 +234,13 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 commonService.saveExecuteFlowData2Redis(model.getProcessInstanceId(), this.buildInstanceRuntimeData(model));
             } else if ("1".equals(model.getOperationType())) {  //  工作台暂存、详情保存逻辑
 
-                if(null == model.getSequenceNbr()){
+                if (null == model.getSequenceNbr()) {
                     // 工作台暂存
                     model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
                     model.setStatusName(FlowStatusEnum.TO_BE_SUBMITTED.getName());
                 } else {
-                  // 详情保存
-                  log.info("详情保存,不修改业务状态");
+                    // 详情保存
+                    log.info("详情保存,不修改业务状态");
                 }
                 setNameAndIsMustAccept(model);
             }
@@ -428,12 +428,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         return this.buildRedundancyField(model);
     }
 
-    private String null2String(Object obj){
-        return obj  == null ? "" : obj.toString();
+    private String null2String(Object obj) {
+        return obj == null ? "" : obj.toString();
     }
 
     private void setNameAndIsMustAccept(JyjcInspectionApplicationModel model) {
-        if(model.getInspectionUnitCode() !=  null){
+        if (model.getInspectionUnitCode() != null) {
             String[] inspectionUnit = model.getInspectionUnitCode().split("_");
             if (inspectionUnit.length == 2) {
                 model.setInspectionUnitCode(inspectionUnit[0]);
@@ -592,7 +592,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         List<Map<String, Object>> arrayList = new ArrayList<>();
         equips.forEach(equip -> {
             Map<String, Object> objectHashMap = new HashMap<>();
-            BeanUtil.beanToMap(equip, objectHashMap, false,false);
+            BeanUtil.beanToMap(equip, objectHashMap, false, false);
             objectHashMap.put("record", equip.getSEQUENCE_NBR());
             objectHashMap.put("ADDRESS", concatDetailAddress(equip));
             arrayList.add(objectHashMap);
@@ -605,7 +605,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         String usePlace = esEquipmentCategoryDto.getUSE_PLACE();
         // 详细地址
         String address = esEquipmentCategoryDto.getADDRESS();
-        return String.format("%s%s",usePlace, address);
+        return String.format("%s%s", usePlace, address);
     }
 
     private Iterable<ESEquipmentCategoryDto> getEsEquipmentCategoryDtos(Long sequenceNbr) {
@@ -1106,9 +1106,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         params.put("taskStatusLabel", model.getStatusName());
         params.put("flowStatus", model.getStatus());
         params.put("flowStatusLabel", model.getStatusName());
-        JSONObject jsonModel = (JSONObject)JSONObject.toJSON(model);
+        JSONObject jsonModel = (JSONObject) JSONObject.toJSON(model);
         taskModelService.removeNoUsedKey(jsonModel);
-        params.put("model", jsonModel);
+        Map<String, Object> modelMap = new HashMap<>(jsonModel);
+        params.put("model", BeanUtil.toBeanIgnoreError(modelMap, JyjcInspectionApplicationModel.class));
         return taskModelService.updateTaskModel(params);
     }