维修代码修改

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FailureRepairlogDto.java

@@ -44,4 +44,7 @@ public class FailureRepairlogDto extends BaseDto {
     @ApiModelProperty(value = "设备故障报修主表ID")
     private Long faultId;
 
+    @ApiModelProperty(value = "操作人中文名称")
+    private String processAuditorCid;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FailureMaintain.java

@@ -45,7 +45,7 @@ public class FailureMaintain extends BaseEntity {
      * 所属部门ID
      */
 	@TableField("biz_id")
-    private String bizId;
+    private Long bizId;
 
     /**
      * 所属部门

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FailureRepairlog.java

@@ -61,4 +61,10 @@ public class FailureRepairlog extends BaseEntity {
 	@TableField("fault_id")
     private Long faultId;
 
+    /**
+     * 操作人中文名称
+     */
+    @TableField("process_auditor_name")
+    private  String processAuditorCid;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureMaintainController.java

@@ -39,8 +39,7 @@ public class FailureMaintainController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<Object> save(@RequestBody FailureMaintainDto model) {
-	    failureMaintainServiceImpl.savemodel(model,getSelectedOrgInfo());
-	    return ResponseHelper.buildResponse(model);
+	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.savemodel(model,getSelectedOrgInfo()));
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureAuditServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
@@ -25,6 +26,9 @@ import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
 import com.yeejoin.amos.boot.module.common.api.mapper.FailureAuditMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureAuditService;
 
+import static com.yeejoin.amos.boot.module.common.biz.service.impl.FailureDetailsServiceImpl.EMERGENCY_COMMAND;
+import static com.yeejoin.amos.boot.module.common.biz.service.impl.FailureDetailsServiceImpl.PROCESS_NAME;
+
 /**
  * 服务实现类
  *
@@ -60,22 +64,25 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      * 发起审核
      */
     @Transactional
-    public Object savemodel(FailureAuditDto model, ReginParams userInfo) throws Exception {
+    public Object savemodel(FailureAuditDto model, ReginParams userInfo) {
 
         int condition = Integer.parseInt(model.getCondition());
         model.setAuditTime(new Date());
         model.setAuditDepartmentId(userInfo.getDepartment().getSequenceNbr());
-        model.setAuditor(userInfo.getRole().getRoleName());
+        model.setAuditor(userInfo.getUserModel().getUserName());
         model.setAuditDepartment(userInfo.getDepartment().getDepartmentName());
 
+        FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
         try {
             //根据审核的结果进行业务操作
-            if (condition == AuditResultEnum.AGREE.getCode()) {
-                updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo,condition);
+            if (condition == AuditResultEnum.AGREE.getCode()  && userInfo.getDepartment().getSequenceNbr().equals(failureDetailsDto.getBizCode())) {
+                updateStatus(model, FailureStatuEnum.WAITING_AUDIT, userInfo,condition);
             } else if (condition == (AuditResultEnum.REFUSE.getCode())) {
                 updateStatus(model, FailureStatuEnum.REFUSE, userInfo,condition);
             } else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
                 updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo,condition);
+            } else if  (condition == AuditResultEnum.AGREE.getCode() ) {
+                updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo,condition);
             }
 
             FailureAuditDto withModel = this.createWithModel(model);
@@ -99,15 +106,16 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
         //当前角色部门id为应急指挥科的时候 并且同意时 不修改主表状态 依然为待审核
         //当前角色部门id为维修部门的时候 修改状态
-        if (userInfo.getDepartment().getSequenceNbr() == failureDetailsDto.getBizCode()
-                && condition == AuditResultEnum.AGREE.getCode()){
+
+        /*Map<String, Object> stringObjectMap = failureDetailsService.checkExcuteTaskAuthMap(failureDetailsDto.getSequenceNbr(), userInfo);
+        String  name = stringObjectMap.get("name").toString();
+        if (name.contains(EMERGENCY_COMMAND)) {
             failureDetailsDto.setCurrentStatus(failureDetailsDto.getCurrentStatus());
-        }else if (userInfo.getDepartment().getSequenceNbr() != failureDetailsDto.getBizCode()
-                ) {
-            failureDetailsDto.setCurrentStatus(status.getCode());
-        }
+        }*/
+        failureDetailsDto.setCurrentStatus(status.getCode());
         failureDetailsDto.setSequenceNbr(model.getFaultId());
-        failureDetailsService.updateWithModel(failureDetailsDto);
+        FailureDetailsDto failureDetailsDtos = failureDetailsService.updateWithModel(failureDetailsDto);
+        System.out.println(failureDetailsDtos);
 
         String conditionText;
         boolean result = failureDetailsService.checkExcuteTaskAuth(failureDetailsDto.getSequenceNbr(), userInfo);
@@ -118,18 +126,17 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
             String processDepartment = model.getAuditDepartment();
             String processAuditor = model.getAuditor();
             Integer processAuditorId =Integer.parseInt(userInfo.getUserModel().getUserId()) ;
+            String processAuditorCid = userInfo.getUserModel().getUserName();
             Long auditDepartmentId = (userInfo.getDepartment().getSequenceNbr());
             if (condition == AuditResultEnum.AGREE.getCode()  ) {
                 conditionText = AuditResultEnum.AGREE.getName();
-                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
-            }
-            if (condition == AuditResultEnum.SEND_BACK.getCode()) {
+                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText,processAuditorCid);
+            } else if (condition == AuditResultEnum.SEND_BACK.getCode()) {
                 conditionText = AuditResultEnum.SEND_BACK.getName();
-                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
-            }
-            if (condition == AuditResultEnum.REFUSE.getCode()){
+                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText,processAuditorCid);
+            } else if (condition == AuditResultEnum.REFUSE.getCode()){
                 conditionText = AuditResultEnum.REFUSE.getName();
-                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
+                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText,processAuditorCid);
             }
             failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo,condition+"");
             return true;
