修改bug

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

@@ -26,7 +26,7 @@ public class FailureRepairlog extends BaseEntity {
      * 流程处理人
      */
 	@TableField("process_auditor_id")
-    private Long processAuditorId;
+    private Integer processAuditorId;
     /**
      * 流程处理人
      */

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

@@ -40,9 +40,9 @@ public class FailureAuditController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<FailureAuditDto> save(@RequestBody FailureAuditDto model, ReginParams userInfo) throws Exception {
+	public ResponseModel<FailureAuditDto> save(@RequestBody FailureAuditDto model) throws Exception {
 
-		model = failureAuditServiceImpl.savemodel(model,userInfo);
+		model = failureAuditServiceImpl.savemodel(model,getSelectedOrgInfo());
 	    return ResponseHelper.buildResponse(model);
 	}
 

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,62 +56,56 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
     @Transactional
     public FailureAuditDto savemodel(FailureAuditDto model, ReginParams userInfo) throws Exception {
 
-      /*  if (model.getAuditResult().equals(5)) {
-            model.setAuditTime(new Date());
-            model.setIsDelete(false);
-            this.createWithModel(model);
-            return model;
-        }*/
-
-
         int condition = Integer.parseInt(model.getCondition());
         //根据审核的结果进行业务操作
         if (condition == AuditResultEnum.AGREE.getCode()) {
-            updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo);
+            updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo,condition);
         } else if (condition == (AuditResultEnum.REFUSE.getCode())) {
-            updateStatus(model, FailureStatuEnum.REFUSE, userInfo);
+            updateStatus(model, FailureStatuEnum.REFUSE, userInfo,condition);
         } else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
-            updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo);
+            updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo,condition);
         }
-        return model;
+        return   this.createWithModel(model);
     }
 
     /**
      * 修改故障保修单任务状态
      */
     @Transactional
-    FailureDetailsDto updateStatus(FailureAuditDto model, FailureStatuEnum status, ReginParams userInfo) throws Exception {
-
-
-
+    FailureDetailsDto updateStatus(FailureAuditDto model, FailureStatuEnum status, ReginParams userInfo,int condition) throws Exception {
 
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
         failureDetailsDto.setCurrentStatus(status.getCode());
         failureDetailsDto.setSequenceNbr(model.getFaultId());
-        String condition;
-        failureDetailsService.checkExcuteTaskAuth(failureDetailsDto.getSequenceNbr(),userInfo);
+        String conditionText;
+        boolean result = failureDetailsService.checkExcuteTaskAuth(failureDetailsDto.getSequenceNbr(), userInfo);
+        if (result){
             //添加报修日志
             Long faultId = model.getFaultId();
+            model.setAuditTime(new Date());
+            model.setAuditDepartmentId(userInfo.getDepartment().getSequenceNbr());
+            model.setAuditor(userInfo.getRole().getRoleName());
+            model.setAuditDepartment(userInfo.getDepartment().getDepartmentName());
             Date processTime = model.getAuditTime();
             String processDepartment = model.getAuditDepartment();
             String processAuditor = model.getAuditor();
-        Integer processAuditorId = Integer.parseInt(model.getRecUserId());
-        Long auditDepartmentId = model.getAuditDepartmentId();
-        if (status.equals(AuditResultEnum.AGREE)) {
-            condition = AuditResultEnum.AGREE.getName();
-            repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,condition);
+            Integer processAuditorId =Integer.parseInt(userInfo.getUserModel().getUserId()) ;
+            Long auditDepartmentId = (userInfo.getDepartment().getSequenceNbr());
+            if (condition == AuditResultEnum.AGREE.getCode()) {
+                conditionText = AuditResultEnum.AGREE.getName();
+                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
             }
-        if (status.equals(AuditResultEnum.SEND_BACK)) {
-            condition = AuditResultEnum.SEND_BACK.getName();
-            repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,condition);
+            if (condition == AuditResultEnum.SEND_BACK.getCode()) {
+                conditionText = AuditResultEnum.SEND_BACK.getName();
+                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
             }
-        condition = AuditResultEnum.REFUSE.getName();
-
-        failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo, condition);
-
-        repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,condition);
+            conditionText = AuditResultEnum.REFUSE.getName();
+            repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
+            failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo,condition+"");
             return failureDetailsService.updateWithModel(failureDetailsDto);
         }
+       return null;
+    }
 
     /**
      * 添加报修日志