修改注销报废提交申请单的返回值

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -252,12 +253,12 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         // 保存设备关系表
         saveEquip(noticeParams, jgScrapCancel);
 
-        String equListName = EquipmentClassifityEnum.getNameByCode(jgScrapCancel.getEquList());
-        jgScrapCancel.setEquListDesc(equListName);
         jgScrapCancel.setCancelTypeDesc(getRegistrationClass(jgScrapCancel.getCancelType()));
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(noticeParams));
         commonService.saveExecuteFlowData2Redis(instanceId, buildInstanceRuntimeData(jgScrapCancel));
-        save2HisData(jsonObject,jgScrapCancel);
+        String equListName = EquipmentClassifityEnum.getNameByCode(jsonObject.get("equListCode").toString());
+        jgScrapCancel.setEquListDesc(equListName);
+        save2HisData(jsonObject, jgScrapCancel);
         return jgScrapCancel;
     }
     //单位维度设备处理
@@ -505,7 +506,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     private String getRegistrationClass (String cancelType){
-        return "1".equals(cancelType) ? "报废注销" : "移装注销";
+        return CancelTypeEnum.SCRAPPED.getCode().equals(cancelType) ? CancelTypeEnum.SCRAPPED.getName() : CancelTypeEnum.TRANSFER.getName();
     }
 
     private void executeOneStep(JgScrapCancelDto jgScrapCancelDto, String taskName, String nextUserIds, String operate) {