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

@@ -49,7 +49,7 @@ public class FailureDetailsDto extends BaseDto {
     private Integer submissionPid;
 
     @ApiModelProperty(value = "组织code")
-    private String bizCode;
+    private Long bizCode;
 
     @ApiModelProperty(value = "报送时间")
     private Date submissionTime;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FailureDetails.java

@@ -76,7 +76,7 @@ public class FailureDetails extends BaseEntity {
      * 组织code
      */
 	@TableField("biz_code")
-    private String bizCode;
+    private Long bizCode;
 
     /**
      * 报送时间

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

@@ -32,6 +32,11 @@ public class FailureRepairlog extends BaseEntity {
      */
 	@TableField("process_auditor")
     private String processAuditor;
+	 /**
+     * 流程处理人
+     */
+	@TableField("process_auditor_name")
+    private String processAuditorName;
 
     /**
      * 处理人所属部门

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/FailureStatuEnum.java

@@ -7,8 +7,8 @@ public enum FailureStatuEnum {
         WAITING_MAINTAIN(2,"待维修"),
         WAITING_ACCEPTANCE(3,"待验收"),
         REFUSE(4,"已拒绝"),
-        FINISH(5,"已完结");
-
+        FINISH(5,"已完结"),
+        IN_MAINTENANCE(6,"维修中");
 
         private FailureStatuEnum(Integer code, String name){
             this.code=code;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFailureRepairlogService.java

@@ -9,7 +9,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog;
  * @date 2021-08-12
  */
 public interface IFailureRepairlogService {
-	  public FailureRepairlog findByprocessAuditorId(Long userId);
+	  public FailureRepairlog findByprocessAuditor(String userId);
 	  
 	  public FailureRepairlog findByFaultId(Long faultId) ;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/core/common/response/CalendarStatusCountRespone.java

@@ -6,7 +6,7 @@ public class CalendarStatusCountRespone {
 	/**
 	 * 个数
 	 */
-	private double count;
+	private Long count;
 	/**
 	 * 状态
 	 */
@@ -16,7 +16,7 @@ public class CalendarStatusCountRespone {
 	public double getCount() {
 		return count;
 	}
-	public void setCount(double count) {
+	public void setCount(Long count) {
 		this.count = count;
 	}
 	public String getStatus() {

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -5,7 +5,7 @@
     <select id="queryAlertStatusCount" resultType="java.util.Map">
         SELECT
         count( 1 ) calledCount,
-        sum( CASE WHEN father_alert = null THEN 1 ELSE 0 END ) majorAlertCount,
+        sum( CASE WHEN father_alert is null THEN 1 ELSE 0 END ) majorAlertCount,
         sum( CASE WHEN alarm_type_code = 'KRJY' THEN 1 ELSE 0 END ) sleepyIncidentCount,
         sum( CASE WHEN alarm_type_code = 'GZWX'  THEN 1 ELSE 0 END ) faultRescueCount,
         sum( CASE WHEN alarm_type_code = 'TSZX'  THEN 1 ELSE 0 END ) suggestionsCount

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,10 +40,8 @@ public class FailureAuditController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<FailureAuditDto> save(@RequestBody FailureAuditDto model) throws Exception {
-
-		model = failureAuditServiceImpl.savemodel(model,getSelectedOrgInfo());
-	    return ResponseHelper.buildResponse(model);
+	public ResponseModel<Object>  save(@RequestBody FailureAuditDto model) throws Exception {
+	    return ResponseHelper.buildResponse(failureAuditServiceImpl.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

@@ -38,8 +38,8 @@ public class FailureMaintainController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<FailureMaintainDto> save(@RequestBody FailureMaintainDto model, ReginParams userInfo) {
-	    model = failureMaintainServiceImpl.savemodel(model,userInfo);
+	public ResponseModel<Object> save(@RequestBody FailureMaintainDto model) {
+	    failureMaintainServiceImpl.savemodel(model,getSelectedOrgInfo());
 	    return ResponseHelper.buildResponse(model);
 	}
 
@@ -53,11 +53,27 @@ public class FailureMaintainController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "验收操作", notes = "根据sequenceNbr更新")
-	public Object 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) {
 	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateModel(model,status,userInfo));
+	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateModel(model,status,getSelectedOrgInfo()));
 	}
 
+
+	/**
+	 * 根据sequenceNbr更新
+	 * 根据传递的Status状态确认验收状态
+	 *
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/update/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "维修完成", notes = "根据sequenceNbr更新")
+	public Object updateByFailureMaintain(@RequestBody FailureMaintainDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		model.setSequenceNbr(sequenceNbr);
+
+		return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateStatus(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

@@ -3,9 +3,13 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -36,6 +40,8 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
     @Autowired
     FailureRepairlogServiceImpl failureRepairlogService;
 
+    private final Logger logger = LoggerFactory.getLogger(FailureAuditServiceImpl.class);
+
     /**
      * 分页查询
      */
@@ -54,9 +60,15 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      * 发起审核
      */
     @Transactional
-    public FailureAuditDto savemodel(FailureAuditDto model, ReginParams userInfo) throws Exception {
+    public Object savemodel(FailureAuditDto model, ReginParams userInfo) throws Exception {
 
         int condition = Integer.parseInt(model.getCondition());
+        model.setAuditTime(new Date());
+        model.setAuditDepartmentId(userInfo.getDepartment().getSequenceNbr());
+        model.setAuditor(userInfo.getRole().getRoleName());
+        model.setAuditDepartment(userInfo.getDepartment().getDepartmentName());
+
+        try {
             //根据审核的结果进行业务操作
             if (condition == AuditResultEnum.AGREE.getCode()) {
                 updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo,condition);
@@ -65,33 +77,49 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
             } else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
                 updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo,condition);
             }
-        return   this.createWithModel(model);
+
+            FailureAuditDto withModel = this.createWithModel(model);
+        }catch (Exception e){
+            e.printStackTrace();
+            e.printStackTrace();
+            logger.info("添加故障审核信息到数据库失败");
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false ;
+        }
+
+        return true;
     }
 
     /**
      * 修改故障保修单任务状态
      */
     @Transactional
-    FailureDetailsDto updateStatus(FailureAuditDto model, FailureStatuEnum status, ReginParams userInfo,int condition) throws Exception {
+    public Boolean updateStatus(FailureAuditDto model, FailureStatuEnum status, ReginParams userInfo,int condition) throws Exception {
 
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
+        //当前角色部门id为应急指挥科的时候 并且同意时 不修改主表状态 依然为待审核
+        //当前角色部门id为维修部门的时候 修改状态
+        if (userInfo.getDepartment().getSequenceNbr() == failureDetailsDto.getBizCode()
+                && condition == AuditResultEnum.AGREE.getCode()){
+            failureDetailsDto.setCurrentStatus(failureDetailsDto.getCurrentStatus());
+        }else if (userInfo.getDepartment().getSequenceNbr() != failureDetailsDto.getBizCode()
+                ) {
             failureDetailsDto.setCurrentStatus(status.getCode());
+        }
         failureDetailsDto.setSequenceNbr(model.getFaultId());
+        failureDetailsService.updateWithModel(failureDetailsDto);
+
         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(userInfo.getUserModel().getUserId()) ;
             Long auditDepartmentId = (userInfo.getDepartment().getSequenceNbr());
-            if (condition == AuditResultEnum.AGREE.getCode()) {
+            if (condition == AuditResultEnum.AGREE.getCode()  ) {
                 conditionText = AuditResultEnum.AGREE.getName();
                 repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
             }
@@ -99,12 +127,14 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
                 conditionText = AuditResultEnum.SEND_BACK.getName();
                 repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
             }
+            if (condition == AuditResultEnum.REFUSE.getCode()){
                 conditionText = AuditResultEnum.REFUSE.getName();
                 repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
+            }
             failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo,condition+"");
-            return failureDetailsService.updateWithModel(failureDetailsDto);
+            return true;
         }
-       return null;
+       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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import java.lang.reflect.InvocationTargetException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -10,6 +11,7 @@ import java.util.Map;
 import java.util.Random;
 
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +19,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import com.alibaba.fastjson.JSONArray;
@@ -24,7 +27,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
@@ -73,7 +78,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	IFailureRepairlogService failureRepairlog;
 
 	public static String EMERGENCY_COMMAND = "应急指挥科";
-	public static String[] PROCESS_NAME = {"提交维修单","审核","维修","验收"};
+	public static String[] PROCESS_NAME = { "提交维修单", "审核", "维修", "验收" };
 
 	private final Logger logger = LoggerFactory.getLogger(FailureDetailsServiceImpl.class);
 
@@ -84,21 +89,18 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	/**
 	 * 分页查询
 	 */
-	public IPage<FailureDetails> queryAllPage(long size,
-			long current) {
+	public IPage<FailureDetails> queryAllPage(long size, long current) {
 		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
 		wrapper.orderByDesc("submission_time");
 		IPage<FailureDetails> page = new Page<>(current, size);
 		return baseMapper.selectPage(page, wrapper);
 	}
 
+	public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, AgencyUserModel userInfo,
+			Integer type) {
 
-
-	public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page,
-			AgencyUserModel userInfo, Integer type) {
-
-		if ( type.equals(SELECY_ALL) ) {
-			return this. queryAllPage(page.getSize(),page.getCurrent());
+		if (type.equals(SELECY_ALL)) {
+			return this.queryAllPage(page.getSize(), page.getCurrent());
 		}
 
 		if (type.equals(SELECY_ISUBMIT)) {
@@ -106,7 +108,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			return queryForPage(page, userInfo.getUserId());
 
 		}
-		return this. queryForWaitManage(page, userInfo.getUserId());
+		return this.queryForWaitManage(page, userInfo.getUserId());
 	}
 
 	/**
@@ -117,7 +119,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			return null;
 		}
 		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
-		wrapper.eq("submission_pid",submissionPid);
+		wrapper.eq("submission_pid", submissionPid);
 		wrapper.orderByDesc("submission_time");
 		IPage<FailureDetails> failureDetailsPage = new Page<>(page.getCurrent(), page.getSize());
 		return baseMapper.selectPage(failureDetailsPage, wrapper);
@@ -131,16 +133,14 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			return null;
 		}
 		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
-		wrapper.eq("submission_pid",submissionPid);
-		wrapper.notIn("current_status",FailureStatuEnum.REFUSE.getCode(),
-				FailureStatuEnum.FINISH.getCode(),
+		wrapper.eq("submission_pid", submissionPid);
+		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);
 	}
 
-
 	/**
 	 * 列表查询 示例
 	 */
@@ -152,13 +152,13 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	 * 根据状态查询
 	 */
 
-	public FailureDetailsDto queryForOne(Long sequenceNbr){
+	public FailureDetailsDto queryForOne(Long sequenceNbr) {
 		FailureDetailsDto failureDetailsDto = this.queryBySeq(sequenceNbr);
-		failureDetailsDto.setCurrentStatusName(
-				Constants.currentStatusNameMap.get(failureDetailsDto.getCurrentStatus()));
+		failureDetailsDto
+				.setCurrentStatusName(Constants.currentStatusNameMap.get(failureDetailsDto.getCurrentStatus()));
 		List<SourceFile> sourceFiles = sourceFileServiceImpl.findBySourceId(sequenceNbr);
 		failureDetailsDto.setAttachment(sourceFiles);
-		return failureDetailsDto ;
+		return failureDetailsDto;
 	}
 
 	/**
@@ -174,69 +174,74 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		list.add(FailureStatuEnum.REFUSE);
 		list.add(FailureStatuEnum.FINISH);
 		for (int i = 0; i < list.size(); i++) {
-			if (currentStatus.equals(list.get(i).getCode())){
+			if (currentStatus.equals(list.get(i).getCode())) {
 				status = list.get(i).getName();
-			};
 			}
-		/*FailureStatuEnum[] failureStatuEnums = new FailureStatuEnum []{};*/
+			;
+		}
+		/* FailureStatuEnum[] failureStatuEnums = new FailureStatuEnum []{}; */
 		QueryWrapper<FailureDetails> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("current_status", status).orderByDesc("submission_time");
 		return baseMapper.selectList(queryWrapper);
 
 	}
 
-
 	/**
 	 * 查询任务状态数量
 	 */
 	public List<FailureStatusCountDto> queryStatusCount(Integer type) {
-		List<FailureDetailsDto> failureDetailsDtos =new ArrayList<>();
+		List<FailureDetailsDto> failureDetailsDtos = new ArrayList<>();
 		if (type.equals(SELECY_ALL)) {
 			failureDetailsDtos = this.queryForFailureDetailsList();
 		}
 		if (type.equals(SELECY_ISUBMIT)) {
 			failureDetailsDtos = this.queryForFailureDetailsList();
 		}
-		int auditStatus=0;
-		int submitStatus=0;
-		int maintainStatus=0;
-		int acceptanceStatus=0;
-		int refuseStatus=0;
-		int finishStatus=0;
+		int auditStatus = 0;
+		int submitStatus = 0;
+		int maintainStatus = 0;
+		int acceptanceStatus = 0;
+		int refuseStatus = 0;
+		int finishStatus = 0;
+		int inMaintenance = 0;
 
 		List<FailureStatusCountDto> list = new ArrayList<>();
 		// String[] statusName = new String[]{"待审核", "待提交", "待维修", "待验收", "已拒绝", "已完结"};
 		List<String> statusName = new ArrayList<>();
 		Collections.addAll(statusName, FailureStatuEnum.WAITING_AUDIT.getName(),
-				FailureStatuEnum.WAITING_SUBMIT.getName(),
-				FailureStatuEnum.WAITING_MAINTAIN.getName(),
-				FailureStatuEnum.WAITING_ACCEPTANCE.getName(),
-				FailureStatuEnum.REFUSE.getName());
+				FailureStatuEnum.WAITING_SUBMIT.getName(), FailureStatuEnum.WAITING_MAINTAIN.getName(),
+				FailureStatuEnum.WAITING_ACCEPTANCE.getName(), FailureStatuEnum.REFUSE.getName(),
+				FailureStatuEnum.FINISH.getName(), FailureStatuEnum.IN_MAINTENANCE.getName());
 
 		for (int i = 0; i < failureDetailsDtos.size(); i++) {
-			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_AUDIT.getCode())){
+			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_AUDIT.getCode())) {
 				auditStatus++;
 			}
-			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_SUBMIT.getCode())){
+			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_SUBMIT.getCode())) {
 				submitStatus++;
 			}
