修改重新提交

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

@@ -24,7 +24,6 @@ public class FailureRepairlogDto extends BaseDto {
     @ApiModelProperty(value = "流程处理人Id")
     private Integer processAuditorId;
 
-
     @ApiModelProperty(value = "处理人所属部门")
     private String processDepartment;
 
@@ -41,6 +40,6 @@ public class FailureRepairlogDto extends BaseDto {
     private Long faultId;
 
     @ApiModelProperty(value = "流程处理人")
-    private String processAuditorCid;
+    private String processAuditorName;
 
 }

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

@@ -62,6 +62,4 @@ public class FailureRepairlog extends BaseEntity {
 	@TableField("fault_id")
     private Long faultId;
 
-
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
+import org.apache.ibatis.annotations.Param;
 
 /**
  *  Mapper 接口
@@ -10,4 +15,28 @@ import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
  * @date 2021-08-04
  */
 public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
+
+    /**
+     *查询全部 分页
+     * @param page
+     * @return
+     */
+    IPage<FailureDetails> selectAllPage(Page page);
+
+    /**
+     *查询我发起的 分页
+     * current 当前页
+     * size 条数
+     * @return
+     */
+    IPage<FailureDetails> selectISubPage(Page page, String submissionPid);
+
+    /**
+     *查询待处理 分页
+     * @param page
+     * @return
+     */
+    IPage<FailureDetails> selectInProcessing(Page page);
+
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper">
+    <select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+            sequence_nbr,
+            current_status,
+            current_status,
+            failure_equipment_id,
+            failure_equipment,
+            fault_time,
+            fault_phenomenon,
+            submission_name,
+            submission_pid,
+            biz_code,
+            submission_time,
+            submission_branch,
+            submission_branch_id
+        FROM
+            cb_failure_details
 
+    </select>
+
+    <select id="selectISubPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+            sequence_nbr,
+            current_status,
+            failure_equipment_id,
+            failure_equipment,
+            fault_time,
+            fault_phenomenon,
+            submission_name,
+            submission_pid,
+            biz_code,
+            submission_time,
+            submission_branch,
+            submission_branch_id
+        FROM
+            cb_failure_details
+        WHERE
+            submission_pid = #{submissionPid}
+
+    </select>
+
+    <select id="selectInProcessing" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+            sequence_nbr,
+            current_status,
+            current_status,
+            failure_equipment_id,
+            failure_equipment,
+            fault_time,
+            fault_phenomenon,
+            submission_name,
+            submission_pid,
+            biz_code,
+            submission_time,
+            submission_branch,
+            submission_branch_id
+        FROM
+            cb_failure_details
+        WHERE
+            is_delete = 0
+    </select>
 </mapper>

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

@@ -49,8 +49,6 @@ public class FailureAuditController extends BaseController {
 		}
 	}
 
-
-
     /**
      * 根据sequenceNbr查询
      *
@@ -64,35 +62,6 @@ public class FailureAuditController extends BaseController {
 	    return ResponseHelper.buildResponse(failureAuditServiceImpl.queryBySeq(sequenceNbr));
 	}
 
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<FailureAuditDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<FailureAuditDto> page = new Page<FailureAuditDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(failureAuditServiceImpl.queryForFailureAuditPage(page));
-	}
-
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<FailureAuditDto>> selectForList() {
-	    return ResponseHelper.buildResponse(failureAuditServiceImpl.queryForFailureAuditList());
-	}
 
 	/**
 	 * 审核列表记录查询

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

@@ -2,23 +2,23 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import java.util.List;
 
-import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
+
 import com.yeejoin.amos.boot.module.common.api.entity.FailureMaintain;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
+
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 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;
@@ -59,71 +59,6 @@ public class FailureMaintainController extends BaseController {
 	}
 
 	/**
-     * 根据sequenceNbr更新
-	 * 根据传递的Status状态确认验收状态
-     *
-     *
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/verify")
-	@ApiOperation(httpMethod = "PUT", value = "验收操作", notes = "根据sequenceNbr更新")
-	public Object updateBySequenceNbrFailureMaintain(@RequestBody FailureMaintainDto model) {
-		try {
-			return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateModel(model,getSelectedOrgInfo()));
-		} catch (Exception e) {
-			e.printStackTrace();
-			return ResponseHelper.buildResponse(false);
-		}
-	}
-
-
-/*
-	*/
-/**
-	 * 根据sequenceNbr更新
-	 * 根据传递的Status状态确认验收状态
-	 *
-	 * @param sequenceNbr 主键
-	 * @return
-	 *//*
-
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/update/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "维修完成", notes = "根据sequenceNbr更新")
-	public Object updateByFailureMaintain(@RequestBody FailureMaintainDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr)  {
-		model.setSequenceNbr(sequenceNbr);
-
-		try {
-			return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateStatus(model,getSelectedOrgInfo()));
-		} catch (Exception e) {
-			return ResponseHelper.buildResponse(false);
-		}
-	}
-*/
-
-
-
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<FailureMaintainDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<FailureMaintainDto> page = new Page<FailureMaintainDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.queryForFailureMaintainPage(page));
-	}
-
-
-	/**
 	 * 维修列表记录查询
 	 *根据关联主表faultId查询
 	 * @return

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

@@ -44,21 +44,7 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
     @Autowired
     FailureRepairlogServiceImpl failureRepairlogService;
 
-    private final Logger logger = LoggerFactory.getLogger(FailureAuditServiceImpl.class);
 
-    /**
-     * 分页查询
-     */
-    public Page<FailureAuditDto> queryForFailureAuditPage(Page<FailureAuditDto> page) {
-        return this.queryForPage(page, null, false);
-    }
-
-    /**
-     * 列表查询 示例
-     */
-    public List<FailureAuditDto> queryForFailureAuditList() {
-        return this.queryForList("", false);
-    }
 
     /**
      * 发起审核
@@ -75,23 +61,23 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
 
         int auditResult = 0;
-
+        Boolean repairResult = null;
         //根据审核的结果进行业务操作
         if (condition == AuditResultEnum.AGREE.getCode() && userInfo.getDepartment().getSequenceNbr().equals(failureDetailsDto.getBizCode())) {
             auditResult = AuditResultEnum.AGREE.getCode();
-            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_AUDIT, userInfo, condition);
+            repairResult = updateStatus(model, FailureStatuEnum.WAITING_AUDIT, userInfo, condition);
         } else if (condition == (AuditResultEnum.REFUSE.getCode())) {
             auditResult = AuditResultEnum.REFUSE.getCode();
-            Boolean repairResult = updateStatus(model, FailureStatuEnum.REFUSE, userInfo, condition);
+            repairResult = updateStatus(model, FailureStatuEnum.REFUSE, userInfo, condition);
         } else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
             auditResult = AuditResultEnum.SEND_BACK.getCode();
-            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo, condition);
+            repairResult = updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo, condition);
         } else if (condition == AuditResultEnum.AGREE.getCode()) {
             auditResult = AuditResultEnum.AGREE.getCode();
-            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo, condition);
+            repairResult = updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo, condition);
         }
 
-        if (ObjectUtils.isEmpty(auditResult)) {
+        if (!repairResult) {
             throw new Exception("添加报修日志失败");
         }
         model.setAuditResult(auditResult);
@@ -115,7 +101,7 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         //当前角色部门id为维修部门的时候 修改状态
         failureDetailsDto.setCurrentStatus(status.getCode());
         failureDetailsDto.setSequenceNbr(model.getFaultId());
-        FailureDetailsDto failureDetailsDtos = failureDetailsService.updateWithModel(failureDetailsDto);
+         failureDetailsService.updateWithModel(failureDetailsDto);
 
         String conditionText;
         boolean result = failureDetailsService.checkExcuteTaskAuth(failureDetailsDto.getSequenceNbr(), userInfo);
@@ -124,19 +110,18 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
             Long faultId = model.getFaultId();
             Date processTime = model.getAuditTime();
             String processDepartment = model.getAuditDepartment();
-          //  String processAuditor = model.getAuditor();
             Integer processAuditorId = Integer.parseInt(userInfo.getUserModel().getUserId());
-            String processAuditorCid = userInfo.getRole().getRoleName();
+            String processAuditorName = userInfo.getUserModel().getRealName();
             Long auditDepartmentId = (userInfo.getDepartment().getSequenceNbr());
             if (condition == AuditResultEnum.AGREE.getCode()) {
                 conditionText = AuditResultEnum.AGREE.getName();
-                repairlog(faultId,  processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorCid);
+                repairlog(faultId,  processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorName);
             } else if (condition == AuditResultEnum.SEND_BACK.getCode()) {
                 conditionText = AuditResultEnum.SEND_BACK.getName();
-                repairlog(faultId,  processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorCid);
+                repairlog(faultId,  processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorName);
             } else if (condition == AuditResultEnum.REFUSE.getCode()) {
                 conditionText = AuditResultEnum.REFUSE.getName();
-                repairlog(faultId,  processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorCid);
+                repairlog(faultId,  processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorName);
             }
             if (failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo, condition + "")){
                 return true;
@@ -152,7 +137,7 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      */
     @Transactional
     public Boolean repairlog(Long faultId,  Integer processAuditorId, Long departmentId, Date processTime,
-                             String processDepartment, String processResult, String processAuditorCid) {
+                             String processDepartment, String processResult, String processAuditorName) {
         FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
         failureRepairlogDto.setFaultId(faultId);
         failureRepairlogDto.setProcessAuditorId(processAuditorId);
@@ -160,7 +145,7 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         failureRepairlogDto.setProcessTime(processTime);
         failureRepairlogDto.setProcessDepartment(processDepartment);
         failureRepairlogDto.setProcessResult(processResult);
-        failureRepairlogDto.setProcessAuditorCid(processAuditorCid);
+        failureRepairlogDto.setProcessAuditorName(processAuditorName);
         failureRepairlogService.createWithModel(failureRepairlogDto);
         if (ObjectUtils.isNotEmpty(failureRepairlogDto)) {
             return true;

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

@@ -76,8 +76,6 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
     WorkflowFeignService workflowFeignService;
     private static String RECORE_TYPE = "维修记录";
 
-    private final Logger logger = LoggerFactory.getLogger(FailureMaintainServiceImpl.class);
-
     private static String[] MAINTENANCE_STATUS = {"维修完成", "维修中"};
 
     private static int MAINTENANCE_COMPLETE = 0;
@@ -86,25 +84,7 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
 
     private static String[] PROCESS_RESULT = {"验证通过", "验证未通过"};
 
-    /**
-     * 分页查询
-     */
-
-    public Page<FailureMaintainDto> queryForFailureMaintainPage(Page<FailureMaintainDto> page) {
 
-        return this.queryForPage(page, null, false);
-
-    }
-
-    /**
-     * 列表查询 示例
-     */
-
-    public List<FailureMaintainDto> queryForFailureMaintainList() {
-
-        return this.queryForList("", false);
-
-    }
 
     /**
      * 添加维修记录
@@ -132,10 +112,10 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
             // 添加报修日志
             String processResult = MAINTENANCE_STATUS[1];// 维修中
             Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
-            String processAuditorCid = userInfo.getRole().getRoleName();
+            String processAuditorName = userInfo.getUserModel().getRealName();
             repairlog(failureMaintainDto.getFaultId(), processAuditorId,
                     userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
-                    failureMaintainDto.getDepartment(), processResult, processAuditorCid);
+                    failureMaintainDto.getDepartment(), processResult, processAuditorName);
             if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())) {
                 sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),
                         failureMaintainDto.getAttachment());
@@ -179,10 +159,10 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
             // 添加报修日志
             String processResult = MAINTENANCE_STATUS[0];// 维修完成
             Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
-            String processAuditorCid = userInfo.getRole().getRoleName();
+            String processAuditorName = userInfo.getUserModel().getRealName();
             repairlog(failureMaintainDto.getFaultId(),  processAuditorId,
                     userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
-                    failureMaintainDto.getDepartment(), processResult, processAuditorCid);
+                    failureMaintainDto.getDepartment(), processResult, processAuditorName);
             if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())) {
                 sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),
                         failureMaintainDto.getAttachment());
@@ -195,55 +175,6 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
         return true;
     }
 
-    /**
-     * 根据审核结果更新维修表
-     */
-
-    public Boolean updateModel(FailureMaintainDto failureMaintainDto,  ReginParams userInfo) throws Exception {
-        boolean result = failureDetailsService.checkExcuteTaskAuth(failureMaintainDto.getFaultId(), userInfo);
-        FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
-
-        if (result) {
-            this.updateWithModel(failureMaintainDto);
-            // 根据status修改状态
-            String processResult = new String();
-            String condition = failureMaintainDto.getCondition();
-            int conditionStatus = Integer.parseInt(condition);
-
-            if (conditionStatus == AuditResultEnum.AGREE.getCode() && userInfo.getDepartment().getSequenceNbr()
-                    == failureDetailsDto.getBizCode()) {// 同意状态为已完结
-                processResult = PROCESS_RESULT[0];
-            } else if (conditionStatus == AuditResultEnum.AGREE.getCode()) {// 同意状态为已完结
-                failureDetailsDto.setCurrentStatus(failureDetailsDto.getCurrentStatus());
-                failureDetailsService.updateWithModel(failureDetailsDto);
-                processResult = PROCESS_RESULT[0];
-            } else if (conditionStatus == AuditResultEnum.REFUSE.getCode()){// 不同意状态为已拒绝
-                failureDetailsDto.setCurrentStatus(FailureStatuEnum.REFUSE.getCode());
-                failureDetailsService.updateWithModel(failureDetailsDto);
-                processResult = PROCESS_RESULT[1];
-            }
-
-            // 添加报修日志
-            Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
-            String processAuditorCid = userInfo.getRole().getRoleName();
-
-            Boolean repairlog = repairlog(failureMaintainDto.getFaultId(), processAuditorId,
-                    userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
-                    failureMaintainDto.getDepartment(), processResult, processAuditorCid);
-            if (ObjectUtils.isEmpty(repairlog)){
-                throw new RuntimeException("验收添加报修日志出错");
-            }
-
-           if (failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition)){
-               return true;
-           }else {
-               throw new RuntimeException("验收执行流程失败");
-           }
-        }
-        return false;
-
-    }
-
 
     /**
      * 根据FaultId查询
@@ -273,9 +204,7 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
      * 添加报修日志
      */
     public Boolean repairlog(Long faultId,  Integer processAuditorId, Long departmentId,
-                             Date processTime,
-
-                             String processDepartment, String processResult, String processAuditorCid) {
+                             Date processTime, String processDepartment, String processResult, String processAuditorName) {
 
         FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
         failureRepairlogDto.setFaultId(faultId);
@@ -284,7 +213,7 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
         failureRepairlogDto.setProcessTime(processTime);
         failureRepairlogDto.setProcessDepartment(processDepartment);
         failureRepairlogDto.setProcessResult(processResult);
-        failureRepairlogDto.setProcessAuditorCid(processAuditorCid);
+        failureRepairlogDto.setProcessAuditorName(processAuditorName);
         failureRepairlogService.createWithModel(failureRepairlogDto);
         if (ObjectUtils.isNotEmpty(failureRepairlogDto)) {
             return true;

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

@@ -66,33 +66,21 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
         }
         Boolean repairResult = null;
         //根据验收的结果进行业务操作
-     /*   if (condition == AuditResultEnum.AGREE.getCode() ) {
-            verifyResult = AuditResultEnum.AGREE.getCode();
-            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_ACCEPTANCE, userInfo, condition);
-        } else*/
         if (condition == (AuditResultEnum.REFUSE.getCode())) {
             verifyResult = AuditResultEnum.REFUSE.getCode();
             repairResult = updateStatus(model, FailureStatuEnum.REFUSE, userInfo, condition);
-        } /*else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
-            verifyResult = AuditResultEnum.SEND_BACK.getCode();
-            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo, condition);
-        } */ else if (condition == AuditResultEnum.AGREE.getCode()) {
+        }  else if (condition == AuditResultEnum.AGREE.getCode()) {
             verifyResult = AuditResultEnum.AGREE.getCode();
             repairResult = updateStatus(model, FailureStatuEnum.FINISH, userInfo, condition);
         }
 
         model.setVerifyResult(verifyResult);
 
-        List<FailureVerify> byfaultId = findByfaultId(failureDetailsDto.getSequenceNbr());
-
-      /*  if (byfaultId.size() == 0) {
-            this.createWithModel(model);
-        } else {*/
             this.createWithModel(model);
             if (!failureDetailsService.excuteTask(failureDetailsDto.getSequenceNbr(), userInfo, condition + "")) {
                 throw new Exception("执行流程失败");
             }
-     /*   }*/
+
         return true;
     }
 
@@ -154,7 +142,7 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
         failureRepairlogDto.setProcessTime(processTime);
         failureRepairlogDto.setProcessDepartment(processDepartment);
         failureRepairlogDto.setProcessResult(processResult);
-        failureRepairlogDto.setProcessAuditorCid(processVerifyorCid);
+        failureRepairlogDto.setProcessAuditorName(processVerifyorCid);
         failureRepairlogService.createWithModel(failureRepairlogDto);
         if (ObjectUtils.isNotEmpty(failureRepairlogDto)) {
             return true;
@@ -166,7 +154,6 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
      * 根据FaultId查询
      */
     public List<FailureVerify> findByfaultId(Long faultId) {
-        Page<FailureVerify> page = new Page<>();
         QueryWrapper<FailureVerify> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("fault_id", faultId).orderByDesc("verify_time");
         return baseMapper.selectList(queryWrapper);