@@ -141,7 +148,8 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      * 添加报修日志
      */
     @Transactional
-    public void repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId,Date processTime, String processDepartment, String processResult) {
+    public Boolean repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId,Date processTime,
+                          String processDepartment, String processResult,String processAuditorCid) {
         FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
         failureRepairlogDto.setFaultId(faultId);
         failureRepairlogDto.setProcessAuditor(processAuditor);
@@ -150,7 +158,12 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         failureRepairlogDto.setProcessTime(processTime);
         failureRepairlogDto.setProcessDepartment(processDepartment);
         failureRepairlogDto.setProcessResult(processResult);
+        failureRepairlogDto.setProcessAuditorCid(processAuditorCid);
         failureRepairlogService.createWithModel(failureRepairlogDto);
+        if (ObjectUtils.isNotEmpty(failureRepairlogDto)){
+            return true;
+        }
+        return false;
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -295,7 +295,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 				String processDepartment = userInfo.getDepartment().getDepartmentName();
 				Long departmentId= userInfo.getDepartment().getSequenceNbr();
 				Date processTime = model.getSubmissionTime();
-				repairlog(faultId, processAuditor,processAuditorId,departmentId, processTime, processDepartment, processResult);
+				String processAuditorCid = userInfo.getUserModel().getUserName();
+				repairlog(faultId, processAuditor,processAuditorId,departmentId, processTime, processDepartment, processResult,processAuditorCid);
 			}catch (Exception e){
 				e.printStackTrace();
 				logger.info("添加流程日志到数据库失败");
@@ -325,8 +326,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	 * 添加报修日志
 	 */
 	@Transactional
-	public Boolean repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId, Date processTime, String processDepartment,
-			String processResult) {
+	public Boolean repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId,Date processTime,
+						  String processDepartment, String processResult,String processAuditorCid) {
 		FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
 		failureRepairlogDto.setFaultId(faultId);
 		failureRepairlogDto.setProcessAuditor(processAuditor);
@@ -335,8 +336,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		failureRepairlogDto.setProcessTime(processTime);
 		failureRepairlogDto.setProcessDepartment(processDepartment);
 		failureRepairlogDto.setProcessResult(processResult);
-		FailureRepairlogDto RepairlogModel = failureRepairlogService.createWithModel(failureRepairlogDto);
-		if (ObjectUtils.isNotEmpty(RepairlogModel)){
+		failureRepairlogDto.setProcessAuditorCid(processAuditorCid);
+		FailureRepairlogDto repairlogModel = failureRepairlogService.createWithModel(failureRepairlogDto);
+		if (ObjectUtils.isNotEmpty(repairlogModel)){
 			return true;
 		}
 		return false;

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureMaintainServiceImpl.java

@@ -41,6 +41,8 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     @Autowired
     FailureRepairlogServiceImpl failureRepairlogService;
 
+    private static String RECORE_TYPE = "维修记录";
+
     private final Logger logger = LoggerFactory.getLogger(FailureMaintainServiceImpl.class);
 
     private static String[] MAINTENANCE_STATUS= {"维修完成","维修中"};
@@ -65,9 +67,16 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
      */
     public Object savemodel(FailureMaintainDto failureMaintainDto,ReginParams userInfo)   {
 
-        failureDetailsService.checkExcuteTaskAuthMap(failureMaintainDto.getFaultId(),userInfo);
-
+        boolean result = failureDetailsService.checkExcuteTaskAuth(failureMaintainDto.getFaultId(), userInfo);
+        if (!result){
+            return false;
+        }
         try {
+            failureMaintainDto.setMaintainMan(userInfo.getUserModel().getUserName());
+            failureMaintainDto.setMaintainTime(new Date());
+            failureMaintainDto.setDepartment(userInfo.getDepartment().getDepartmentName());
+            failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr());
+            failureMaintainDto.setRecoreType(RECORE_TYPE);
             this.createWithModel(failureMaintainDto);
             //添加完成后修改保修单状态为待验收
             FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
@@ -77,13 +86,14 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
             //添加报修日志
             String processResult = MAINTENANCE_STATUS[1];//维修中
             Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
+            String processAuditorCid = userInfo.getUserModel().getUserName();
             repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),processAuditorId,userInfo.getDepartment().getSequenceNbr(),failureMaintainDto.getMaintainTime(),
-                    failureMaintainDto.getDepartment(),processResult);
+                    failureMaintainDto.getDepartment(),processResult,processAuditorCid);
 
             if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())){
                 sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),failureMaintainDto.getAttachment());
             }
