维修

platform-dao/src/main/java/com/platform/dao/enums/SbTransFormTypeEnum.java

@@ -18,7 +18,7 @@ public enum SbTransFormTypeEnum {
      */
     UPDATE(1),
     /**
-     * 维修
+     * 维修完成
      */
     REPAIR(2),
     /**
@@ -28,7 +28,12 @@ public enum SbTransFormTypeEnum {
     /**
      * 巡检
      */
-    FILL_CHECK(4)
+    FILL_CHECK(4),
+    /**
+     * 报修
+     */
+    CALL_FOR_REPAIR(5),
+
     ;
     private final Integer value;
 

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -5,6 +5,7 @@ import com.platform.common.cache.DictCache;
 import com.platform.common.constant.CommonConstants;
 import com.platform.common.enums.DictTypeEnum;
 import com.platform.common.exception.DeniedException;
+import com.platform.common.model.OauthUser;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.common.validation.group.AddGroup;
@@ -13,11 +14,14 @@ import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.sb.SbChangeRecordDTO;
 import com.platform.dao.entity.repair.RepairApplicationForm;
+import com.platform.dao.entity.sb.SbChangeRecord;
 import com.platform.dao.entity.upms.SysConfig;
 import com.platform.dao.enums.RepairApplicationFormTypeEnum;
+import com.platform.dao.enums.SbTransFormTypeEnum;
 import com.platform.dao.enums.SysConfigEnum;
 import com.platform.dao.enums.SysRoleCodeEnum;
 import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
+import com.platform.dao.mapper.sb.SbChangeRecordMapper;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.NoticeNumberVO;
 import com.platform.dao.vo.export.repair.ExportRepairApplicationFormVO;
@@ -29,12 +33,16 @@ import com.platform.service.repair.strategy.RepairBaseStrategy;
 import com.platform.service.repair.strategy.RepairStrategyFactory;
 import com.platform.service.sb.SbChangeRecordService;
 import com.platform.service.upms.SysConfigService;
+import com.sun.org.apache.regexp.internal.RE;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.persistence.Id;
 import javax.servlet.http.HttpServletResponse;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -58,6 +66,8 @@ public class RepairApplicationFormController {
 
     private final RepairApplicationFormMapper repairApplicationFormMapper;
 
+    private final SbChangeRecordMapper sbChangeRecordMapper;
+
     /**
      * 通过id查询单条记录
      *
@@ -87,6 +97,22 @@ public class RepairApplicationFormController {
         return new R<>(repairApplicationFormService.getCountByDTO(repairApplicationFormDTO));
     }
 
+    public void setKey(SbChangeRecord t) {
+        Field[] fields = t.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            Annotation id = field.getAnnotation(Id.class);
+            if (id == null) {
+                continue;
+            }
+            try {
+                field.setAccessible(true);
+                field.set(t, IdGeneratorUtils.getObjectId());
+            } catch (IllegalAccessException e) {
+//                log.error("主键赋值异常");
+            }
+        }
+    }
+
     /**
      * 新增记录
      *
@@ -97,7 +123,22 @@ public class RepairApplicationFormController {
     @PostMapping
     @PreAuthorize("@pms.hasPermission('repair-application-forms-add')")
     public R save(@Validated({AddGroup.class}) @RequestBody RepairApplicationFormDTO repairApplicationFormDTO) {
-        return new R<>(RepairStrategyFactory.getStrategy(repairApplicationFormDTO.getCategory()).callRepair(repairApplicationFormDTO));
+        RepairApplicationForm form = RepairStrategyFactory.getStrategy(repairApplicationFormDTO.getCategory()).callRepair(repairApplicationFormDTO);
+        String sbId =repairApplicationFormMapper.selectById(repairApplicationFormDTO.getId()).getSbId();
+        SbChangeRecord sbChangeRecord = new SbChangeRecord();
+        sbChangeRecord.setCreatedTime(LocalDateTime.now());
+        sbChangeRecord.setUpdateTime(LocalDateTime.now());
+        sbChangeRecord.setTransformType(SbTransFormTypeEnum.CALL_FOR_REPAIR.getValue());
+        sbChangeRecord.setSbId(sbId);
+        OauthUser user = SecurityUtils.getUser();
+        if (user != null) {
+            UserInfo userInfo = user.getUserInfo();
+            sbChangeRecord.setCreatedUserId(userInfo.getUserId());
+            sbChangeRecord.setCreatedUserName(userInfo.getRealName());
+        }
+        setKey(sbChangeRecord);
+        sbChangeRecordMapper.insertSelective(sbChangeRecord);
+        return new R<>(form);
     }
 
     /**
@@ -243,6 +284,8 @@ public class RepairApplicationFormController {
     @PreAuthorize("@pms.hasPermission('repair-application-forms-examine')")
     public R finish(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody RepairApplicationFormDTO repairFormDTO) {
         RepairStrategyFactory.getStrategy(repairFormDTO.getCategory()).handleRepair(repairFormDTO);
+
+
         //repairApplicationFormService.finish(repairFormDTO);
         return new R<>();
     }
@@ -259,6 +302,20 @@ public class RepairApplicationFormController {
     public R examineApply(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody RepairApplicationFormDTO repairFormDTO) {
         repairFormDTO.setId(id);
         RepairStrategyFactory.getStrategy(repairFormDTO.getCategory()).submitRepair(repairFormDTO);
+        String sbId =repairApplicationFormMapper.selectById(repairFormDTO.getId()).getSbId();
+        SbChangeRecord sbChangeRecord = new SbChangeRecord();
+        sbChangeRecord.setCreatedTime(LocalDateTime.now());
+        sbChangeRecord.setUpdateTime(LocalDateTime.now());
+        sbChangeRecord.setTransformType(SbTransFormTypeEnum.REPAIR.getValue());
+        sbChangeRecord.setSbId(sbId);
+        OauthUser user = SecurityUtils.getUser();
+        if (user != null) {
+            UserInfo userInfo = user.getUserInfo();
+            sbChangeRecord.setCreatedUserId(userInfo.getUserId());
+            sbChangeRecord.setCreatedUserName(userInfo.getRealName());
+        }
+        setKey(sbChangeRecord);
+        sbChangeRecordMapper.insertSelective(sbChangeRecord);
         return new R<>();
     }
 
@@ -305,7 +362,6 @@ public class RepairApplicationFormController {
         //repairApplicationFormService.receive(id);
         return new R<>();
     }
-
     @SysLog("接单维修单")
     @PutMapping("/receive/repair")
     public R receiveRepairForm(@RequestBody RepairApplicationFormDTO applicationFormDTO) {
@@ -317,11 +373,6 @@ public class RepairApplicationFormController {
     @PutMapping("/close/repair")
     public R closeRepair(@RequestBody RepairApplicationFormDTO applicationFormDTO) {
         RepairStrategyFactory.getStrategy(applicationFormDTO.getCategory()).closeRepair(applicationFormDTO);
-        RepairApplicationForm form =  repairApplicationFormMapper.selectById(applicationFormDTO.getId());
-        SbChangeRecordDTO dto = new SbChangeRecordDTO();
-        dto.setTransformType(2);
-        dto.setSbId(form.getSbId());
-        sbChangeRecordService.saveModelByDTO(dto);
         return new R<>();
     }
 

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskServiceImpl.java

@@ -419,6 +419,25 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
         if(waitNum <= 0){
             updTask.setWaitNum(0);
             updTask.setStatus(FillGatherTaskStatusEnum.COMPLETED.getValue());
+            List<FillGatherTaskDetailDTO> fillGatherTaskDetailDTOS = model.getDetails();
+            List<SbChangeRecord> list = new ArrayList<>();
+            for (String id:model.getSbIds()) {
+                SbChangeRecord sbChangeRecord = new SbChangeRecord();
+                sbChangeRecord.setCreatedTime(LocalDateTime.now());
+                sbChangeRecord.setUpdateTime(LocalDateTime.now());
+                sbChangeRecord.setTransformType(SbTransFormTypeEnum.FILL_CHECK.getValue());
+                sbChangeRecord.setSbId(id);
+                OauthUser user = SecurityUtils.getUser();
+                if (user != null) {
+                    UserInfo userInfo = user.getUserInfo();
+                    sbChangeRecord.setCreatedUserId(userInfo.getUserId());
+                    sbChangeRecord.setCreatedUserName(userInfo.getRealName());
+                }
+                setKey(sbChangeRecord);
+                list.add(sbChangeRecord);
+
+            }
+            sbChangeRecordMapper.insertListforComplex(list);
         }
         mapper.updateByPrimaryKeySelective(updTask);
     }
@@ -516,24 +535,6 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
         task.setUpdateTime(LocalDateTime.now());
         task.setStatus(model.getStatus());
         mapper.updateByPrimaryKeySelective(task);
-        List<SbChangeRecord> list = new ArrayList<>();
-        for (String id:model.getSbIds()) {
-            SbChangeRecord sbChangeRecord = new SbChangeRecord();
-            sbChangeRecord.setCreatedTime(LocalDateTime.now());
-            sbChangeRecord.setUpdateTime(LocalDateTime.now());
-            sbChangeRecord.setTransformType(SbTransFormTypeEnum.FILL_CHECK.getValue());
-            sbChangeRecord.setSbId(id);
-            OauthUser user = SecurityUtils.getUser();
-            if (user != null) {
-                UserInfo userInfo = user.getUserInfo();
-                sbChangeRecord.setCreatedUserId(userInfo.getUserId());
-                sbChangeRecord.setCreatedUserName(userInfo.getRealName());
-            }
-            setKey(sbChangeRecord);
-            list.add(sbChangeRecord);
-
-        }
-        sbChangeRecordMapper.insertListforComplex(list);
         // 通知巡检人
         //sendMessageToChecker(mapper.selectByPrimaryKey(task.getId()),null);
     }