报修审核

platform-service/src/main/java/com/platform/service/customize/impl/CustomFieldTemplateDataServiceImpl.java

@@ -419,6 +419,10 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
                             vo.setRealUserName("未知审核人");
                         }
                         break;
+                    case 24:
+                        vo.setStatus(25);
+                        vo.setRealUserName(sysUserMapper.selectByPrimaryKey(form.getVerifyRepairUserId()).getRealName());
+                        break;
             }
             list.add(vo);
         }

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -271,7 +271,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     }
                     // 待审核
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue()){
-                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     // 已完成
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
@@ -559,10 +559,13 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFY_FAIL_TWO.getValue());
                     statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFYING_THREE.getValue());
                     statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFY_FAIL_THREE.getValue());
+                    statusList.add(RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue());
+                    statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_CANCEL.getValue());
                 }else if(record.getSearchType() == 2){ // 我的维修--废弃
                     record.setRepairUserId(userInfo.getUserId());
                 }else if(record.getSearchType() == 3){ // 接单大厅-维修人和班组长
                     record.setRepairUserId(null);
+                    record.setDispatchUserId(null);
                     record.setRepairDeptId(sysUserDeptMapper.selectDeptIdByUserId(userInfo.getUserId()));
                     statusList.add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
                 }else if(record.getSearchType() == 4){ // 待接工单-维修工程师
@@ -615,12 +618,14 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     record.setRepairDeptId(null);
                     record.setReportLeaderId(null);
                 }
+                record.setStatusList(statusList);
                 // 前端报修审核
-                if(StringUtils.isNotBlank(record.getVerifyRepairUserId()) && record.getSearchType() == -1
-                        && 3 == record.getStatus()){
-                    record.setStatus(RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue());
+                if(StringUtils.isNotBlank(record.getVerifyRepairUserId()) && record.getSearchType() == -1){
+                    if(record.getStatus() != null && 3 == record.getStatus()){
+                        record.setStatus(RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue());
+                        record.setStatusList(null);
+                    }
                 }
-                record.setStatusList(statusList);
             }
         }
         record.setRepairDeptId(repairDeptId);

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

@@ -854,6 +854,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
             });
         }
         repairApplicationFormMapper.updateByPrimaryKeySelective(updForm);
+        addRepairStatusRecord(updForm,"报修审核");
         sendMessageToRepairManger(queryForm,mmScb,CommonConstants.CALL_REPAIR_NOTICE);
         // 给值班人员发送消息
         if(isSendMessage()){