Merge remote-tracking branch 'origin/developer' into developer

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-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/CheckRecordOrderByEnum.java

@@ -5,15 +5,15 @@ import java.util.stream.Collectors;
 
 /**
  * @author DELL
- * 维保任务排序
+ * 维保记录排序
  */
 
 public enum CheckRecordOrderByEnum {
     /**
      * 维保记录排序
      */
-    DATE_DESC("维保记录时间倒序", "1", "checkDate desc"),
-    DATE_ASC("维保记录时间正序", "2", "checkDate asc");
+    DATE_DESC("时间倒序", "1", "checkDate desc"),
+    DATE_ASC("时间正序", "2", "checkDate asc");
 
     /**
      * 名字

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/controller/FailureDetailsController.java

@@ -5,10 +5,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
-import com.yeejoin.amos.boot.module.common.biz.constats.Constants;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -26,11 +22,17 @@ 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.core.metadata.IPage;
 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.FailureDetailsDto;
+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.biz.constats.Constants;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureDetailsServiceImpl;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -61,15 +63,7 @@ public class FailureDetailsController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<Object> save(@RequestBody FailureDetailsDto model )  {
-	  	Object result;
-		try {
-			result = failureDetailsServiceImpl.savemodel(model,getSelectedOrgInfo());
-			 return ResponseHelper.buildResponse(result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			// TODO Auto-generated catch block
-			 return ResponseHelper.buildResponse("error");
-		}
+			 return ResponseHelper.buildResponse( failureDetailsServiceImpl.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/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));
 	}
@@ -128,9 +128,6 @@ public class FailureMaintainController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "设备故障报修单详情-报修日志",   notes = "设备故障报修单详情-报修日志")
 	@GetMapping(value = "/getProcessHistory/{sequenceNbr}")
 	public ResponseModel<List<Object>> getProcessHistory(@PathVariable Long sequenceNbr ) {
-		if(sequenceNbr==null) {
-			 return ResponseHelper.buildResponse(null);
-		}
 	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.getProcessHistoryList(sequenceNbr));
 	}
 }

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;
+    }
 
     /**
      * 添加报修日志

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

@@ -132,9 +132,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);
@@ -249,7 +249,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 +280,26 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {
 				sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), failureDetailsDto.getAttachment());
 			}
-
+			//添加至报修日志
+			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);
-
-
-/*			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);
-			}*/
+			}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 +318,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 +329,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) {
@@ -395,7 +392,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		map.put("checkFlag", false);
 		FailureDetailsDto failureDetailsDto = this.queryBySeq(sequenceNbr);
 		// 获取送达部门的ID
-		Integer failureEquipmentId = failureDetailsDto.getFailureEquipmentId();
+		Long failureEquipmentId = failureDetailsDto.getSubmissionBranchId();
 		// 获取上一级操作部门的Id
 		FailureDetails details = this.baseMapper.selectById(sequenceNbr);
 		String procressId = details.getProcessId();
@@ -528,16 +525,16 @@ 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.endsWith(PROCESS_NAME[1])) { //提交维修单
+			if(buttonValueString.endsWith(PROCESS_NAME[0])) { //提交维修单
 				flag=1;
-			}else if(buttonValueString.endsWith(PROCESS_NAME[2])) {  //审核
-				if(buttonValueString.startsWith(PROCESS_NAME[3])) {
+			}else if(buttonValueString.endsWith(PROCESS_NAME[1])) {  //审核
+				if(buttonValueString.startsWith(PROCESS_NAME[2])) {
 					flag=3;
 				}
 				flag=2;
-			}else if(buttonValueString.endsWith(PROCESS_NAME[3])) {//维修
+			}else if(buttonValueString.endsWith(PROCESS_NAME[2])) {//维修
 				flag=4;
-			}else if(buttonValueString.endsWith(PROCESS_NAME[4])) {//验收
+			}else if(buttonValueString.endsWith(PROCESS_NAME[3])) {//验收
 				flag=5;
 			}
 		 }

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,10 +84,10 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     /**
      *根据审核结果更新维修表
      */
-    public FailureMaintainDto updateModel(FailureMaintainDto failureMaintainDto, Integer status, ReginParams userInfo)   {
-
-        failureDetailsService.checkExcuteTaskAuthMap(failureMaintainDto.getFaultId(),userInfo);
+    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();
@@ -104,14 +104,15 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
                 processResult = "验证未通过";
                 condition = AuditResultEnum.REFUSE.getName();
             }
-
-        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;
+            failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition);
+            return true;
+        }
+            return false;
+
     }
    /**
     * 查询当前故障报修单的流程的审批历史节点

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

@@ -172,7 +172,7 @@ public class ESAlertCalledService {
         currentTime = currentTime - 120*60*1000;
         BoolQueryBuilder qb1 = QueryBuilders.boolQuery()
         		.must(QueryBuilders.rangeQuery("callTimeLong").gte(currentTime));
-        boolMust.should(qb1);
+        boolMust.must(qb1);
         //报警电话一致
         if (!ValidationUtil.isEmpty(alertCalled.getEmergencyCall()) && !ValidationUtil.isEmpty(alertCalled.getContactPhone()))
 		{
@@ -191,13 +191,13 @@ public class ESAlertCalledService {
         //警情类型一致
         BoolQueryBuilder qb4 = QueryBuilders.boolQuery()
         		.must(QueryBuilders.termQuery("alarmTypeCode", alertCalled.getAlarmTypeCode()));
-        boolMust.should(qb4);
+        boolMust.must(qb4);
         //使用单位名称一致
         if (!ValidationUtil.isEmpty(alertCalled.getUseUnit()))
 		{
         	BoolQueryBuilder qb5 = QueryBuilders.boolQuery()
         			.must(QueryBuilders.termQuery("useUnit.keyword", alertCalled.getUseUnit()));
-        	boolMust.should(qb5);
+        	boolMust.must(qb5);
 		}
         //电梯识别码一致
         if(!ValidationUtil.isEmpty(alertCalled.getDeviceId())) {