修改报检新增

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -36,7 +36,7 @@
         LEFT JOIN cb_data_dictionary cdd3 ON cdd3.code = tzjia.inspection_type
         <where>
         <if test=" applicationNo != null and applicationNo != ''">
-            and application_no like concat('%',#{applicationNo}.'%')
+            and application_no like concat('%',#{applicationNo},'%')
         </if>
         <if test="inspectionClassify != null and inspectionClassify != ''">
             and inspection_classify = #{inspectionClassify}
@@ -63,7 +63,7 @@
             and accept_date = #{acceptDate}
         </if>
         <if test="inspectionChargePerson != null and inspectionChargePerson != ''">
-            and inspection_charge_person like concat('%',#{inspectionChargePerson}.'%')
+            and inspection_charge_person like concat('%',#{inspectionChargePerson},'%')
         </if>
         <if test="status != null and status != ''">
             and status = #{status}

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

@@ -108,6 +108,17 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     model.setProcessInstanceId(id);
                     execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", id).put("comments", "").build());
 
+
+                    // region 获取下一个流程节点的数据
+                    Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
+                    String role = (String) nextNodeInfo.get("role");
+                    model.setNextExecuteIds(role);
+                    if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
+                        model.setWorkflowRole(model.getWorkflowRole() + "," + role);
+                    } else {
+                        model.setWorkflowRole(role);
+                    }
+
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -128,15 +139,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
             model.setApplicationNo(codes.get(0));
             model.setApplicationDate(new Date());
-            // region 获取下一个流程节点的数据
-            Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
-            String role = (String) nextNodeInfo.get("role");
-            model.setNextExecuteIds(role);
-            if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
-                model.setWorkflowRole(model.getWorkflowRole() + "," + role);
-            } else {
-                model.setWorkflowRole(role);
-            }
 
             List<JyjcInspectionApplicationEquip>  equipInfos = new ArrayList<>();
             if (null != model.getEquip() && model.getEquip().size() > 0) {
@@ -153,7 +155,15 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             }
             model.setNumberOfEquip(equipInfos.size());
             // endregion
+
+            if (null == model.getSequenceNbr()){
                 model = this.createWithModel(model);
+            }else {
+                model = this.updateWithModel(model);
+            }
+
+
+
             //保存报检装备监管码
             for (JyjcInspectionApplicationEquip equipInfo : equipInfos) {
                 equipInfo.setApplicationSeq(model.getSequenceNbr());