优化

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -279,6 +279,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
             arrays1.add(Integer.parseInt(s));
         }
         data.setRepairProfessor(arrays1);
+        data.setContent(form.getContent());
         info.setData(JsonUtils.objectToJson(data));
         customFieldTemplateDataMapper.updateByPrimaryKey(info);
     }
@@ -288,8 +289,9 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         List<SysUserVO> vos = ListUtils.newArrayList();
         for(String name : users){
             SysUser u = sysUserService.selectByUsername(name);
-            if(u != null)
+            if(u != null){
                 vos.add(BeanConverterUtil.copyObjectProperties(u,SysUserVO.class));
+            }
         }
         return vos;
     }
@@ -824,7 +826,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         // 非计划转计划维修
         RepairApplicationForm form = repairApplicationFormMapper.selectByPrimaryKey(model.getId());
         // 根据状态判断是否需要完善维修记录
-        if(form.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
+        if(form.getStatus().intValue() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
             model.setRepairUserId(form.getRepairUserId());
             editRepairRecord(model,null);
         }
@@ -856,10 +858,10 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         if(queryForm == null){
             throw new DeniedException("审核的报修单不存");
         }
-        if(queryForm.getStatus() == RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue()){ // 非待审状态，不走
+        if(queryForm.getStatus().intValue() == RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue()){ // 非待审状态，不走
             RepairApplicationForm updForm = new RepairApplicationForm();
             updForm.setId(model.getId());
-            if(model.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
+            if(model.getStatus().intValue() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
                 // 通过报修
                 updForm.setStatus(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
                 // 维修描述&维修部门&维修专业&车间位置
@@ -877,7 +879,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
                 queryForm.setRepairProfessor(model.getRepairProfessor());
                 queryForm.setSbCph(model.getSbCph());
                 updateGenerateTicketDataForVerify(queryForm);
-            }else if(model.getStatus() == RepairApplicationFormStatusEnum.CALLER_REPAIR_CANCEL.getValue()){
+            }else if(model.getStatus().intValue() == RepairApplicationFormStatusEnum.CALLER_REPAIR_CANCEL.getValue()){
                 updForm.setStatus(RepairApplicationFormStatusEnum.CALLER_REPAIR_CANCEL.getValue());
             }else {
                 throw new DeniedException("提交状态值非法");
@@ -925,7 +927,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
             throw new DeniedException("不具备退回工单的权限");
         }
         RepairApplicationForm form = repairApplicationFormMapper.selectById(model.getId());
-        if(form.getStatus() != RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
+        if(form.getStatus().intValue() != RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
             throw new DeniedException("非待接单状态工单，不允许退出");
         }
         if(StringUtils.isBlank(model.getBackReason())){
@@ -1012,7 +1014,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         updForm.setId(form.getId());
         updForm.setStatus(RepairApplicationFormStatusEnum.RECEIVED.getValue());
         String type = CommonConstants.CALL_REPAIR_FAIL;
-        if(model.getVerifyStatus() == CommonConstants.STATUS_VERIFY_PASS){
+        if(model.getVerifyStatus().intValue() == CommonConstants.STATUS_VERIFY_PASS){
             // 同意转大修，将工作优先权修改为转大修
             updForm.setLevel(RepairApplicationFormLevelEnum.MRO.getValue());
             type = CommonConstants.CALL_REPAIR_FINISH;
@@ -1068,9 +1070,9 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
     @Override
     public RepairApplicationFormDTO dispatchRepair(RepairApplicationFormDTO model) {
         // 完成维修和维修上报的状态才给转派
-        if(model.getStatus() != RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue() &&
-        model.getStatus() != RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue() &&
-                model.getStatus() != RepairApplicationFormStatusEnum.MM_REPAIR_FAIL.getValue()){
+        if(model.getStatus().intValue() != RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue() &&
+        model.getStatus().intValue() != RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue() &&
+                model.getStatus().intValue() != RepairApplicationFormStatusEnum.MM_REPAIR_FAIL.getValue()){
             throw new DeniedException("该状态下不允许转派");
         }
         // 角色是否符合要求