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/FailureRepairlogDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -15,18 +16,25 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="FailureRepairlogDto", description="流程日志")
-public class FailureRepairlogDto  extends BaseDto {
+@ApiModel(value = "FailureRepairlogDto", description = "流程日志")
+public class FailureRepairlogDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "流程处理人")
     private String processAuditor;
 
+    @ApiModelProperty(value = "流程处理人Id")
+    private Integer processAuditorId;
+
+
     @ApiModelProperty(value = "处理人所属部门")
     private String processDepartment;
 
+    @ApiModelProperty(value = "处理人所属部门Id")
+    private Long processDepartmentId;
+
     @ApiModelProperty(value = "流程处理结果")
     private String processResult;
 

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

@@ -63,13 +63,14 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
             return model;
         }*/
 
-        Integer auditResult = model.getAuditResult();
+
+        int condition = Integer.parseInt(model.getCondition());
         //根据审核的结果进行业务操作
-        if (auditResult.equals(AuditResultEnum.AGREE.getCode())) {
+        if (condition == AuditResultEnum.AGREE.getCode()) {
             updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo);
-        } else if (auditResult.equals(AuditResultEnum.REFUSE.getCode())) {
+        } else if (condition == (AuditResultEnum.REFUSE.getCode())) {
             updateStatus(model, FailureStatuEnum.REFUSE, userInfo);
-        } else if (auditResult.equals(AuditResultEnum.SEND_BACK.getCode())) {
+        } else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
             updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo);
         }
         return model;
@@ -81,32 +82,34 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
     @Transactional
     FailureDetailsDto updateStatus(FailureAuditDto model, FailureStatuEnum status, ReginParams userInfo) throws Exception {
 
-        failureDetailsService.checkExcuteTaskAuthMap(model.getSequenceNbr(),userInfo);
+
 
 
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
         failureDetailsDto.setCurrentStatus(status.getCode());
         failureDetailsDto.setSequenceNbr(model.getFaultId());
         String condition;
-
+        failureDetailsService.checkExcuteTaskAuth(failureDetailsDto.getSequenceNbr(),userInfo);
         //添加报修日志
         Long faultId = model.getFaultId();
         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,processTime,processDepartment,condition);
+            repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,condition);
         }
         if (status.equals(AuditResultEnum.SEND_BACK)) {
             condition = AuditResultEnum.SEND_BACK.getName();
-            repairlog(faultId,processAuditor,processTime,processDepartment,condition);
+            repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,condition);
         }
         condition = AuditResultEnum.REFUSE.getName();
 
         failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo, condition);
 
-        repairlog(faultId,processAuditor,processTime,processDepartment,condition);
+        repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,condition);
         return failureDetailsService.updateWithModel(failureDetailsDto);
     }
 
@@ -114,10 +117,12 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      * 添加报修日志
      */
     @Transactional
