Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -32,7 +32,7 @@ public class FailureMaintainDto extends BaseDto {
     private Long maintainPhone;
 
     @ApiModelProperty(value = "所属部门ID")
-    private String bizId;
+    private Long bizId;
 
     @ApiModelProperty(value = "所属部门")
     private String department;
@@ -52,7 +52,7 @@ public class FailureMaintainDto extends BaseDto {
     @ApiModelProperty(value = "附件")
     private List<SourceFile> attachment;
     
-    @ApiModelProperty(value = "审核结果条件判断，0同意，1拒绝，2驳回")
+    @ApiModelProperty(value = "审核结果条件判断，0完成，1保存")
     private String condition;
 
 }

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

@@ -66,4 +66,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/constats/Constants.java

@@ -14,5 +14,6 @@ public class Constants {
         currentStatusNameMap.put(3,"待验收");
         currentStatusNameMap.put(4,"已拒绝");
         currentStatusNameMap.put(5,"已完结");
+        currentStatusNameMap.put(6,"维修中");
     }
 }

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

@@ -136,6 +136,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		return baseMapper.selectPage(failureDetailsPage, wrapper);
 	}
 
+
 	/**
 	 * 列表查询 示例
 	 */
@@ -181,6 +182,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
 	}
 
+
 	/**
 	 * 查询任务状态数量
 	 */
@@ -201,7 +203,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		int inMaintenance = 0;
 
 		List<FailureStatusCountDto> list = new ArrayList<>();
-		// String[] statusName = new String[]{"待审核", "待提交", "待维修", "待验收", "已拒绝", "已完结"};
+	//	String[] statusName = new String[]{"待审核", "待提交", "待维修", "待验收", "已拒绝", "已完结"};
 		List<String> statusName = new ArrayList<>();
 		Collections.addAll(statusName, FailureStatuEnum.WAITING_AUDIT.getName(),
 				FailureStatuEnum.WAITING_SUBMIT.getName(), FailureStatuEnum.WAITING_MAINTAIN.getName(),
@@ -288,9 +290,9 @@ 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);
-			} catch (Exception e) {
+				String processAuditorCid = userInfo.getUserModel().getUserName();
+				repairlog(faultId, processAuditor,processAuditorId,departmentId, processTime, processDepartment, processResult,processAuditorCid);
+			}catch (Exception e){
 				e.printStackTrace();
 				logger.info("添加流程日志到数据库失败");
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -319,8 +321,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);
@@ -329,8 +331,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;
@@ -564,7 +567,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	}
 
 	public static String buildOrderNo() {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		String newDate = sdf.format(new Date());
 		String result = "";
 		Random random = new Random();
@@ -576,7 +579,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
 	/**
 	 * 获取当前登录人能够操作的任务执行Button类型
-	 * 
+	 *
 	 * @param sequenceNbr
 	 * @param userInfo
 	 * @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/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 {
     /**
      * 分页查询