修改返回值

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

@@ -53,7 +53,7 @@ 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,ReginParams userInfo) {
+	public Object updateBySequenceNbrFailureMaintain(@RequestBody FailureMaintainDto model,Integer status,@PathVariable(value = "sequenceNbr") Long sequenceNbr,ReginParams userInfo) {
 	    model.setSequenceNbr(sequenceNbr);
 	    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/FailureDetailsServiceImpl.java

@@ -48,6 +48,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
  * @date 2021-08-04
  */
 @Service
+@Transactional
 public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, FailureDetails, FailureDetailsMapper>
 		implements IFailureDetailsService {
 
@@ -72,6 +73,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	@Autowired
 	IFailureRepairlogService failureRepairlog;
 
+
+
 	public static String EMERGENCY_COMMAND = "应急指挥科";
 	public static String[] PROCESS_NAME = {"提交维修单","审核","维修","验收"};
 
@@ -132,9 +135,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		}
 		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
 		wrapper.eq("submission_pid",submissionPid);
-		wrapper.lt("current_status",FailureStatuEnum.REFUSE.getCode());
-		wrapper.lt("current_status",FailureStatuEnum.FINISH.getCode());
-		wrapper.lt("current_status",FailureStatuEnum.WAITING_AUDIT.getCode());
+		wrapper.notIn("current_status",FailureStatuEnum.REFUSE.getCode(),
+				FailureStatuEnum.FINISH.getCode(),
+				FailureStatuEnum.WAITING_AUDIT.getCode());
 		wrapper.orderByDesc("submission_time");
 		IPage<FailureDetails> failureDetailsPage = new Page<>(page.getCurrent(), page.getSize());
 		return  baseMapper.selectPage(failureDetailsPage, wrapper);
@@ -178,7 +181,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 				status = list.get(i).getName();
 			};
 		}
-		/*FailureStatuEnum[] failureStatuEnums = new FailureStatuEnum []{};*/
 		QueryWrapper<FailureDetails> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("current_status", status).orderByDesc("submission_time");
 		return baseMapper.selectList(queryWrapper);
@@ -249,7 +251,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	 *
 	 * @throws Exception
 	 */
-	@Transactional
 	public Object savemodel(FailureDetailsDto failureDetailsDto, ReginParams userInfo) throws Exception {
 		String businessKey = buildOrderNo();
 		JSONObject body = new JSONObject();
@@ -281,32 +282,26 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {
 				sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), failureDetailsDto.getAttachment());
 			}
-
-			Long faultId = model.getSequenceNbr();
-			String processAuditor = model.getRecUserName();
-			Integer processAuditorId = model.getSubmissionPid();
-			String processResult = "提交报修单";
-			String processDepartment = userInfo.getDepartment().getDepartmentName();
-			Long departmentId= userInfo.getDepartment().getSequenceNbr();
-
-			Date processTime = model.getSubmissionTime();
-			repairlog(faultId, processAuditor,processAuditorId,departmentId, processTime, processDepartment, processResult);
-
-
-/*			FailureAuditDto failureAuditDto = new FailureAuditDto();
-			failureAuditDto.setAuditor(model.getRecUserName());
-			failureAuditDto.setFaultId(model.getSequenceNbr());
-			failureAuditDto.setAuditOpinion("已发起");
-			failureAuditDto.setAuditTime(new Date());
-			failureAuditDto.setIsDelete(true);
-			failureAuditDto.setAuditResult(5);
-
-			if (ObjectUtils.isNotEmpty(failureAuditDto)) {
-				failureAuditServiceImpl.savemodel(failureAuditDto, userInfo);
-			}*/
+			//添加至报修日志
+			try {
+				Long faultId = model.getSequenceNbr();
+				String processAuditor = model.getRecUserName();
+				Integer processAuditorId = model.getSubmissionPid();
+				String processResult = "提交报修单";
+				String processDepartment = userInfo.getDepartment().getDepartmentName();
+				Long departmentId= userInfo.getDepartment().getSequenceNbr();
+				Date processTime = model.getSubmissionTime();
+				repairlog(faultId, processAuditor,processAuditorId,departmentId, processTime, processDepartment, processResult);
+			}catch (Exception e){
+				e.printStackTrace();
+				logger.info("添加流程日志到数据库失败");
+				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+				return false;
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.info("添加故障维修信息到数据库失败");
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			return false;
 			// return CommonResponseUtil.failure("添加失败");
 		}
@@ -325,7 +320,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	/**
 	 * 添加报修日志
 	 */
-	public void repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId, Date processTime, String processDepartment,
+	@Transactional
+	public Boolean repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId, Date processTime, String processDepartment,
 			String processResult) {
 		FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
 		failureRepairlogDto.setFaultId(faultId);
@@ -335,8 +331,11 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		failureRepairlogDto.setProcessTime(processTime);
 		failureRepairlogDto.setProcessDepartment(processDepartment);
 		failureRepairlogDto.setProcessResult(processResult);
-		failureRepairlogDto.setIsDelete(false);
-		failureRepairlogService.createWithModel(failureRepairlogDto);
+		FailureRepairlogDto RepairlogModel = failureRepairlogService.createWithModel(failureRepairlogDto);
+		if (ObjectUtils.isNotEmpty(RepairlogModel)){
+			return true;
+		}
+		return false;
 	}
 
 	public boolean excuteTask(Long sequenceNbr, ReginParams userInfo, String condition) {

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

@@ -84,34 +84,35 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     /**
      *根据审核结果更新维修表
      */
-    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();
+    public Boolean updateModel(FailureMaintainDto failureMaintainDto, Integer status, ReginParams userInfo)   {
+
+        boolean result = failureDetailsService.checkExcuteTaskAuth(failureMaintainDto.getFaultId(), userInfo);
+        if (result){
+            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();
+            }
+            //添加报修日志
+            Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
+            repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),processAuditorId, userInfo.getDepartment().getSequenceNbr(),failureMaintainDto.getMaintainTime(),
+                    failureMaintainDto.getDepartment(),processResult);
+            failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition);
+            return true;
         }
+            return false;
 
-        failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition);
-
-        //添加报修日志
-        Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
-        repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),processAuditorId, userInfo.getDepartment().getSequenceNbr(),failureMaintainDto.getMaintainTime(),
-                failureMaintainDto.getDepartment(),processResult);
-        return failureMaintainDto;
     }
    /**
     * 查询当前故障报修单的流程的审批历史节点