-    public void repairlog(Long faultId, String processAuditor, Date processTime, String processDepartment, String processResult) {
+    public void repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId,Date processTime, String processDepartment, String processResult) {
         FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
         failureRepairlogDto.setFaultId(faultId);
         failureRepairlogDto.setProcessAuditor(processAuditor);
+        failureRepairlogDto.setProcessAuditorId(processAuditorId);
+        failureRepairlogDto.setProcessDepartmentId(departmentId);
         failureRepairlogDto.setProcessTime(processTime);
         failureRepairlogDto.setProcessDepartment(processDepartment);
         failureRepairlogDto.setProcessResult(processResult);

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
-import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
-import com.yeejoin.amos.boot.module.common.biz.constats.Constants;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,11 +32,13 @@ import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
 import com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureAuditService;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureDetailsService;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureRepairlogService;
+import com.yeejoin.amos.boot.module.common.biz.constats.Constants;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 /**
@@ -280,10 +284,13 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
 			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, processTime, processDepartment, processResult);
+			repairlog(faultId, processAuditor,processAuditorId,departmentId, processTime, processDepartment, processResult);
 
 
 /*			FailureAuditDto failureAuditDto = new FailureAuditDto();
@@ -318,11 +325,13 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	/**
 	 * 添加报修日志
 	 */
-	public void repairlog(Long faultId, String processAuditor, Date processTime, String processDepartment,
+	public void repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId, Date processTime, String processDepartment,
 			String processResult) {
 		FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
 		failureRepairlogDto.setFaultId(faultId);
 		failureRepairlogDto.setProcessAuditor(processAuditor);
+		failureRepairlogDto.setProcessAuditorId(processAuditorId);
+		failureRepairlogDto.setProcessDepartmentId(departmentId);
 		failureRepairlogDto.setProcessTime(processTime);
 		failureRepairlogDto.setProcessDepartment(processDepartment);
 		failureRepairlogDto.setProcessResult(processResult);
@@ -519,14 +528,17 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		Map<String, Object> map = this.checkExcuteTaskAuthMap(sequenceNbr, userInfo);
 		 if(Boolean.parseBoolean(map.get("checkFlag").toString())) {
 			String  buttonValueString = map.get("name").toString();
-			if(buttonValueString.contains(PROCESS_NAME[1])) { //提交维修单
+			if(buttonValueString.endsWith(PROCESS_NAME[1])) { //提交维修单
 				flag=1;
-			}else if(buttonValueString.contains(PROCESS_NAME[2])) {  //审核
+			}else if(buttonValueString.endsWith(PROCESS_NAME[2])) {  //审核
+				if(buttonValueString.startsWith(PROCESS_NAME[3])) {
+					flag=3;
+				}
 				flag=2;
-			}else if(buttonValueString.contains(PROCESS_NAME[3])) {//维修
-				flag=3;
-			}else if(buttonValueString.contains(PROCESS_NAME[4])) {//验收
+			}else if(buttonValueString.endsWith(PROCESS_NAME[3])) {//维修
 				flag=4;
+			}else if(buttonValueString.endsWith(PROCESS_NAME[4])) {//验收
+				flag=5;
 			}
 		 }
 		 FailureDetails details = this.baseMapper.selectById(sequenceNbr);
@@ -535,7 +547,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		for (Object historyDetail : array) {
 			JSONObject historyDetailJson=	JSONObject.parseObject(JSONObject.toJSONString(historyDetail));
 			if("rejected".equals(historyDetailJson.getString("activityId"))) {
-				flag=5;
+				flag=6;
 			}
 		}
 		return flag;

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

@@ -63,7 +63,8 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
 
         //添加报修日志
         String processResult = "维修完成";
-        repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),failureMaintainDto.getMaintainTime(),
+        Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
+        repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),processAuditorId,userInfo.getDepartment().getSequenceNbr(),failureMaintainDto.getMaintainTime(),
                 failureMaintainDto.getDepartment(),processResult);
 
         sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),failureMaintainDto.getAttachment());
@@ -107,7 +108,8 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
         failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition);
 
         //添加报修日志
-        repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),failureMaintainDto.getMaintainTime(),
+        Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
+        repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),processAuditorId, userInfo.getDepartment().getSequenceNbr(),failureMaintainDto.getMaintainTime(),
                 failureMaintainDto.getDepartment(),processResult);
         return failureMaintainDto;
     }
@@ -124,12 +126,14 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     /**
      * 添加报修日志
      */
-    public void repairlog(Long faultId, String processAuditor, Date processTime, String processDepartment, String processResult) {
+    public void repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId, Date processTime, String processDepartment, String processResult) {
         FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
         failureRepairlogDto.setFaultId(faultId);
         failureRepairlogDto.setProcessAuditor(processAuditor);
+        failureRepairlogDto.setProcessAuditorId(processAuditorId);
         failureRepairlogDto.setProcessTime(processTime);
         failureRepairlogDto.setProcessDepartment(processDepartment);
+        failureRepairlogDto.setProcessDepartmentId(departmentId);
         failureRepairlogDto.setProcessResult(processResult);
         failureRepairlogService.createWithModel(failureRepairlogDto);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -13,41 +23,15 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledObjsDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.tzs.api.entity.ESAlertCalled;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
-import com.yeejoin.amos.boot.module.tzs.api.entity.RepairConsult;
-import com.yeejoin.amos.boot.module.tzs.api.entity.Template;
 import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
-import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStatusEnum;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.AlertCalledMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IAlertCalledService;
-import com.yeejoin.amos.boot.module.tzs.biz.utils.AlertBeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.elasticsearch.core.SearchHit;
-import org.springframework.data.elasticsearch.core.SearchHits;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 警情接警填报记录服务实现类