-			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_MAINTAIN.getCode())){
+			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_MAINTAIN.getCode())) {
 				maintainStatus++;
 			}
-			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_ACCEPTANCE.getCode())){
+			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_ACCEPTANCE.getCode())) {
 				acceptanceStatus++;
 			}
-			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.REFUSE.getCode())){
+			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.REFUSE.getCode())) {
 				refuseStatus++;
 			}
-			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.FINISH.getCode())){
+			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.FINISH.getCode())) {
 				finishStatus++;
 			}
-
+			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.IN_MAINTENANCE.getCode())) {
+				inMaintenance++;
+			}
 		}
-		int[] statusCount = {auditStatus,submitStatus,maintainStatus,acceptanceStatus,refuseStatus,finishStatus};
+
+		int[] statusCount = { auditStatus, submitStatus, maintainStatus, acceptanceStatus, refuseStatus, finishStatus,
+				inMaintenance };
+
 		for (int i = 0; i < statusName.size(); i++) {
-			FailureStatusCountDto statusCountDto= new FailureStatusCountDto();
+			FailureStatusCountDto statusCountDto = new FailureStatusCountDto();
 			statusCountDto.setStatus(statusName.get(i));
 			statusCountDto.setCount(statusCount[i]);
 			list.add(statusCountDto);
@@ -249,7 +254,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	 *
 	 * @throws Exception
 	 */
-	public Object savemodel(FailureDetailsDto failureDetailsDto, ReginParams userInfo) throws Exception {
+	public Object savemodel(FailureDetailsDto failureDetailsDto, ReginParams userInfo) {
 		String businessKey = buildOrderNo();
 		JSONObject body = new JSONObject();
 		body.put("businessKey", businessKey);
@@ -268,29 +273,29 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		failureDetailsDto.setProcessId(instance.getString("id"));
 		FailureDetailsDto model = null;
 		try {
-
-
 			// 发起主表流程 并添加至报修日志
 			failureDetailsDto.setSubmissionTime(new Date());
 			failureDetailsDto.setFailureCode(buildOrderNo());
-			failureDetailsDto.setBizCode(buildOrderNo());
+			failureDetailsDto.setBizCode(userInfo.getDepartment().getSequenceNbr());
 			failureDetailsDto.setIsDelete(false);
 			model = this.createWithModel(failureDetailsDto);
 
 			if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {
-				sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), 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();
+				Long departmentId = userInfo.getDepartment().getSequenceNbr();
 				Date processTime = model.getSubmissionTime();
-				repairlog(faultId, processAuditor,processAuditorId,departmentId, processTime, processDepartment, processResult);
-			}catch (Exception e){
+				repairlog(faultId, processAuditor, processAuditorId, departmentId, processTime, processDepartment,
+						processResult);
+			} catch (Exception e) {
 				e.printStackTrace();
 				logger.info("添加流程日志到数据库失败");
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -303,11 +308,11 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			return false;
 			// return CommonResponseUtil.failure("添加失败");
 		}
-		try{
+		try {
 			if (ObjectUtils.isNotEmpty(model)) {
 				excuteTask(instance.getString("id"), userInfo, null);
 			}
-		}catch (Exception e){
+		} catch (Exception e) {
 			e.printStackTrace();
 			return false;
 		}
@@ -319,8 +324,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) {
 		FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
 		failureRepairlogDto.setFaultId(faultId);
 		failureRepairlogDto.setProcessAuditor(processAuditor);
@@ -330,7 +335,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		failureRepairlogDto.setProcessDepartment(processDepartment);
 		failureRepairlogDto.setProcessResult(processResult);
 		FailureRepairlogDto RepairlogModel = failureRepairlogService.createWithModel(failureRepairlogDto);
-		if (ObjectUtils.isNotEmpty(RepairlogModel)){
+		if (ObjectUtils.isNotEmpty(RepairlogModel)) {
 			return true;
 		}
 		return false;
@@ -483,22 +488,36 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	public Object getCurrentProcessHistoryTask(Long id) {
 		FailureDetailsDto failureDetailsDto = this.queryBySeq(id);
 		String processId = failureDetailsDto.getProcessId();
-		JSONObject object=	workflowFeignService.queryHistoryTaskListByProcessId(processId);
-		JSONArray  datArray=null;
-		if(ObjectUtils.isNotEmpty(object)) {
-			 datArray=object.getJSONArray("rows");
+		JSONObject object = workflowFeignService.queryHistoryTaskListByProcessId(processId);
+		JSONArray datArray = null;
+		if (ObjectUtils.isNotEmpty(object)) {
+			datArray = object.getJSONArray("data");
 		}
+
 		List<Object> list = new ArrayList<Object>();
-		if(datArray!=null) {
-			datArray.stream().forEach(i->{
+		if (datArray != null) {
+			for (Object i : datArray) {
 				JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(i));
-				if(detail.containsKey("operator") && !detail.getString("name").equals("维修中")) {
-					//从流程记录表中拿到处理人的名称
-					FailureRepairlog  failureRepairlog=failureRepairlogService.findByprocessAuditorId(Long.parseLong(detail.getString("operator")));
-					detail.replace("operator", failureRepairlog.getProcessAuditor());
-					list.add(object);
-				}
-			});
+				if (detail.containsKey("operator") && !detail.getString("name").contains("维修中")) {
+					// 从流程记录表中拿到处理人的名称
+					FailureRepairlog failureRepairlog = failureRepairlogService
+							.findByprocessAuditor(detail.getString("operator"));
+					if(failureRepairlog!=null) {
+						detail.replace("operator", failureRepairlog.getProcessAuditorName()==null?"":failureRepairlog.getProcessAuditorName());
+					}
+				}
+				list.add(detail);
+			}
+//			datArray.stream().forEach(i -> {
+//				JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(i));
+//				if (detail.containsKey("operator") && !detail.getString("name").equals("维修中")) {
+//					// 从流程记录表中拿到处理人的名称
+//					FailureRepairlog failureRepairlog = failureRepairlogService
+//							.findByprocessAuditor(detail.getString("operator"));
+//					detail.replace("operator", failureRepairlog.getProcessAuditorName());
+//					list.add(detail);
+//				}
+//			});
 		}
 		return list;
 	}
@@ -516,35 +535,36 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
 	/**
 	 * 获取当前登录人能够操作的任务执行Button类型
+	 * 
 	 * @param sequenceNbr
 	 * @param userInfo
 	 * @return
 	 */
 	public Integer getExcuteTaskAuthButton(Long sequenceNbr, ReginParams userInfo) {
-		int flag=0;
+		int flag = 0;
 		Map<String, Object> map = this.checkExcuteTaskAuthMap(sequenceNbr, userInfo);
-		 if(Boolean.parseBoolean(map.get("checkFlag").toString())) {
+		if (Boolean.parseBoolean(map.get("checkFlag").toString())) {
 			String buttonValueString = map.get("name").toString();
-			if(buttonValueString.endsWith(PROCESS_NAME[0])) { //提交维修单
-				flag=1;
-			}else if(buttonValueString.endsWith(PROCESS_NAME[1])) {  //审核
-				flag=2;
-				if(buttonValueString.startsWith(PROCESS_NAME[2])) {
-					flag=3;
+			if (buttonValueString.endsWith(PROCESS_NAME[0])) { // 提交维修单
+				flag = 1;
+			} else if (buttonValueString.endsWith(PROCESS_NAME[1])) { // 审核
+				flag = 2;
+				if (buttonValueString.startsWith(PROCESS_NAME[2])) {
+					flag = 3;
 				}
-			}else if(buttonValueString.endsWith(PROCESS_NAME[2])) {//维修
-				flag=4;
-			}else if(buttonValueString.endsWith(PROCESS_NAME[3])) {//验收
-				flag=5;
+			} else if (buttonValueString.endsWith(PROCESS_NAME[2])) {// 维修
+				flag = 4;
+			} else if (buttonValueString.endsWith(PROCESS_NAME[3])) {// 验收
+				flag = 5;
 			}
 		}
 		FailureDetails details = this.baseMapper.selectById(sequenceNbr);
-		JSONObject object= workflowFeignService.queryHistoryTasksByProcessInstanceId(details.getProcessId());
-		JSONArray array=	object.getJSONArray("rows");
+		JSONObject object = workflowFeignService.queryHistoryTasksByProcessInstanceId(details.getProcessId());
+		JSONArray array = object.getJSONArray("rows");
 		for (Object historyDetail : array) {
-			JSONObject historyDetailJson=	JSONObject.parseObject(JSONObject.toJSONString(historyDetail));
-			if("rejected".equals(historyDetailJson.getString("activityId"))) {
-				flag=6;
+			JSONObject historyDetailJson = JSONObject.parseObject(JSONObject.toJSONString(historyDetail));
+			if ("rejected".equals(historyDetailJson.getString("activityId"))) {
+				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

@@ -3,8 +3,14 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
+import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -26,6 +32,7 @@ import com.yeejoin.amos.boot.module.common.api.service.IFailureMaintainService;
  * @date 2021-08-04
  */
 @Service
+@Transactional
 public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,FailureMaintain,FailureMaintainMapper> implements IFailureMaintainService {
     @Autowired
     SourceFileServiceImpl sourceFileServiceImpl;
@@ -34,6 +41,11 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     @Autowired
     FailureRepairlogServiceImpl failureRepairlogService;
 
+    private final Logger logger = LoggerFactory.getLogger(FailureMaintainServiceImpl.class);
+
+    private static String[] MAINTENANCE_STATUS= {"维修完成","维修中"};
+    private static String[] PROCESS_RESULT = {"验证通过","验证未通过"};
+
     /**
      * 分页查询
      */
@@ -51,10 +63,11 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     /**
      * 添加维修记录
      */
-    public FailureMaintainDto savemodel(FailureMaintainDto failureMaintainDto,ReginParams userInfo)   {
+    public Object savemodel(FailureMaintainDto failureMaintainDto,ReginParams userInfo)   {
+
         failureDetailsService.checkExcuteTaskAuthMap(failureMaintainDto.getFaultId(),userInfo);
 
-        failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, null);
+        try {
             this.createWithModel(failureMaintainDto);
             //添加完成后修改保修单状态为待验收
             FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
@@ -62,23 +75,55 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
             failureDetailsService.updateWithModel(failureDetailsDto);
 
             //添加报修日志
-        String processResult = "维修完成";
+            String processResult = MAINTENANCE_STATUS[1];//维修中
             Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
             repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),processAuditorId,userInfo.getDepartment().getSequenceNbr(),failureMaintainDto.getMaintainTime(),
                     failureMaintainDto.getDepartment(),processResult);
 
+            if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())){
                 sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),failureMaintainDto.getAttachment());
-        return failureMaintainDto;
+            }
+            failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, null);
+        }catch (Exception e){
+            e.printStackTrace();
+            e.printStackTrace();
+            logger.info("添加故障维修信息到数据库失败");
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false ;
         }
 
+        return true;
+    }
+
+
+
     /**
-     * 根据FaultId查询
+     * 更新状态维修完成
      */
-    public List<FailureMaintain> findByfaultId(Long faultId) {
-        Page<FailureMaintain> page = new Page<>();
-        QueryWrapper<FailureMaintain> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("fault_id", faultId).orderByDesc("submission_time");
-        return baseMapper.selectList(queryWrapper);
+    public Boolean updateStatus(FailureMaintainDto failureMaintainDto,ReginParams userInfo) {
+        try {
+        FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
+        failureDetailsDto.setCurrentStatus(FailureStatuEnum.IN_MAINTENANCE.getCode());
+        this.updateWithModel(failureMaintainDto);
+
+        //添加报修日志
+        String processResult = MAINTENANCE_STATUS[0];//维修完成
+        Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
+        repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),processAuditorId,userInfo.getDepartment().getSequenceNbr(),failureMaintainDto.getMaintainTime(),
+                failureMaintainDto.getDepartment(),processResult);
+
+        if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())){
+            sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),failureMaintainDto.getAttachment());
+        }
+        failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, null);
+    }catch (Exception e){
+        e.printStackTrace();
+        logger.info("更新故障验收信息到数据库失败");
+        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        return false ;
+    }
+
+        return true;
     }
 
     /**
@@ -87,21 +132,27 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     public Boolean updateModel(FailureMaintainDto failureMaintainDto, Integer status, ReginParams userInfo)   {
 
         boolean result = failureDetailsService.checkExcuteTaskAuth(failureMaintainDto.getFaultId(), userInfo);
+        FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
         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());
+            if (status == AuditResultEnum.AGREE.getCode() && userInfo.getDepartment().getSequenceNbr()
+                    == failureDetailsDto.getBizCode()) {//同意状态为已完结
+                failureDetailsDto.setCurrentStatus(failureDetailsDto.getCurrentStatus());
+                failureDetailsService.updateWithModel(failureDetailsDto);
+                processResult =PROCESS_RESULT[0] ;
+                condition= AuditResultEnum.AGREE.getName();
+            }else if (status == AuditResultEnum.AGREE.getCode() ) {//同意状态为已完结
+                failureDetailsDto.setCurrentStatus(failureDetailsDto.getCurrentStatus());
                 failureDetailsService.updateWithModel(failureDetailsDto);
-                processResult = "验证通过";
+                processResult =PROCESS_RESULT[0] ;
                 condition= AuditResultEnum.AGREE.getName();
-            }else {//不同意状态为已拒绝
+            } else {//不同意状态为已拒绝
                 failureDetailsDto.setCurrentStatus(FailureStatuEnum.REFUSE.getCode());
                 failureDetailsService.updateWithModel(failureDetailsDto);
-                processResult = "验证未通过";
+                processResult = PROCESS_RESULT[1];
                 condition = AuditResultEnum.REFUSE.getName();
             }
             //添加报修日志

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

@@ -47,9 +47,9 @@ public class FailureRepairlogServiceImpl extends BaseService<FailureRepairlogDto
     }
     
     
-    public FailureRepairlog findByprocessAuditorId(Long userId) {
-         QueryWrapper<FailureRepairlog> queryWrapper = new QueryWrapper<FailureRepairlog>();
-         queryWrapper.eq("process_auditor_id", userId);
+    public FailureRepairlog findByprocessAuditor(String userId) {
+         LambdaQueryWrapper<FailureRepairlog> queryWrapper = new LambdaQueryWrapper<FailureRepairlog>();
+         queryWrapper.eq(FailureRepairlog::getProcessAuditor, userId);
          queryWrapper.last("LIMIT 1");
          return  baseMapper.selectOne(queryWrapper);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -295,28 +295,24 @@ public class CheckController extends AbstractBaseController {
     /**
      * 获取巡检日历数据
      *
-     * @param queryRequests
+     * @param date
      * @return
      */
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "获取巡检日历数据<font color='blue'>手机app</font>", notes = "获取巡检日历数据<font color='blue'>手机app</font>")
-    @PostMapping(value = "/checkCalendar", produces = "application/json;charset=UTF-8")
+    @ApiOperation(value = "维保日历-mobile", notes = "维保日历-mobile")
+    @GetMapping(value = "/{date}/checkCalendar", produces = "application/json;charset=UTF-8")
     public CommonResponse checkCalendar(
-            @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
-        try {
+            @ApiParam(value = "date,格式YYYY-MM-DD",required = true)@PathVariable String date) {
+        HashMap<String, Object> params = new HashMap<>();
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
-            String roleTypeName = getRoleTypeName(reginParams);
-            List<DaoCriteria> daoCriterias = buildDaoCriterias(queryRequests, true, loginOrgCode, roleTypeName);
-
-
-            Map<String, Object> map = checkService.checkCalendar(CheckParamUtil.checkCalendar(daoCriterias));
+        Map<String, Object> authMap = Bean.BeantoMap(reginParams.getPersonIdentity());
+        params.putAll(authMap);
+        params.put("checkTime", date);
+        params.put("orgCode", loginOrgCode);
+        Map<String, Object> map = checkService.checkCalendar(params);
         return CommonResponseUtil.success(map);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return CommonResponseUtil.failure(e.getMessage());
-        }
-
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -347,13 +343,8 @@ public class CheckController extends AbstractBaseController {
     @ApiOperation(value = "获取巡检记录详情信息<font color='blue'>手机app</font>", notes = "获取巡检记录详情信息<font color='blue'>手机app</font>")
     @RequestMapping(value = "/queryCheckDetail", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryRecordById(@RequestParam(required = true) int checkId) {
-        try {
         Map<String, Object> map = checkService.queryRecordById(checkId);
         return CommonResponseUtil.success(map);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return CommonResponseUtil.failure(e.getMessage());
-        }
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/StatisticsController.java

+package com.yeejoin.amos.maintenance.business.controller;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.maintenance.business.service.intfc.IStatisticsService;
+import com.yeejoin.amos.maintenance.business.util.CommonResponse;
+import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
+import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+@RestController
+@RequestMapping(value = "/api/statistics")
+@Api(tags = "统计api")
+public class StatisticsController extends AbstractBaseController {
+
+    @Autowired
+    IStatisticsService iStatisticsService;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PersonIdentify
+    @GetMapping(value = "/task")
+    @ApiOperation(value = "app首页任务统计")
+    public CommonResponse taskStatusStatistics(){
+        ReginParams reginParams = getSelectedOrgInfo();
+        String loginOrgCode = getOrgCode(reginParams);
+        Map<String,Object> result = iStatisticsService.taskStatusStatistics(opIdentifyInfo(),loginOrgCode);
+        return CommonResponseUtil.success(result);
+    }
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dao/mapper/CheckMapper.java

@@ -45,14 +45,14 @@ public interface CheckMapper extends BaseMapper {
 	 * @param param
 	 * @return
 	 */
-	Map<String,Object> pieChartData(CheckRecordParam param);
+	Map<String,Object> pieChartData(Map<String,Object> param);
 
 	/**
 	 * 巡检日历日历数据
 	 * @param param
 	 * @return
 	 */
-	List<Map<String,Object>> calendarData(CheckRecordParam param);
+	List<Map<String,Object>> calendarData(Map<String,Object> param);
 
 	List<Map<String, Object>> queryRecordByPointId(HashMap<String, Object> req);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dao/mapper/PlanTaskMapper.java

@@ -179,4 +179,5 @@ public interface PlanTaskMapper extends BaseMapper {
 	List<Map<String, Object>> queryTimeAxis(HashMap<String, Object> params);
 
 
+    List<Map<String, Object>> statisticsTaskWithAuth(Map<String, Object> param);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/EquipFeign.java

 package com.yeejoin.amos.maintenance.business.feign;
 
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -37,5 +34,14 @@ public interface EquipFeign {
      */
     @RequestMapping(value = "${equip.fegin.prefix}"+"/area/tree", method = RequestMethod.GET ,consumes="application/json")
     LinkedHashMap<String,Object> getRegionTress();
+
+    /**
+     * 查询维保到期设备
+     * @param type
+     * @param companyId
+     * @return
+     */
+    @GetMapping(value = "${equip.fegin.prefix}+/facility")
+    List<Map<String,Object>> overTimeMaintenanceFacility(@RequestParam String type,String companyId);
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/Remote3D.java

-package com.yeejoin.amos.maintenance.business.feign;
-
-//@RequestLine
-//@FeignClient(name = "${Remote3D.fegin.name}",configuration=FeignConfiguration.class)
-//public interface Remote3D {
-//	@RequestMapping(value = "/patrol/check", method = RequestMethod.POST)
-//	@ResponseBody
-//	CommonResponse checkStatusPush( @RequestBody List<PointCheckInfoRespone> pointCheckInfo);
-//
-//    
-//   @RequestMapping(value = "/patrol/task", method = RequestMethod.POST)
-//    CommonResponse errorTaskPushTo3D( @RequestBody List<TaskInfoRespone> taskInfoRespone);
-//    
-//    
-//    @RequestMapping(value = "/view3d/synchronous/points", method = RequestMethod.POST)
-//    CommonResponse pointInfoPush( @RequestBody List<PointInfoSyn3DRespone> pointInfoResponseList);
-//    
-//    
-//    @RequestMapping(value = "/view3d/synchronous/routes", method = RequestMethod.POST)
-//    CommonResponse routeInfoPush( @RequestBody List<RouteResponse> routeResponseList);
-//    
-//    
-//    
-//   
-//    
-//    
-//    
-//}
-
-
-		    
-	
-	  
-	    
-	    
-	    
-

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/Remote3DServer.java

-//package com.yeejoin.amos.maintenance.business.feign;
-//
-//import java.util.List;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.http.HttpEntity;
-//import org.springframework.http.HttpHeaders;
-//import org.springframework.http.MediaType;
-//import org.springframework.stereotype.Service;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.client.RestTemplate;
-//
-//import com.yeejoin.amos.maintenance.business.util.CommonResponse;
-//import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
-//import com.yeejoin.amos.maintenance.core.common.response.PointCheckInfoRespone;
-//import com.yeejoin.amos.maintenance.core.common.response.PointInfoSyn3DRespone;
-//import com.yeejoin.amos.maintenance.core.common.response.RouteResponse;
-//import com.yeejoin.amos.maintenance.core.common.response.TaskInfoRespone;
-//
-//
-//
-////三维远程访问
-//@Service("remote3DServer")
-//public class Remote3DServer {
-//	    @Autowired
-//	    private RestTemplate restTemplate;
-//	
-//	    @Value("${Remote3D.fegin.name}")
-//	    private String Remote3DFeginName;
-//
-//
-//	    private static String checkStatusPush = "/patrol/check";
-//
-//	    private static String errorTaskPushTo3D = "/patrol/task";
-//
-//	    private static String pointInfoPush = "/view3d/synchronous/points";
-//
-//	    private static String routeInfoPush = "/view3d/synchronous/routes";
-//	    
-//	   
-//	    
-//	    public  String geturls(String url){
-//	    	return "http://"+Remote3DFeginName+url;
-//	    }
-//	    public  HttpHeaders getHeader(String toke,String product,String appKey){
-//	    	HttpHeaders headers = new HttpHeaders();
-//		    headers.setContentType(MediaType.APPLICATION_JSON);
-//		    headers.set("Content-Type", "application/json");  
-//		    headers.set("token", toke);
-//		    headers.set("product",product);
-//		    headers.set("appKey", appKey);
-//		    return headers;
-//	    } 
-//	    
-//	    
-//		public CommonResponse checkStatusPush( String toke,String product,String appKey, List<PointCheckInfoRespone> pointCheckInfo){
-//			  try {
-//			    HttpEntity httpEntity = new HttpEntity<>(pointCheckInfo, getHeader( toke, product, appKey));
-//			    CommonResponse commonResponse1 =  restTemplate.postForObject(geturls(checkStatusPush),httpEntity, CommonResponse.class);
-//				return commonResponse1;
-//				} catch (Exception e) {
-//				e.printStackTrace();	 
-//				 return CommonResponseUtil.failure("发送失败");	
-//				 
-//				}
-//		}
-//
-//	    
-//	 
-//		public CommonResponse errorTaskPushTo3D( String toke,String product,String appKey, List<TaskInfoRespone> taskInfoRespone){
-//			 try {
-//				    HttpEntity httpEntity = new HttpEntity<>(taskInfoRespone, getHeader( toke, product, appKey));
-//				    CommonResponse commonResponse1 =  restTemplate.postForObject(geturls(errorTaskPushTo3D),httpEntity, CommonResponse.class);
-//					return commonResponse1;
-//					} catch (Exception e) {
-//					e.printStackTrace();	 
-//					 return CommonResponseUtil.failure("发送失败");	
-//					 
-//					}
-//		}
-//	    
-//	    
-//	    public CommonResponse pointInfoPush(String toke,String product,String appKey,List<PointInfoSyn3DRespone> pointInfoResponseList){
-//	    	 try {
-//				    HttpEntity httpEntity = new HttpEntity<>(pointInfoResponseList, getHeader( toke, product, appKey));
-//				    CommonResponse commonResponse1 =  restTemplate.postForObject(geturls(pointInfoPush),httpEntity, CommonResponse.class);
-//					return commonResponse1;
-//					} catch (Exception e) {
-//					e.printStackTrace();	 
-//					 return CommonResponseUtil.failure("发送失败");	
-//					 
-//					}
-//	    }
-//	    
-//	    
-//	    public CommonResponse routeInfoPush( String toke,String product,String appKey, List<RouteResponse> routeResponseList){
-//	    	 try {
-//				    HttpEntity httpEntity = new HttpEntity<>(routeResponseList, getHeader( toke, product, appKey));
-//				    CommonResponse commonResponse1 =  restTemplate.postForObject(geturls(routeInfoPush),httpEntity, CommonResponse.class);
-//					return commonResponse1;
-//					} catch (Exception e) {
-//					e.printStackTrace();	 
-//					 return CommonResponseUtil.failure("发送失败");	
-//					 
-//					}
-//	    }
-//	    
-//	    
-//	    
-//	     
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	
-//}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java

@@ -624,26 +624,16 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
-    public Map<String, Object> checkCalendar(CheckRecordParam recordParam) {
-        Map<String, Object> charData = checkMapper.pieChartData(recordParam);
-        List<Map<String, Object>> calendarData = checkMapper.calendarData(recordParam);
+    public Map<String, Object> checkCalendar(Map<String, Object> param) {
+        Map<String, Object> charData = checkMapper.pieChartData(param);
+        List<Map<String, Object>> calendarData = checkMapper.calendarData(param);
         Map<String, Object> result = new HashMap<>();
-        Map<String, List<CalendarStatusCountRespone>> calendarMap = new HashMap<>();
-        if (!calendarData.isEmpty()) {
-            calendarData.forEach(action -> {
-                List<CalendarStatusCountRespone> statusCountList = new ArrayList<>();
-                CalendarStatusCountRespone statusCount = new CalendarStatusCountRespone();
-                statusCount.setCount(Double.valueOf(action.get("count").toString()));
-                statusCount.setStatus(action.get("status").toString());
-                if (calendarMap.containsKey(action.get("time"))) {
-                    statusCountList = calendarMap.get(action.get("time"));
-                    statusCountList.add(statusCount);
-                } else {
-                    statusCountList.add(statusCount);
-                    calendarMap.put(action.get("time").toString(), statusCountList);
-                }
-            });
-        }
+        Map<String,List<CalendarStatusCountRespone>> calendarMap = calendarData.stream().collect(Collectors.groupingBy(map -> map.get("time").toString(),Collectors.mapping(c->{
+            CalendarStatusCountRespone countRespone = new CalendarStatusCountRespone();
+            countRespone.setCount(Long.parseLong(c.get("count").toString()));
+            countRespone.setStatus(c.get("status").toString());
+            return countRespone;
+        },Collectors.toList())));
         result.put("charData", charData);
         result.put("calendarData", calendarMap);
         return result;

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PointServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.maintenance.business.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -35,6 +36,7 @@ import org.springframework.data.domain.*;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -228,26 +230,19 @@ public class PointServiceImpl implements IPointService {
         if (!pointInputItems.isEmpty()) {
             iPointInputItemDao.saveAll(pointInputItems);
         }
-        //TODO 2.分类暂时不需要 维保
     }
 
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public List<Long> delPointById(Long[] ids) {
         List<Long> idList = new ArrayList<Long>();
-        for (long pointId : ids) {
-            idList.add(pointId);
-        }
-        iPointClassifyDao.deleteByPointId(idList); // 物理删除点的分类
+        idList.addAll(Arrays.asList(ids));
         List<PointInputItem> pointInputItem = iPointInputItemDao.findAllById(idList);
         List<Long> pointInputItemIds = Lists.transform(pointInputItem, PointInputItem::getId);
-        if (pointInputItemIds.size() > 0)
-            iPointInputItemDao.deleteFmeaRelationByPointInputItemIds(pointInputItemIds);//物理删除fmea关联巡检点项
-        iPointInputItemDao.deleteByPointId(idList); // 物理删除p_point_inputitem表对应行
-        iPointPhotoDao.deleteByPointId(idList); // 物理删除点的图片信息
-        // iRoutePointDao.delRoutePointByPointId(idList); //
-        // 物理删除p_route_point中相关行
+        // 物理删除p_point_inputitem表对应行
+        iPointInputItemDao.deleteByPointId(idList);
+        // 物理删除p_route_point、p_route_point_item中相关行
         List<BigInteger> routePointIdList = iRoutePointDao.queryRoutePointByPointId(idList);
         for (BigInteger routePointId : routePointIdList) {
             iRoutePointItemDao.delRoutePointItem(routePointId.longValue());
@@ -270,18 +265,19 @@ public class PointServiceImpl implements IPointService {
                 }
             }
         }
-
-        iPlanTaskDetailDao.deletePlanTaskDetailByPointId(idList); // 删除p_plan_task_detail相关行
+        // 删除p_plan_task_detail相关行
+        iPlanTaskDetailDao.deletePlanTaskDetailByPointId(idList);
+        // 删除p_point相关行
         iPointDao.delPointById(idList);
         return idList;
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public Point updatePoint(PointParam pointParam) {
         //1.更新点
         long pointId = pointParam.getPoint().getId();
-        Point newPoint = iPointDao.findById(pointId).get();
+        Point newPoint = iPointDao.findById(pointId).orElseThrow(()->new RuntimeException("找不到原始数据"));
         Bean.copyExistPropertis(pointParam.getPoint(), newPoint);
         newPoint.setLastUpdateTime(new Date());
         iPointDao.save(newPoint);
@@ -381,6 +377,7 @@ public class PointServiceImpl implements IPointService {
         }
         return returnList;
     }
+
     @Override
     public List<PointInputItemVo> queryPointInputItem(Long pointId) {
         return pointMapper.getPointInputItemById1(pointId, null);
@@ -1089,11 +1086,27 @@ public class PointServiceImpl implements IPointService {
         return equipFeign.getRegionTress();
     }
 
+
     @Override
+    @Async
     public void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId) {
         List<Point> points = new ArrayList<>();
         List<PointInputItem> inputItems = new ArrayList<>();
-        List<Long> ids = new ArrayList<Long>();
+        List<Long> ids = new ArrayList<>();
+        //1.删除已有数据
+        for (MaintenanceResourceData x : list) {
+            String pointNo = x.getFireFacilityCode();
+            String originalId = String.valueOf(x.getFireFacilityId());
+            Long id = iPointDao.findPointByEquipmentIdAndFireFacilityId(pointNo, originalId);
+            if (null != id) {
+                ids.add(id);
+            }
+        }
+        if (!ids.isEmpty()) {
+            Long[] idsArray = ids.toArray(new Long[0]);
+            delPointById(idsArray);
+        }
+        //2.创建
         for (MaintenanceResourceData x : list) {
             Point point = new Point();
             String pointNo = StringUtil.isNotEmpty(x.getFireFacilityCode()) ? x.getFireFacilityCode() : String.valueOf(sequence.nextId());
@@ -1107,16 +1120,13 @@ public class PointServiceImpl implements IPointService {
             point.setBelongSystemName(x.getFireFightSysName());
             point.setOwnerId(String.valueOf(x.getOwnerUnitId()));
             point.setOwnerName(x.getOwnerUnitName());
-            point.setAddress(x.getLocation());
+            point.setBuildingId(x.getBuildingId() != null ? x.getBuildingId().toString() : "");
+            point.setBuildingName(x.getBuildingName());
+            point.setAddress(x.getArea());
             point.setLevel("");
             point.setCreatorId(userId);
             point.setOrgCode(orgCode);
             points.add(point);
-            Long id = iPointDao.findPointByEquipmentIdAndFireFacilityId(pointNo, originalId);
-            if (null != id) {
-                ids.add(id);
-                iPointDao.delPointBIds(id);
-            }
             iPointDao.save(point);
             List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(x.getClassifyName(), orgCode);
             if (0 < inputItemVos.size()) {
@@ -1129,9 +1139,6 @@ public class PointServiceImpl implements IPointService {
                 });
             }
         }
-        if (0 < ids.size()) {
-            iPointInputItemDao.deleteByPointId(ids);
-        }
         iPointInputItemDao.saveAll(inputItems);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/StatisticsServiceImpl.java

+package com.yeejoin.amos.maintenance.business.service.impl;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskMapper;
+import com.yeejoin.amos.maintenance.business.feign.EquipFeign;
+import com.yeejoin.amos.maintenance.business.service.intfc.IStatisticsService;
+import com.yeejoin.amos.maintenance.common.enums.PlanTaskDetailIsFinishEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author DELL
+ */
+@Service
+public class StatisticsServiceImpl implements IStatisticsService {
+
+    @Autowired
+    PlanTaskMapper planTaskMapper;
+    @Autowired
+    EquipFeign equipFeign;
+
+    @Override
+    public Map<String, Object> taskStatusStatistics(ReginParams.PersonIdentity opIdentifyInfo, String orgCode) {
+        Map<String, Object> param = Bean.BeantoMap(opIdentifyInfo);
+        param.put("orgCode", orgCode);
+        List<Map<String, Object>> list = planTaskMapper.statisticsTaskWithAuth(param);
+        Map<Integer, Long> statusNumberMap = list.stream().collect(Collectors.toMap(map -> Integer.parseInt(map.get("is_finish").toString()), v -> Long.parseLong(v.get("total").toString())));
+        Map<String, Object> resultMap = new HashMap<>();
+        // 待执行任务数量
+        resultMap.put("waitExecuteTask", statusNumberMap.get(PlanTaskDetailIsFinishEnum.UNFINISHED.getValue()) == null ? 0L : statusNumberMap.get(PlanTaskDetailIsFinishEnum.UNFINISHED.getValue()));
+        // 超时任务数量
+        resultMap.put("overTimeTask", statusNumberMap.get(PlanTaskDetailIsFinishEnum.OVERTIME.getValue()) == null ? 0L : statusNumberMap.get(PlanTaskDetailIsFinishEnum.OVERTIME.getValue()));
+        List<Map<String, Object>> overTimeFacility = new ArrayList<>();
+        //overTimeFacility = equipFeign.overTimeMaintenanceFacility(opIdentifyInfo.getIdentityType(),opIdentifyInfo.getCompanyId());
+        // 到期维保设备
+        resultMap.put("overTimeFacility", overTimeFacility.size());
+        return resultMap;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/ICheckService.java

@@ -66,7 +66,7 @@ public interface ICheckService {
      * @param requestParam
      * @return
      */
-    Map<String, Object> checkCalendar(CheckRecordParam requestParam);
+    Map<String, Object> checkCalendar(Map<String, Object> requestParam);
 
     /**
      * 根据点ID查询点巡检记录 手机APP

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/IPointService.java

@@ -297,7 +297,7 @@ public interface IPointService {
 
     List queryItemList4RoutePoint(Long pointId, Long equipId);
 
-    LinkedHashMap<String,Object> getRegionTress ();
+    LinkedHashMap<String,Object> getRegionTress();
 
     void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId);
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/IStatisticsService.java

+package com.yeejoin.amos.maintenance.business.service.intfc;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+public interface IStatisticsService {
+    /**
+     * 维保任务统计
+     * @return Map<String, Object>
+     */
+    Map<String, Object> taskStatusStatistics(ReginParams.PersonIdentity opIdentifyInfo, String loginOrgCode);
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/vo/MaintenanceResourceData.java

 package com.yeejoin.amos.maintenance.business.vo;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -53,7 +52,6 @@ public class MaintenanceResourceData {
     /**
      * 业主单位名称
      */
-    @Excel(name = "所属单位", width = 30, orderNum = "7")
     private String ownerUnitName;
 
     /**
@@ -69,7 +67,6 @@ public class MaintenanceResourceData {
     /**
      * 消防系统名称
      */
-    @Excel(name = "所属消防系统", width = 30, orderNum = "4")
     private String fireFightSysName;
 
     /**
@@ -85,7 +82,6 @@ public class MaintenanceResourceData {
     /**
      * 分类名称
      */
-    @Excel(name = "设施类型", width = 30, orderNum = "3")
     private String classifyName;
 
     /**
@@ -101,13 +97,11 @@ public class MaintenanceResourceData {
     /**
      * 消防设施编码
      */
-    @Excel(name = "设施编码", width = 30, orderNum = "6")
     private String fireFacilityCode;
 
     /**
      * 消防设施名称
      */
-    @Excel(name = "设施名称", width = 30, orderNum = "1")
     private String fireFacilityName;
 
     /**
@@ -116,29 +110,10 @@ public class MaintenanceResourceData {
     private String fireFacilityType;
 
     /**
-     * 维保到期时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "到期维保时间", exportFormat = "yyyy-MM-dd HH:mm:ss", importFormat = "yyyy-MM-dd HH:mm:ss", width = 30, orderNum = "5")
-    private Date maintenanceExpirationTime;
-
-    /**
      * 位置
      */
-    @Excel(name = "安装或设置位置", width = 50, orderNum = "2")
     private String location;
 
-    /**
-     * 建筑层级IDS
-     */
-    private String buildTierIds;
-
-    /**
-     * 新增和更新执行
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "添加时间", exportFormat = "yyyy-MM-dd HH:mm:ss", importFormat = "yyyy-MM-dd HH:mm:ss", width = 30, orderNum = "8")
-    private Date createDate;
 
     /**
      * 建筑ID
@@ -150,17 +125,12 @@ public class MaintenanceResourceData {
      */
     private String buildingName;
 
-    /**
-     * 是否已关联
-     */
-    private List<Long> buildingIds;
 
     /**
-     * 是否已关联
+     * 详情位置
      */
-    private Boolean isRelation;
+    private String area;
+
+
 
-//    public void setRelation(Boolean relation) {
-//        isRelation = relation == null ? null : false;
-//    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.SystemClock;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -68,7 +67,7 @@ import java.util.stream.Stream;
  */
 @RestController
 @Api(tags = "警情接警填报记录Api")
-@RequestMapping(value = "/tzs/alert-called")
+@RequestMapping(value = "/alert-called")
 public class AlertCalledController extends BaseController {
 
 	@Autowired
@@ -218,21 +217,21 @@ public class AlertCalledController extends BaseController {
             // 当天接警
             alarmStatisticsDto.setTodayAlarmNum(map.get("calledCount") == null  ? 0 : Integer.valueOf(map.get("calledCount").toString()))   ;
             //当天提交
-            alarmStatisticsDto.setTodayAlarmNum(map.get("majorAlertCount") == null  ? 0 : Integer.valueOf(map.get("majorAlertCount").toString()))   ;
+            alarmStatisticsDto.setSubmitNum(map.get("majorAlertCount") == null  ? 0 : Integer.valueOf(map.get("majorAlertCount").toString()))   ;
             //投诉咨询数量
             alarmStatisticsDto.setSuggestions(map.get("suggestionsCount") == null  ? 0 : Integer.valueOf(map.get("suggestionsCount").toString()))   ;
             //故障维修数量
-            alarmStatisticsDto.setSuggestions(map.get("faultRescueCount") == null  ? 0 : Integer.valueOf(map.get("faultRescueCount").toString()))   ;
+            alarmStatisticsDto.setFaultRescue(map.get("faultRescueCount") == null  ? 0 : Integer.valueOf(map.get("faultRescueCount").toString()))   ;
             //困人救援数量
-            alarmStatisticsDto.setSuggestions(map.get("sleepyIncidentCount") == null  ? 0 : Integer.valueOf(map.get("sleepyIncidentCount").toString()))   ;
+            alarmStatisticsDto.setSleepyIncident(map.get("sleepyIncidentCount") == null  ? 0 : Integer.valueOf(map.get("sleepyIncidentCount").toString()))   ;
 
             Map<String,Integer> recordMap = Maps.newHashMap();
             // 近七天办理数量
             for(int i = 1 ; i < 8; i++) {
-				Map<String, Object> nearlySevenDaysMap =    iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 00:00:00",
-						DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 23:59:59",null,
+				Map<String, Object> nearlySevenDaysMap =    iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), -i).getTime(),"yyyy-MM-dd")+" 00:00:00",
+						DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), -i).getTime(),"yyyy-MM-dd")+" 23:59:59",null,
 						getUserInfo().getUserId());
-                recordMap.put(DateUtils.dateFormat(DateUtils.dateAddDays(new Date(), -i),""),nearlySevenDaysMap.get("calledCount") == null  ? 0 : Integer.valueOf(nearlySevenDaysMap.get("calledCount").toString()));
+                recordMap.put(DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), -i).getTime(),"yyyy-MM-dd"),nearlySevenDaysMap.get("calledCount") == null  ? 0 : Integer.valueOf(nearlySevenDaysMap.get("calledCount").toString()));
             }
             alarmStatisticsDto.setNearlySevenDaysNum(recordMap);
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchPaperController.java

@@ -34,7 +34,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
  */
 @RestController
 @Api(tags = "派遣单Api")
-@RequestMapping(value = "/tzs/dispatch-paper")
+@RequestMapping(value = "/dispatch-paper")
 public class DispatchPaperController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchTaskController.java

@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @Api(tags = "派遣任务Api")
-@RequestMapping(value = "/tzs/dispatch-task")
+@RequestMapping(value = "/dispatch-task")
 public class DispatchTaskController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RepairConsultController.java

@@ -35,7 +35,7 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "处置过程Api")
-@RequestMapping(value = "/tzs/repair-consult")
+@RequestMapping(value = "/repair-consult")
 public class RepairConsultController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RescueProcessController.java

@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @Api(tags = "救援过程表Api")
-@RequestMapping(value = "/tzs/rescue-process")
+@RequestMapping(value = "/rescue-process")
 public class RescueProcessController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TemplateController.java

@@ -32,7 +32,7 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "模板表Api")
-@RequestMapping(value = "/tzs/template")
+@RequestMapping(value = "/template")
 public class TemplateController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/VoiceRecordFileController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
@@ -39,7 +38,7 @@ import java.util.UUID;
  */
 @RestController
 @Api(tags = "通话记录附件Api")
-@RequestMapping(value = "/tzs/voice-record-file")
+@RequestMapping(value = "/voice-record-file")
 public class VoiceRecordFileController extends BaseController {
 
     @Autowired

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

@@ -171,39 +171,39 @@ public class ESAlertCalledService {
         long currentTime = System.currentTimeMillis() ;
         currentTime = currentTime - 120*60*1000;
         BoolQueryBuilder qb1 = QueryBuilders.boolQuery()
-        		.must(QueryBuilders.rangeQuery("callTimeLong").gte(currentTime));
+        		.filter(QueryBuilders.rangeQuery("callTimeLong").gte(currentTime));
         boolMust.must(qb1);
         //报警电话一致
         if (!ValidationUtil.isEmpty(alertCalled.getEmergencyCall()) && !ValidationUtil.isEmpty(alertCalled.getContactPhone()))
 		{
         	BoolQueryBuilder qb2 = QueryBuilders.boolQuery()
-        			.must(QueryBuilders.termQuery("emergencyCall.keyword", alertCalled.getEmergencyCall()))
-        			.must(QueryBuilders.termQuery("contactPhone.keyword", alertCalled.getContactPhone()));
-        	boolMust.should(qb2);
+        			.should(QueryBuilders.termQuery("emergencyCall.keyword", alertCalled.getEmergencyCall()))
+        			.should(QueryBuilders.termQuery("contactPhone.keyword", alertCalled.getContactPhone()));
+        	boolMust.must(qb2);
 		}
         //事发地点一致，或相距不超过200米的
         if (!ValidationUtil.isEmpty(alertCalled.getAddress()))
 		{
         	BoolQueryBuilder qb3 = QueryBuilders.boolQuery()
-        			.should(QueryBuilders.matchQuery("address", alertCalled.getAddress()));
+        			.filter(QueryBuilders.matchQuery("address", alertCalled.getAddress()));
         	boolMust.should(qb3);
 		}
         //警情类型一致
         BoolQueryBuilder qb4 = QueryBuilders.boolQuery()
-        		.must(QueryBuilders.termQuery("alarmTypeCode", alertCalled.getAlarmTypeCode()));
+        		.filter(QueryBuilders.termQuery("alarmTypeCode", alertCalled.getAlarmTypeCode()));
         boolMust.must(qb4);
         //使用单位名称一致
         if (!ValidationUtil.isEmpty(alertCalled.getUseUnit()))
 		{
         	BoolQueryBuilder qb5 = QueryBuilders.boolQuery()
-        			.must(QueryBuilders.termQuery("useUnit.keyword", alertCalled.getUseUnit()));
+        			.filter(QueryBuilders.termQuery("useUnit.keyword", alertCalled.getUseUnit()));
         	boolMust.must(qb5);
 		}
         //电梯识别码一致
         if(!ValidationUtil.isEmpty(alertCalled.getDeviceId())) {
 			BoolQueryBuilder qb6 = QueryBuilders.boolQuery()
-					.must(QueryBuilders.termQuery("deviceId.keyword", alertCalled.getDeviceId()));
-			boolMust.should(qb6);
+					.filter(QueryBuilders.termQuery("deviceId.keyword", alertCalled.getDeviceId()));
+			boolMust.must(qb6);
 		}
 
         /**

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -286,27 +286,32 @@
         COUNT(id) count
         FROM
         p_check
-        WHERE
-        DATE_FORMAT(check_time, '%Y-%m') = #{checkTime}
-        <if test="userId!=null and userId!=0">AND FIND_IN_SET(#{userId}, user_id)>0</if>
-        <if test="routeId!=null and routeId!=0">AND route_id = #{routeId}</if>
-        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>
+        <include refid="calendar-where"/>
     </select>
 
+    <sql id="calendar-where">
+        <where>
+            DATE_FORMAT(check_time, '%Y-%m') = #{checkTime}
+            <choose>
+                <when test="identityType==1">
+                    And (org_code LIKE CONCAT( #{orgCode}, '-%' ) or org_code= #{orgCode} )
+                </when>
+                <when test="identityType==2">
+                    And owner_id = #{companyId}
+                </when>
+            </choose>
+        </where>
+    </sql>
     <select id="calendarData" resultType="Map">
         SELECT
-        sum(is_ok) AS count,
+        count(id) AS count,
         DATE_FORMAT(check_time, '%Y-%m-%d') time,
         is_ok status
         FROM
         p_check
-        WHERE
-        DATE_FORMAT(check_time, '%Y-%m') = #{checkTime}
-        <if test="userId!=null and userId!=0">AND FIND_IN_SET(#{userId}, user_id)>0</if>
-        <if test="routeId!=null and routeId!=0">AND route_id = #{routeId}</if>
-        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>
+        <include refid="calendar-where"/>
         GROUP BY is_ok,time
-        ORDER BY time
+        ORDER BY check_time
     </select>
 
 

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -833,4 +833,24 @@
 		ORDER BY
 		ppk.begin_time DESC  LIMIT 60
 	</select>
+    <select id="statisticsTaskWithAuth" resultType="java.util.Map">
+		SELECT
+			count(1) as total,
+			td.is_finish
+		from p_plan_task_detail td ,
+			 p_plan_task t,
+			 p_route r
+		where
+		      td.task_no = t.id
+		  and t.route_id = r.id
+		<choose>
+			<when test="identityType==1">
+				and (t.org_code LIKE CONCAT( #{orgCode}, '-%' ) or t.org_code= #{orgCode} )
+			</when>
+			<when test="identityType==2">
+				And r.owner_id = #{companyId}
+			</when>
+		</choose>
+		GROUP BY td.is_finish
+	</select>
 </mapper>
\ No newline at end of file