修改保存并提交bug

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

@@ -132,7 +132,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode) {
-        map.remove("submit");
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getEquId, equipId);
@@ -208,9 +207,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgRelationEquipMapper.insert(jgRelationEquip);
         }
         // 暂存历史表
-        Object submit = map.get("submit");
         updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
-        if (!ObjectUtils.isEmpty(submit)) {
+        if (!ObjectUtils.isEmpty(map.get("submit"))) {
             // 删除暂存代办
             commonServiceImpl.deleteTaskModel(String.valueOf(jgUseRegistration.getSequenceNbr()));
             String instanceId = "";
@@ -490,6 +488,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode() + "_" + jgUseRegistration.getReceiveOrgName());
             jsonObject.put("status", jgUseRegistration.getStatus());
             jsonObject.put("applyNo", jgUseRegistration.getApplyNo());
+            jsonObject.remove("submit");
+            jsonObject.remove("instanceId");
             return jsonObject;
         }
         Map<String, Object> detail = this.baseMapper.getDetail(id);