添加流程

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureMaintainDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureMaintainServiceImpl;
@@ -37,8 +38,8 @@ public class FailureMaintainController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<FailureMaintainDto> save(@RequestBody FailureMaintainDto model) {
-	    model = failureMaintainServiceImpl.createWithModel(model);
+	public ResponseModel<FailureMaintainDto> save(@RequestBody FailureMaintainDto model, ReginParams userInfo) {
+	    model = failureMaintainServiceImpl.savemodel(model,userInfo);
 	    return ResponseHelper.buildResponse(model);
 	}
 
@@ -52,9 +53,9 @@ public class FailureMaintainController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "验收操作", notes = "根据sequenceNbr更新")
-	public ResponseModel<FailureMaintainDto> updateBySequenceNbrFailureMaintain(@RequestBody FailureMaintainDto model,Integer status,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<FailureMaintainDto> updateBySequenceNbrFailureMaintain(@RequestBody FailureMaintainDto model,Integer status,@PathVariable(value = "sequenceNbr") Long sequenceNbr,ReginParams userInfo) {
 	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateModel(model,status));
+	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateModel(model,status,userInfo));
 	}
 
 /*

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

@@ -56,8 +56,10 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      * 发起审核
      */
     public FailureAuditDto savemodel(FailureAuditDto model, ReginParams userInfo) throws Exception {
+
         this.createWithModel(model);
         Integer auditResult = model.getAuditResult();
+        //根据审核的结果进行业务操作
         if (auditResult.equals(AuditResultEnum.AGREE.getCode())) {
             updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN.getCode(), userInfo);
         } else if (auditResult.equals(AuditResultEnum.REFUSE.getCode())) {
@@ -72,6 +74,9 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      * 修改故障保修单任务状态
      */
     FailureDetailsDto updateStatus(FailureAuditDto model, Integer status, ReginParams userInfo) throws Exception {
+
+        failureDetailsService.checkExcuteTaskAuthMap(model.getSequenceNbr(),userInfo);
+
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
         failureDetailsDto.setCurrentStatus(status);
         failureDetailsDto.setSequenceNbr(model.getFaultId());
@@ -87,9 +92,10 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
             repairlog(faultId,processAuditor,processTime,processDepartment,condition);
         }
         condition = AuditResultEnum.REFUSE.getName();
-        repairlog(faultId,processAuditor,processTime,processDepartment,condition);
 
         failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo, condition);
+
+        repairlog(faultId,processAuditor,processTime,processDepartment,condition);
         return failureDetailsService.updateWithModel(failureDetailsDto);
     }
 

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

@@ -168,8 +168,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		FailureDetailsDto model = null;
 		try {
 			if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {
-				sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(),
-						failureDetailsDto.getAttachment());
+				sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), failureDetailsDto.getAttachment());
 			}
 			/* failureDetailsDto.set */
 			/* failureDetailsDto.set */

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureMaintainDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
@@ -50,9 +51,11 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     /**
      * 添加维修记录
      */
-    public FailureMaintainDto savemodel(FailureMaintainDto failureMaintainDto)   {
-        this.createWithModel(failureMaintainDto);
+    public FailureMaintainDto savemodel(FailureMaintainDto failureMaintainDto,ReginParams userInfo)   {
+        failureDetailsService.checkExcuteTaskAuthMap(failureMaintainDto.getFaultId(),userInfo);
 
+        failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, null);
+        this.createWithModel(failureMaintainDto);
         //添加完成后修改保修单状态为待验收
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
         failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_ACCEPTANCE.getCode());
@@ -80,23 +83,30 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     /**
      *根据审核结果更新维修表
      */
-    public FailureMaintainDto updateModel(FailureMaintainDto failureMaintainDto,Integer status)   {
+    public FailureMaintainDto updateModel(FailureMaintainDto failureMaintainDto, Integer status, ReginParams userInfo)   {
+
+        failureDetailsService.checkExcuteTaskAuthMap(failureMaintainDto.getFaultId(),userInfo);
 
         this.updateWithModel(failureMaintainDto);
         //根据status修改状态
         String processResult = new String();
+        String condition = new String();
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
         if (status == AuditResultEnum.AGREE.getCode()) {//同意状态为已完结
             failureDetailsDto.setCurrentStatus(FailureStatuEnum.FINISH.getCode());
             failureDetailsService.updateWithModel(failureDetailsDto);
             processResult = "验证通过";
+            condition= AuditResultEnum.AGREE.getName();
         }else {//不同意状态为已拒绝
             failureDetailsDto.setCurrentStatus(FailureStatuEnum.REFUSE.getCode());
             failureDetailsService.updateWithModel(failureDetailsDto);
             processResult = "验证未通过";
+            condition = AuditResultEnum.REFUSE.getName();
         }
-        //添加报修日志
 
+        failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition);
+
+        //添加报修日志
         repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),failureMaintainDto.getMaintainTime(),
                 failureMaintainDto.getDepartment(),processResult);
         return failureMaintainDto;