-            failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, null);
+            failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, failureMaintainDto.getCondition());
         }catch (Exception e){
             e.printStackTrace();
             e.printStackTrace();
@@ -109,13 +119,14 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
         //添加报修日志
         String processResult = MAINTENANCE_STATUS[0];//维修完成
         Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
+            String processAuditorCid = userInfo.getUserModel().getUserName();
         repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),processAuditorId,userInfo.getDepartment().getSequenceNbr(),failureMaintainDto.getMaintainTime(),
-                failureMaintainDto.getDepartment(),processResult);
+                failureMaintainDto.getDepartment(),processResult,processAuditorCid);
 
         if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())){
             sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),failureMaintainDto.getAttachment());
         }
-        failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, null);
+        failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, failureMaintainDto.getCondition());
     }catch (Exception e){
         e.printStackTrace();
         logger.info("更新故障验收信息到数据库失败");
@@ -144,12 +155,12 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
                 failureDetailsService.updateWithModel(failureDetailsDto);
                 processResult =PROCESS_RESULT[0] ;
                 condition= AuditResultEnum.AGREE.getName();
-            }else if (status == AuditResultEnum.AGREE.getCode() ) {//同意状态为已完结
+            }  else if (status == AuditResultEnum.AGREE.getCode() ) {//同意状态为已完结
                 failureDetailsDto.setCurrentStatus(failureDetailsDto.getCurrentStatus());
                 failureDetailsService.updateWithModel(failureDetailsDto);
                 processResult =PROCESS_RESULT[0] ;
                 condition= AuditResultEnum.AGREE.getName();
-            } else {//不同意状态为已拒绝
+            }  else {//不同意状态为已拒绝
                 failureDetailsDto.setCurrentStatus(FailureStatuEnum.REFUSE.getCode());
                 failureDetailsService.updateWithModel(failureDetailsDto);
                 processResult = PROCESS_RESULT[1];
@@ -157,8 +168,9 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
             }
             //添加报修日志
             Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
+            String processAuditorCid = userInfo.getUserModel().getUserName();
             repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),processAuditorId, userInfo.getDepartment().getSequenceNbr(),failureMaintainDto.getMaintainTime(),
-                    failureMaintainDto.getDepartment(),processResult);
+                    failureMaintainDto.getDepartment(),processResult,processAuditorCid);
             failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition);
             return true;
         }
@@ -178,15 +190,22 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     /**
      * 添加报修日志
      */
-    public void repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId, Date processTime, String processDepartment, String processResult) {
+    @Transactional
+    public Boolean repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId,Date processTime,
+                          String processDepartment, String processResult,String processAuditorCid) {
         FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
         failureRepairlogDto.setFaultId(faultId);
         failureRepairlogDto.setProcessAuditor(processAuditor);
         failureRepairlogDto.setProcessAuditorId(processAuditorId);
+        failureRepairlogDto.setProcessDepartmentId(departmentId);
         failureRepairlogDto.setProcessTime(processTime);
         failureRepairlogDto.setProcessDepartment(processDepartment);
-        failureRepairlogDto.setProcessDepartmentId(departmentId);
         failureRepairlogDto.setProcessResult(processResult);
+        failureRepairlogDto.setProcessAuditorCid(processAuditorCid);
         failureRepairlogService.createWithModel(failureRepairlogDto);
+        if (ObjectUtils.isNotEmpty(failureRepairlogDto)){
+            return true;
+        }
+        return false;
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureRepairlogServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -21,6 +22,7 @@ import com.yeejoin.amos.boot.module.common.api.service.IFailureRepairlogService;
  * @date 2021-08-12
  */
 @Service
+@Transactional
 public class FailureRepairlogServiceImpl extends BaseService<FailureRepairlogDto,FailureRepairlog,FailureRepairlogMapper> implements IFailureRepairlogService {
     /**
      * 分页查询