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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 故障报修验收记录
+ *
+ * @author system_generator
+ * @date 2021-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="FailureVerifyDto", description="故障报修验收记录")
+public class FailureVerifyDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "验收人")
+    private String acceptor;
+
+    @ApiModelProperty(value = "验收部门")
+    private String verifyDepartment;
+
+    @ApiModelProperty(value = "验收部门的id")
+    private Long verifyDepartmentId;
+
+    @ApiModelProperty(value = "审核结果 0：同意 1：拒绝 ")
+    private Integer verifyResult;
+
+    @ApiModelProperty(value = "验收时间")
+    private Date verifyTime;
+
+    @ApiModelProperty(value = "验收意见")
+    private String verifyOpinion;
+
+    @ApiModelProperty(value = "设备故障报修单id")
+    private Long faultId;
+
+ @ApiModelProperty(value = "审核结果条件判断，0同意，1拒绝")
+ private String condition;
+
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 故障报修验收记录
+ *
+ * @author system_generator
+ * @date 2021-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_failure_verify")
+public class FailureVerify extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 验收人
+     */
+	@TableField("acceptor")
+    private String acceptor;
+
+    /**
+     * 验收部门
+     */
+	@TableField("verify_department")
+    private String verifyDepartment;
+
+    /**
+     * 验收部门的id
+     */
+	@TableField("verify_department_id")
+    private Long verifyDepartmentId;
+
+    /**
+     * 审核结果 0：同意 1：拒绝 
+     */
+	@TableField("verify_result")
+    private Integer verifyResult;
+
+    /**
+     * 验收时间
+     */
+	@TableField("verify_time")
+    private Date verifyTime;
+
+    /**
+     * 验收意见
+     */
+	@TableField("verify_opinion")
+    private String verifyOpinion;
+
+    /**
+     * 设备故障报修单id
+     */
+	@TableField("fault_id")
+    private Long faultId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/SupervisionFeign.java

+package com.yeejoin.amos.boot.module.common.api.feign;
+
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
+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.typroject.tyboot.core.restful.utils.ResponseModel;
+
+// 消防监督调用
+@FeignClient(name = "${supervision.feign.name}", path = "supervision", configuration = {MultipartSupportConfig.class})
+public interface SupervisionFeign {
+
+    @RequestMapping(value = "/api/point/teamInput", method = RequestMethod.POST, consumes = "application/json")
+    ResponseModel asyncOwner(@RequestBody OrgUsrFormDto orgUsrFormDto);
+
+    @RequestMapping(value = "/api/point/delete", method = RequestMethod.POST, consumes = "application/json")
+    ResponseModel deleteOwner(@RequestBody Long id);
+}
+

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureVerifyMapper.java

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.yeejoin.amos.boot.module.common.api.entity.FailureVerify;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 故障报修验收记录 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-08-18
+ */
+public interface FailureVerifyMapper extends BaseMapper<FailureVerify> {
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.service;
+
+
+/**
+ * 故障报修验收记录接口类
+ *
+ * @author system_generator
+ * @date 2021-08-18
+ */
+public interface IFailureVerifyService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureVerifyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FailureVerifyMapper">
+
+</mapper>

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

@@ -17,7 +17,11 @@ public enum DictTypeEnum {
     EQUIPTYPE("设备类型","EQUIP_TYPE"),
     DANGERLEVEL("隐患等级", "DANGER_LEVEL"),
     OUTERPOINTTYPE("导入外部安全检查表分类", "OUTER_POINT_TYPE"),
-    MAINTENANCE_CLASSIFY("维保项分类","MAINTENANCE_CLASSIFY");
+    MAINTENANCE_CLASSIFY("维保项分类","MAINTENANCE_CLASSIFY"),
+    CHECK_ITEM_CLASSIFY("消防监督检查项分类","CHECK_ITEM_CLASSIFY"),
+    CHECK_ITEM_TYPE("消防监督检查类别","CHECK_ITEM_TYPE"),
+    CHECK_ITEM_LEVEL("消防监督检查项等级","CHECK_ITEM_LEVEL"),
+    CHECK_ITEM_CONTENT("消防监督检查类型","CHECK_ITEM_CONTENT");
 
     /**
      * 名称，描述

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/InputItem.java

@@ -182,6 +182,90 @@ public class InputItem extends BasicEntity {
     @Column(name = "test_requirement")
     private String testRequirement;
 
+    /**
+     * 检查类型
+     */
+    @Column(name="check_type")
+    private String checkType;
+
+    /**
+     * 父类检查项id
+     */
+    @Column(name="item_parent")
+    private String itemParent;
+
+    /**
+     * 检查项分类
+     */
+    @Column(name="item_classify")
+    private String itemClassify;
+
+    /**
+     * 适用检查类别
+     */
+    @Column(name="item_type_classify")
+    private String itemTypeClassify;
+
+    /**
+     * 检查项等级
+     */
+    @Column(name="item_level")
+    private String itemLevel;
+
+    /**
+     * 检查项启用
+     */
+    @Column(name="item_start")
+    private String itemStart;
+
+    public String getItemStart() {
+        return itemStart;
+    }
+
+    public void setItemStart(String itemStart) {
+        this.itemStart = itemStart;
+    }
+
+    public String getItemParent() {
+        return itemParent;
+    }
+
+    public void setItemParent(String itemParent) {
+        this.itemParent = itemParent;
+    }
+
+    public String getItemClassify() {
+        return itemClassify;
+    }
+
+    public void setItemClassify(String itemClassify) {
+        this.itemClassify = itemClassify;
+    }
+
+    public String getItemTypeClassify() {
+        return itemTypeClassify;
+    }
+
+    public void setItemTypeClassify(String itemTypeClassify) {
+        this.itemTypeClassify = itemTypeClassify;
+    }
+
+    public String getItemLevel() {
+        return itemLevel;
+    }
+
+    public void setItemLevel(String itemLevel) {
+        this.itemLevel = itemLevel;
+    }
+
+    public String getCheckType() {
+        return checkType;
+    }
+
+    public void setCheckType(String checkType) {
+        this.checkType = checkType;
+    }
+
     public void setMaintenanceContent(String maintenanceContent) {
         this.maintenanceContent = maintenanceContent;
     }

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/Point.java

@@ -268,6 +268,34 @@ public class Point extends BasicEntity {
 	private String riskSourceId;
 
 	/**
+	 * 所在建筑名称
+	 */
+	@Column(name="building_name")
+	private String buildingName;
+
+	public String getBuildingName() {
+		return buildingName;
+	}
+
+	public void setBuildingName(String buildingName) {
+		this.buildingName = buildingName;
+	}
+
+	public String getBuildingId() {
+		return buildingId;
+	}
+
+	public void setBuildingId(String buildingId) {
+		this.buildingId = buildingId;
+	}
+
+	/**
+	 * 所在建筑Id
+	 */
+	@Column(name="building_id")
+	private String buildingId;
+
+	/**
 	 * ue4位置
 	 */
 

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,8 +40,13 @@ public class FailureAuditController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<Object>  save(@RequestBody FailureAuditDto model) throws Exception {
-	    return ResponseHelper.buildResponse(failureAuditServiceImpl.savemodel(model,getSelectedOrgInfo()));
+	public ResponseModel<Object>  save(@RequestBody FailureAuditDto model)  {
+		try {
+			return ResponseHelper.buildResponse(failureAuditServiceImpl.savemodel(model,getSelectedOrgInfo()));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseHelper.buildResponse(false);
+		}
 	}
 
 
@@ -97,7 +102,7 @@ public class FailureAuditController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "审核列表记录查询",   notes = "审核列表记录查询")
 	@GetMapping(value = "/list/{faultId}")
-	public ResponseModel<List<FailureAudit>> findByFaultIDFotList(@RequestParam long faultId) {
+	public ResponseModel<List<FailureAudit>> findByFaultIDFotList(@PathVariable long faultId) {
 		return ResponseHelper.buildResponse(failureAuditServiceImpl.findByfaultId(faultId));
 	}
 	

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,6 +5,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -62,8 +63,13 @@ public class FailureDetailsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<Object> save(@RequestBody FailureDetailsDto model ) throws Exception {
-			 return ResponseHelper.buildResponse( failureDetailsServiceImpl.savemodel(model,getSelectedOrgInfo()));
+	public ResponseModel<Object> save(@RequestBody FailureDetailsDto model ) {
+		try {
+			return ResponseHelper.buildResponse( failureDetailsServiceImpl.savemodel(model,getSelectedOrgInfo()));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseHelper.buildResponse( false);
+		}
 	}
 
 
@@ -123,7 +129,7 @@ public class FailureDetailsController extends BaseController {
 	    Page<FailureDetails> page = new Page<FailureDetails>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-		final AgencyUserModel userInfo = getUserInfo();
+		ReginParams userInfo = getSelectedOrgInfo();
 		IPage<FailureDetailsDto> failureDetailDTOsIPage = new Page<>();
 		IPage<FailureDetails> failureDetailsIPage = failureDetailsServiceImpl.queryForFailureDetailsPage(page, userInfo, type);
 		BeanUtils.copyProperties(failureDetailsIPage,FailureDetailsDto.class);

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

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import java.util.List;
 
+import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureMaintain;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -46,70 +48,60 @@ public class FailureMaintainController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<Object> save(@RequestBody FailureMaintainDto model) {
-	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.savemodel(model,getSelectedOrgInfo()));
+	public ResponseModel<Object> save(@RequestBody FailureMaintainDto model)  {
+
+		try {
+			return ResponseHelper.buildResponse(failureMaintainServiceImpl.savemodel(model,getSelectedOrgInfo()));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseHelper.buildResponse(false);
+		}
 	}
 
 	/**
      * 根据sequenceNbr更新
 	 * 根据传递的Status状态确认验收状态
      *
-     * @param sequenceNbr 主键
+     *
      * @return
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
+	@PutMapping(value = "/verify")
 	@ApiOperation(httpMethod = "PUT", value = "验收操作", notes = "根据sequenceNbr更新")
-	public Object updateBySequenceNbrFailureMaintain(@RequestBody FailureMaintainDto model,Integer status,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateModel(model,status,getSelectedOrgInfo()));
+	public Object updateBySequenceNbrFailureMaintain(@RequestBody FailureMaintainDto model) {
+		try {
+			return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateModel(model,getSelectedOrgInfo()));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseHelper.buildResponse(false);
+		}
 	}
 
 
-	/**
+/*
+	*/
+/**
 	 * 根据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) {
+	public Object updateByFailureMaintain(@RequestBody FailureMaintainDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr)  {
 		model.setSequenceNbr(sequenceNbr);
 
-		return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateStatus(model,getSelectedOrgInfo()));
+		try {
+			return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateStatus(model,getSelectedOrgInfo()));
+		} catch (Exception e) {
+			return ResponseHelper.buildResponse(false);
+		}
 	}
-/*
-	*/
-/**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     *//*
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(failureMaintainServiceImpl.removeById(sequenceNbr));
-    }
 */
 
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<FailureMaintainDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.queryBySeq(sequenceNbr));
-	}
 
 
 	/**
@@ -130,18 +122,22 @@ public class FailureMaintainController extends BaseController {
 	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.queryForFailureMaintainPage(page));
 	}
 
+
 	/**
-	 * 列表全部数据查询
-     *
+	 * 维修列表记录查询
+	 *根据关联主表faultId查询
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<FailureMaintainDto>> selectForList() {
-	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.queryForFailureMaintainList());
+	@ApiOperation(httpMethod = "GET",value = "维修列表记录查询",   notes = "维修列表记录查询")
+	@GetMapping(value = "/list/{faultId}")
+	public ResponseModel<List<FailureMaintain>> findByFaultIDFotList(@PathVariable long faultId) {
+		return ResponseHelper.buildResponse(failureMaintainServiceImpl.findByfaultId(faultId));
 	}
 
+
+
+
 	/**
 	 * 查询历史流程审核信息记录
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureVerifyController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureVerify;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureVerifyServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureVerifyDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 故障报修验收记录
+ *
+ * @author system_generator
+ * @date 2021-08-18
+ */
+@RestController
+@Api(tags = "故障报修验收记录Api")
+@RequestMapping(value = "/common/failure-verify")
+public class FailureVerifyController extends BaseController {
+
+    @Autowired
+    FailureVerifyServiceImpl failureVerifyServiceImpl;
+
+    /**
+     * 新增故障报修验收记录
+     *
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<Object>  save(@RequestBody FailureVerifyDto model)  {
+		try {
+			return ResponseHelper.buildResponse(failureVerifyServiceImpl.savemodel(model,getSelectedOrgInfo()));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseHelper.buildResponse(false);
+		}
+	}
+
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新故障报修验收记录", notes = "根据sequenceNbr更新故障报修验收记录")
+	public ResponseModel<FailureVerifyDto> updateBySequenceNbrFailureVerify(@RequestBody FailureVerifyDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(failureVerifyServiceImpl.updateWithModel(model));
+	}
+
+
+
+/*
+    */
+/**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     *//*
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个故障报修验收记录",  notes = "根据sequenceNbr查询单个故障报修验收记录")
+	public ResponseModel<FailureVerifyDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(failureVerifyServiceImpl.queryBySeq(sequenceNbr));
+	}
+*/
+
+/*	*//**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     *//*
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "故障报修验收记录分页查询",  notes = "故障报修验收记录分页查询")
+	public ResponseModel<Page<FailureVerifyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<FailureVerifyDto> page = new Page<FailureVerifyDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(failureVerifyServiceImpl.queryForFailureVerifyPage(page));
+	}*/
+
+/*
+	*/
+/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 *//*
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "故障报修验收记录列表全部数据查询",   notes = "故障报修验收记录列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<FailureVerifyDto>> selectForList() {
+	    return ResponseHelper.buildResponse(failureVerifyServiceImpl.queryForFailureVerifyList());
+	}
+*/
+
+
+	/**
+	 * 审核列表记录查询
+	 *根据关联主表faultId查询
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "审核列表记录查询",   notes = "审核列表记录查询")
+	@GetMapping(value = "/list/{faultId}")
+	public ResponseModel<List<FailureVerify>> findByFaultIDFotList(@PathVariable long faultId) {
+		return ResponseHelper.buildResponse(failureVerifyServiceImpl.findByfaultId(faultId));
+	}
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.api.feign.SupervisionFeign;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,6 +35,8 @@ import java.util.Map;
 public class OrgPersonController {
     @Autowired
     OrgUsrServiceImpl iOrgUsrService;
+    @Autowired
+    SupervisionFeign supervisionFeign;
   
 
     /**
@@ -63,6 +66,7 @@ public class OrgPersonController {
         // 删除时，只作逻辑删除
         iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete",
                 CommonConstant.IS_DELETE_01));
+        supervisionFeign.deleteOwner(id);
         return ResponseHelper.buildResponse(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/FailureAuditServiceImpl.java

@@ -64,7 +64,7 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      * 发起审核
      */
     @Transactional
-    public Object savemodel(FailureAuditDto model, ReginParams userInfo) {
+    public Object savemodel(FailureAuditDto model, ReginParams userInfo) throws Exception {
 
         int condition = Integer.parseInt(model.getCondition());
         model.setAuditTime(new Date());
@@ -73,83 +73,86 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         model.setAuditDepartment(userInfo.getDepartment().getDepartmentName());
 
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
-        try {
-            //根据审核的结果进行业务操作
-            if (condition == AuditResultEnum.AGREE.getCode()  && userInfo.getDepartment().getSequenceNbr().equals(failureDetailsDto.getBizCode())) {
-                updateStatus(model, FailureStatuEnum.WAITING_AUDIT, userInfo,condition);
-            } else if (condition == (AuditResultEnum.REFUSE.getCode())) {
-                updateStatus(model, FailureStatuEnum.REFUSE, userInfo,condition);
-            } else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
-                updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo,condition);
-            } else if  (condition == AuditResultEnum.AGREE.getCode() ) {
-                updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo,condition);
-            }
 
-            FailureAuditDto withModel = this.createWithModel(model);
-        }catch (Exception e){
-            e.printStackTrace();
-            e.printStackTrace();
-            logger.info("添加故障审核信息到数据库失败");
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return false ;
+        int auditResult = 0;
+
+        //根据审核的结果进行业务操作
+        if (condition == AuditResultEnum.AGREE.getCode() && userInfo.getDepartment().getSequenceNbr().equals(failureDetailsDto.getBizCode())) {
+            auditResult = AuditResultEnum.AGREE.getCode();
+            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_AUDIT, userInfo, condition);
+        } else if (condition == (AuditResultEnum.REFUSE.getCode())) {
+            auditResult = AuditResultEnum.REFUSE.getCode();
+            Boolean repairResult = updateStatus(model, FailureStatuEnum.REFUSE, userInfo, condition);
+        } else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
+            auditResult = AuditResultEnum.SEND_BACK.getCode();
+            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo, condition);
+        } else if (condition == AuditResultEnum.AGREE.getCode()) {
+            auditResult = AuditResultEnum.AGREE.getCode();
+            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo, condition);
+        }
+
+        if (ObjectUtils.isEmpty(auditResult)) {
+            throw new Exception("添加报修日志失败");
         }
+        model.setAuditResult(auditResult);
 
+        FailureAuditDto failureAuditDto = this.createWithModel(model);
+        if (ObjectUtils.isEmpty(failureAuditDto)){
+            return false;
+        }
         return true;
-    }
+
+}
 
     /**
      * 修改故障保修单任务状态
      */
     @Transactional
-    public Boolean 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为维修部门的时候 修改状态
-
-        /*Map<String, Object> stringObjectMap = failureDetailsService.checkExcuteTaskAuthMap(failureDetailsDto.getSequenceNbr(), userInfo);
-        String  name = stringObjectMap.get("name").toString();
-        if (name.contains(EMERGENCY_COMMAND)) {
-            failureDetailsDto.setCurrentStatus(failureDetailsDto.getCurrentStatus());
-        }*/
         failureDetailsDto.setCurrentStatus(status.getCode());
         failureDetailsDto.setSequenceNbr(model.getFaultId());
         FailureDetailsDto failureDetailsDtos = failureDetailsService.updateWithModel(failureDetailsDto);
-        System.out.println(failureDetailsDtos);
 
         String conditionText;
         boolean result = failureDetailsService.checkExcuteTaskAuth(failureDetailsDto.getSequenceNbr(), userInfo);
-        if (result){
+        if (result) {
             //添加报修日志
             Long faultId = model.getFaultId();
             Date processTime = model.getAuditTime();
             String processDepartment = model.getAuditDepartment();
             String processAuditor = model.getAuditor();
-            Integer processAuditorId =Integer.parseInt(userInfo.getUserModel().getUserId()) ;
+            Integer processAuditorId = Integer.parseInt(userInfo.getUserModel().getUserId());
             String processAuditorCid = userInfo.getUserModel().getUserName();
             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,processAuditorCid);
+                repairlog(faultId, processAuditor, processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorCid);
             } else if (condition == AuditResultEnum.SEND_BACK.getCode()) {
                 conditionText = AuditResultEnum.SEND_BACK.getName();
-                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText,processAuditorCid);
-            } else if (condition == AuditResultEnum.REFUSE.getCode()){
+                repairlog(faultId, processAuditor, processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorCid);
+            } else if (condition == AuditResultEnum.REFUSE.getCode()) {
                 conditionText = AuditResultEnum.REFUSE.getName();
-                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText,processAuditorCid);
+                repairlog(faultId, processAuditor, processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorCid);
+            }
+            if (failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo, condition + "")){
+                return true;
+            }else {
+                throw new Exception("执行流程失败");
             }
-            failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo,condition+"");
-            return true;
         }
-       return false;
+        return false;
     }
 
     /**
      * 添加报修日志
      */
     @Transactional
-    public Boolean repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId,Date processTime,
-                          String processDepartment, String processResult,String processAuditorCid) {
+    public Boolean repairlog(Long faultId, String processAuditor, Integer processAuditorId, Long departmentId, Date processTime,
+                             String processDepartment, String processResult, String processAuditorCid) {
         FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
         failureRepairlogDto.setFaultId(faultId);
         failureRepairlogDto.setProcessAuditor(processAuditor);
@@ -160,7 +163,7 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         failureRepairlogDto.setProcessResult(processResult);
         failureRepairlogDto.setProcessAuditorCid(processAuditorCid);
         failureRepairlogService.createWithModel(failureRepairlogDto);
-        if (ObjectUtils.isNotEmpty(failureRepairlogDto)){
+        if (ObjectUtils.isNotEmpty(failureRepairlogDto)) {
             return true;
         }
         return false;
@@ -172,7 +175,7 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
     public List<FailureAudit> findByfaultId(Long faultId) {
         Page<FailureAudit> page = new Page<>();
         QueryWrapper<FailureAudit> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("fault_id", faultId).orderByDesc("submission_time");
+        queryWrapper.eq("fault_id", faultId).orderByDesc("audit_time");
         return baseMapper.selectList(queryWrapper);
     }
 

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

@@ -85,25 +85,30 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	 * 分页查询
 	 */
 	public IPage<FailureDetails> queryAllPage(long size, long current) {
-		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
+		/*QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
 		wrapper.orderByDesc("submission_time");
 		IPage<FailureDetails> page = new Page<>(current, size);
-		return baseMapper.selectPage(page, wrapper);
+		return baseMapper.selectPage(page, wrapper);*/
+		Page  pages = new Page<>(current,size);
+		LambdaQueryWrapper<FailureDetails> lambdaQueryWrapper =  new LambdaQueryWrapper();
+		lambdaQueryWrapper.orderByDesc(FailureDetails::getSubmissionTime);
+		IPage iPage = page(pages, lambdaQueryWrapper);
+		Page<FailureDetails> page = new Page();
+		page.setCurrent(current);
+		page.setSize(size);
+		page.setRecords(iPage.getRecords());
+		return page;
 	}
 
-	public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, AgencyUserModel userInfo,
+	public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo,
 			Integer type) {
-
 		if (type.equals(SELECY_ALL)) {
 			return this.queryAllPage(page.getSize(), page.getCurrent());
 		}
-
 		if (type.equals(SELECY_ISUBMIT)) {
-
-			return queryForPage(page, userInfo.getUserId());
-
+			return queryForPage(page, userInfo.getUserModel().getUserId());
 		}
-		return this.queryForWaitManage(page, userInfo.getUserId());
+		return this.queryForWaitManage(page, userInfo.getUserModel().getUserId());
 	}
 
 	/**
@@ -113,11 +118,17 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		if (submissionPid == null) {
 			return null;
 		}
-		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
+/*		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
 		wrapper.eq("submission_pid", submissionPid);
 		wrapper.orderByDesc("submission_time");
 		IPage<FailureDetails> failureDetailsPage = new Page<>(page.getCurrent(), page.getSize());
-		return baseMapper.selectPage(failureDetailsPage, wrapper);
+		return baseMapper.selectPage(failureDetailsPage, wrapper);*/
+
+		Page  pages = new Page<>(page.getCurrent(),page.getSize());
+		LambdaQueryWrapper<FailureDetails> lambdaQueryWrapper =  new LambdaQueryWrapper();
+		lambdaQueryWrapper.eq(FailureDetails::getSubmissionPid,submissionPid);
+		lambdaQueryWrapper.orderByDesc(FailureDetails::getSubmissionTime);
+		return page(pages, lambdaQueryWrapper);
 	}
 
 	/**
@@ -127,15 +138,19 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		if (submissionPid == null) {
 			return null;
 		}
-		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
+		LambdaQueryWrapper<FailureDetails> lambdaQueryWrapper =  new LambdaQueryWrapper();
+		lambdaQueryWrapper.notIn(FailureDetails::getCurrentStatus,FailureStatuEnum.REFUSE.getCode(), FailureStatuEnum.FINISH.getCode()
+				).orderByDesc(FailureDetails::getSubmissionTime);
+		/*QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
 		wrapper.eq("submission_pid", submissionPid);
 		wrapper.notIn("current_status", FailureStatuEnum.REFUSE.getCode(), FailureStatuEnum.FINISH.getCode(),
 				FailureStatuEnum.WAITING_AUDIT.getCode());
-		wrapper.orderByDesc("submission_time");
+		wrapper.orderByDesc("submission_time");*/
 		IPage<FailureDetails> failureDetailsPage = new Page<>(page.getCurrent(), page.getSize());
-		return baseMapper.selectPage(failureDetailsPage, wrapper);
+		return baseMapper.selectPage(failureDetailsPage, lambdaQueryWrapper);
 	}
 
+
 	/**
 	 * 列表查询 示例
 	 */
@@ -181,6 +196,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
 	}
 
+
 	/**
 	 * 查询任务状态数量
 	 */
@@ -201,7 +217,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		int inMaintenance = 0;
 
 		List<FailureStatusCountDto> list = new ArrayList<>();
-		// String[] statusName = new String[]{"待审核", "待提交", "待维修", "待验收", "已拒绝", "已完结"};
+	//	String[] statusName = new String[]{"待审核", "待提交", "待维修", "待验收", "已拒绝", "已完结"};
 		List<String> statusName = new ArrayList<>();
 		Collections.addAll(statusName, FailureStatuEnum.WAITING_AUDIT.getName(),
 				FailureStatuEnum.WAITING_SUBMIT.getName(), FailureStatuEnum.WAITING_MAINTAIN.getName(),
@@ -249,7 +265,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	 *
 	 * @throws Exception
 	 */
-	public Object savemodel(FailureDetailsDto failureDetailsDto, ReginParams userInfo) {
+	@Transactional
+	public Object savemodel(FailureDetailsDto failureDetailsDto, ReginParams userInfo) throws Exception {
 		String businessKey = buildOrderNo();
 		JSONObject body = new JSONObject();
 		body.put("businessKey", businessKey);
@@ -267,7 +284,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		// 拿到流程processId
 		failureDetailsDto.setProcessId(instance.getString("id"));
 		FailureDetailsDto model = null;
-		try {
+
 			// 发起主表流程 并添加至报修日志
 			failureDetailsDto.setSubmissionTime(new Date());
 			failureDetailsDto.setFailureCode(buildOrderNo());
@@ -280,7 +297,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 						failureDetailsDto.getAttachment());
 			}
 			// 添加至报修日志
-			try {
+
 				Long faultId = model.getSequenceNbr();
 				String processAuditor = model.getRecUserName();
 				Integer processAuditorId = model.getSubmissionPid();
@@ -289,30 +306,14 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 				Long departmentId = userInfo.getDepartment().getSequenceNbr();
 				Date processTime = model.getSubmissionTime();
 				String processAuditorCid = userInfo.getUserModel().getUserName();
-				repairlog(faultId, processAuditor, processAuditorId, departmentId, processTime, processDepartment,
-						processResult, processAuditorCid);
-			} 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("添加失败");
-		}
-		try {
-			if (ObjectUtils.isNotEmpty(model)) {
-				excuteTask(instance.getString("id"), userInfo, null);
-			}
-		} catch (Exception e) {
-			return false;
-		}
+				repairlog(faultId, processAuditor,processAuditorId,departmentId, processTime, processDepartment, processResult,processAuditorCid);
+
+				if (excuteTask(instance.getString("id"), userInfo, null)){
+					return true;
+				}else {
+					throw new Exception("执行流程失败");
+				}
 
-		return true;
 	}
 
 	/**
@@ -349,6 +350,11 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			} else {
 				workflowFeignService.pickupAndCompleteTask(map.get("taskId").toString(), conditionMap);
 			}
+			// 判断下一个节点是不是维修中,如果是则添加当前任务的执行人
+			String nextTaskId = checkIsInMaintenance(sequenceNbr);
+			if (nextTaskId != null) {
+				workflowFeignService.pickuptask(nextTaskId);
+			}
 		}
 		return true;
 	}
@@ -358,7 +364,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	 * 
 	 * @param sequenceNbr
 	 * @param userInfo
-	 * @param condition
+
 	 * @return
 	 */
 	public boolean excuteTaskOnlyOperation(Long sequenceNbr, ReginParams userInfo) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureMaintainServiceImpl.java

@@ -4,8 +4,10 @@ import java.util.Date;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
 
+import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
 import org.apache.commons.lang3.ObjectUtils;
 
 import org.slf4j.Logger;
@@ -45,15 +47,10 @@ import com.yeejoin.amos.boot.module.common.api.mapper.FailureMaintainMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureMaintainService;
 
 /**
- * 
  * 服务实现类
  *
- * 
- * 
  * @author system_generator
- * 
  * @date 2021-08-04
- * 
  */
 
 @Service
@@ -61,349 +58,240 @@ import com.yeejoin.amos.boot.module.common.api.service.IFailureMaintainService;
 @Transactional
 
 public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto, FailureMaintain, FailureMaintainMapper>
-		implements IFailureMaintainService {
-
-	@Autowired
-
-	SourceFileServiceImpl sourceFileServiceImpl;
-
-	@Autowired
-
-	FailureDetailsServiceImpl failureDetailsService;
-
-	@Autowired
-
-	FailureRepairlogServiceImpl failureRepairlogService;
-
-	@Autowired
-	WorkflowFeignService workflowFeignService;
-	private static String RECORE_TYPE = "维修记录";
-
-	private final Logger logger = LoggerFactory.getLogger(FailureMaintainServiceImpl.class);
-
-	private static String[] MAINTENANCE_STATUS = { "维修完成", "维修中" };
-
-	private static int MAINTENANCE_COMPLETE = 0;
-
-	private static int MAINTENANCE_ADD = 1;
-
-	private static String[] PROCESS_RESULT = { "验证通过", "验证未通过" };
-
-	/**
-	 * 
-	 * 分页查询
-	 * 
-	 */
-
-	public Page<FailureMaintainDto> queryForFailureMaintainPage(Page<FailureMaintainDto> page) {
-
-		return this.queryForPage(page, null, false);
-
-	}
-
-	/**
-	 * 
-	 * 列表查询 示例
-	 * 
-	 */
-
-	public List<FailureMaintainDto> queryForFailureMaintainList() {
-
-		return this.queryForList("", false);
-
-	}
-
-	/**
-	 * 
-	 * 添加维修记录
-	 * 
-	 */
-
-	public Object savemodel(FailureMaintainDto failureMaintainDto, ReginParams userInfo) {
-
-		String condition = failureMaintainDto.getCondition();
-
-		int conditionStatus = Integer.parseInt(condition);
-
-		if (conditionStatus == MAINTENANCE_ADD) {
-
-			boolean result = failureDetailsService.checkExcuteTaskAuth(failureMaintainDto.getFaultId(), userInfo);
-
-			if (!result) {
-
-				return false;
-
-			}
-
-			try {
-
-				failureMaintainDto.setMaintainMan(userInfo.getUserModel().getUserName());
-
-				failureMaintainDto.setMaintainTime(new Date());
-
-				failureMaintainDto.setDepartment(userInfo.getDepartment().getDepartmentName());
-
-				failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr());
-
-				failureMaintainDto.setRecoreType(RECORE_TYPE);
-
-				this.createWithModel(failureMaintainDto);
-
-				// 添加完成后修改保修单状态为维修中
-
-				FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
-
-				failureDetailsDto.setCurrentStatus(FailureStatuEnum.IN_MAINTENANCE.getCode());
-
-				failureDetailsService.updateWithModel(failureDetailsDto);
-
-				// 添加报修日志
-
-				String processResult = MAINTENANCE_STATUS[1];// 维修中
-
-				Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
-
-				String processAuditorCid = userInfo.getUserModel().getUserName();
-
-				repairlog(failureMaintainDto.getFaultId(), failureMaintainDto.getMaintainMan(), processAuditorId,
-						userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
-
-						failureMaintainDto.getDepartment(), processResult, processAuditorCid);
-
-				if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())) {
-
-					sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),
-							failureMaintainDto.getAttachment());
-
-				}
-				
-				String nextTaskId = 	failureDetailsService.checkIsInMaintenance(failureDetailsDto.getSequenceNbr());
-				if (nextTaskId == null) {
-					try {
-						failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition);
-					}catch (Exception e) {
-						return false;
-					}
-					
-				}else {
-					// 判断下一个节点是不是维修中,如果是则添加当前任务的执行人
-					workflowFeignService.pickuptask(nextTaskId);
-				}
-
-			} catch (Exception e) {
-				logger.info("添加故障维修信息到数据库失败");
-
-				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-
-				return false;
-
-			}
-
-			return true;
-
-		}
-
-		return this.updateStatus(failureMaintainDto, userInfo);
-
-	}
-
-	/**
-	 * 
-	 * 更新状态维修完成
-	 * 
-	 */
-
-	public Boolean updateStatus(FailureMaintainDto failureMaintainDto, ReginParams userInfo) {
-
-		try {
-
-			FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
-
-			failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_ACCEPTANCE.getCode());
-
-			this.updateWithModel(failureMaintainDto);
-
-			// 添加报修日志
-
-			String processResult = MAINTENANCE_STATUS[0];// 维修完成
-
-			Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
-
-			String processAuditorCid = userInfo.getUserModel().getUserName();
-
-			repairlog(failureMaintainDto.getFaultId(), failureMaintainDto.getMaintainMan(), processAuditorId,
-					userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
-
-					failureMaintainDto.getDepartment(), processResult, processAuditorCid);
-
-			if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())) {
-
-				sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),
-						failureMaintainDto.getAttachment());
-
-			}
-            try {
-            	failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo,
-    					failureMaintainDto.getCondition());
-			} catch (Exception e) {
-				return false;
-			}
-			
-
-		} catch (Exception e) {
-
-			logger.info("更新故障验收信息到数据库失败");
-
-			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-
-			return false;
-
-		}
-
-		return true;
-
-	}
-
-	/**
-	 * 
-	 * 根据审核结果更新维修表
-	 * 
-	 */
-
-	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();
-
-			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 = PROCESS_RESULT[0];
-
-				condition = AuditResultEnum.AGREE.getName();
-
-			} else {// 不同意状态为已拒绝
-
-				failureDetailsDto.setCurrentStatus(FailureStatuEnum.REFUSE.getCode());
-
-				failureDetailsService.updateWithModel(failureDetailsDto);
-
-				processResult = PROCESS_RESULT[1];
-
-				condition = AuditResultEnum.REFUSE.getName();
-
-			}
-
-			// 添加报修日志
-
-			Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
-
-			String processAuditorCid = userInfo.getUserModel().getUserName();
-
-			repairlog(failureMaintainDto.getFaultId(), failureMaintainDto.getMaintainMan(), processAuditorId,
-					userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
-
-					failureMaintainDto.getDepartment(), processResult, processAuditorCid);
-
-			try {
-				failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition);
-			} catch (Exception e) {
-				return false;
-			}
-
-			return true;
-
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * 
-	 * 查询当前故障报修单的流程的审批历史节点
-	 * 
-	 * @param sequenceNbr
-	 * 
-	 * @return
-	 * 
-	 */
-
-	public List<Object> getProcessHistoryList(Long sequenceNbr) {
-
-		// TODO Auto-generated method stub
-
-		return null;
-
-	}
-
-	/**
-	 * 
-	 * 添加报修日志
-	 * 
-	 */
-
-	@Transactional
-
-	public Boolean repairlog(Long faultId, String processAuditor, Integer processAuditorId, Long departmentId,
-			Date processTime,
-
-			String processDepartment, String processResult, String processAuditorCid) {
-
-		FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
-
-		failureRepairlogDto.setFaultId(faultId);
-
-		failureRepairlogDto.setProcessAuditor(processAuditor);
-
-		failureRepairlogDto.setProcessAuditorId(processAuditorId);
-
-		failureRepairlogDto.setProcessDepartmentId(departmentId);
-
-		failureRepairlogDto.setProcessTime(processTime);
-
-		failureRepairlogDto.setProcessDepartment(processDepartment);
-
-		failureRepairlogDto.setProcessResult(processResult);
-
-		failureRepairlogDto.setProcessAuditorCid(processAuditorCid);
-
-		failureRepairlogService.createWithModel(failureRepairlogDto);
-
-		if (ObjectUtils.isNotEmpty(failureRepairlogDto)) {
-
-			return true;
-
-		}
-
-		return false;
-
-	}
+        implements IFailureMaintainService {
+
+    @Autowired
+
+    SourceFileServiceImpl sourceFileServiceImpl;
+
+    @Autowired
+
+    FailureDetailsServiceImpl failureDetailsService;
+
+    @Autowired
+
+    FailureRepairlogServiceImpl failureRepairlogService;
+
+    @Autowired
+    WorkflowFeignService workflowFeignService;
+    private static String RECORE_TYPE = "维修记录";
+
+    private final Logger logger = LoggerFactory.getLogger(FailureMaintainServiceImpl.class);
+
+    private static String[] MAINTENANCE_STATUS = {"维修完成", "维修中"};
+
+    private static int MAINTENANCE_COMPLETE = 0;
+
+    private static int MAINTENANCE_ADD = 1;
+
+    private static String[] PROCESS_RESULT = {"验证通过", "验证未通过"};
+
+    /**
+     * 分页查询
+     */
+
+    public Page<FailureMaintainDto> queryForFailureMaintainPage(Page<FailureMaintainDto> page) {
+
+        return this.queryForPage(page, null, false);
+
+    }
+
+    /**
+     * 列表查询 示例
+     */
+
+    public List<FailureMaintainDto> queryForFailureMaintainList() {
+
+        return this.queryForList("", false);
+
+    }
+
+    /**
+     * 添加维修记录
+     */
+
+    public Object savemodel(FailureMaintainDto failureMaintainDto, ReginParams userInfo) throws Exception {
+
+        String condition = failureMaintainDto.getCondition();
+        int conditionStatus = Integer.parseInt(condition);
+        if (conditionStatus == MAINTENANCE_ADD) {
+            boolean result = failureDetailsService.checkExcuteTaskAuth(failureMaintainDto.getFaultId(), userInfo);
+            if (!result) {
+                return false;
+            }
+            failureMaintainDto.setMaintainMan(userInfo.getUserModel().getUserName());
+            failureMaintainDto.setMaintainTime(new Date());
+            failureMaintainDto.setDepartment(userInfo.getDepartment().getDepartmentName());
+            failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr());
+            failureMaintainDto.setRecoreType(RECORE_TYPE);
+            this.createWithModel(failureMaintainDto);
+            // 添加完成后修改保修单状态为维修中
+            FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
+            failureDetailsDto.setCurrentStatus(FailureStatuEnum.IN_MAINTENANCE.getCode());
+            failureDetailsService.updateWithModel(failureDetailsDto);
+            // 添加报修日志
+            String processResult = MAINTENANCE_STATUS[1];// 维修中
+            Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
+            String processAuditorCid = userInfo.getUserModel().getUserName();
+            repairlog(failureMaintainDto.getFaultId(), failureMaintainDto.getMaintainMan(), processAuditorId,
+                    userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
+                    failureMaintainDto.getDepartment(), processResult, processAuditorCid);
+            if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())) {
+                sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),
+                        failureMaintainDto.getAttachment());
+            }
+            String nextTaskId = failureDetailsService.checkIsInMaintenance(failureDetailsDto.getSequenceNbr());
+            if (nextTaskId == null) {
+                if (failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition)) {
+                } else {
+                    throw new RuntimeException("执行维修中流程失败");
+                }
+            } else {
+                // 判断下一个节点是不是维修中,如果是则添加当前任务的执行人
+                workflowFeignService.pickuptask(nextTaskId);
+            }
+            return true;
+        }
+        return this.updateStatus(failureMaintainDto, userInfo);
+    }
+    /**
+     * 更新状态维修完成
+     */
+
+    public Boolean updateStatus(FailureMaintainDto failureMaintainDto, ReginParams userInfo) throws Exception {
+        String condition = failureMaintainDto.getCondition();
+        int conditionStatus = Integer.parseInt(condition);
+        if (conditionStatus == MAINTENANCE_COMPLETE) {
+            boolean result = failureDetailsService.checkExcuteTaskAuth(failureMaintainDto.getFaultId(), userInfo);
+            if (!result) {
+                return false;
+            }
+            failureMaintainDto.setMaintainMan(userInfo.getUserModel().getUserName());
+            failureMaintainDto.setMaintainTime(new Date());
+            failureMaintainDto.setDepartment(userInfo.getDepartment().getDepartmentName());
+            failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr());
+            failureMaintainDto.setRecoreType(RECORE_TYPE);
+            this.createWithModel(failureMaintainDto);
+            // 添加完成后修改保修单状态为维修完成
+            FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
+            failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_ACCEPTANCE.getCode());
+            failureDetailsService.updateWithModel(failureDetailsDto);
+            // 添加报修日志
+            String processResult = MAINTENANCE_STATUS[0];// 维修完成
+            Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
+            String processAuditorCid = userInfo.getUserModel().getUserName();
+            repairlog(failureMaintainDto.getFaultId(), failureMaintainDto.getMaintainMan(), processAuditorId,
+                    userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
+                    failureMaintainDto.getDepartment(), processResult, processAuditorCid);
+            if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())) {
+                sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),
+                        failureMaintainDto.getAttachment());
+            }
+                if (failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition)) {
+                } else {
+                    throw new RuntimeException("执行维修完成流程失败");
+                }
+        }
+        return true;
+    }
+
+    /**
+     * 根据审核结果更新维修表
+     */
+
+    public Boolean updateModel(FailureMaintainDto failureMaintainDto,  ReginParams userInfo) throws Exception {
+        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 = failureMaintainDto.getCondition();
+            int conditionStatus = Integer.parseInt(condition);
+
+            if (conditionStatus == AuditResultEnum.AGREE.getCode() && userInfo.getDepartment().getSequenceNbr()
+                    == failureDetailsDto.getBizCode()) {// 同意状态为已完结
+                processResult = PROCESS_RESULT[0];
+            } else if (conditionStatus == AuditResultEnum.AGREE.getCode()) {// 同意状态为已完结
+                failureDetailsDto.setCurrentStatus(failureDetailsDto.getCurrentStatus());
+                failureDetailsService.updateWithModel(failureDetailsDto);
+                processResult = PROCESS_RESULT[0];
+            } else if (conditionStatus == AuditResultEnum.REFUSE.getCode()){// 不同意状态为已拒绝
+                failureDetailsDto.setCurrentStatus(FailureStatuEnum.REFUSE.getCode());
+                failureDetailsService.updateWithModel(failureDetailsDto);
+                processResult = PROCESS_RESULT[1];
+            }
+
+            // 添加报修日志
+            Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
+            String processAuditorCid = userInfo.getUserModel().getUserName();
+
+            Boolean repairlog = repairlog(failureMaintainDto.getFaultId(), failureMaintainDto.getMaintainMan(), processAuditorId,
+                    userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
+                    failureMaintainDto.getDepartment(), processResult, processAuditorCid);
+            if (ObjectUtils.isEmpty(repairlog)){
+                throw new RuntimeException("验收添加报修日志出错");
+            }
+
+           if (failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition)){
+               return true;
+           }else {
+               throw new RuntimeException("验收执行流程失败");
+           }
+        }
+        return false;
+
+    }
+
+
+    /**
+     * 根据FaultId查询
+     */
+    public List<FailureMaintain> findByfaultId(Long faultId) {
+        LambdaQueryWrapper<FailureMaintain> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(FailureMaintain::getFaultId, faultId).orderByDesc(FailureMaintain::getMaintainTime);
+        return baseMapper.selectList(lambdaQueryWrapper);
+    }
+
+    /**
+     * 查询当前故障报修单的流程的审批历史节点
+     *
+     * @param sequenceNbr
+     * @return
+     */
+
+    public List<Object> getProcessHistoryList(Long sequenceNbr) {
+
+        // TODO Auto-generated method stub
+
+        return null;
+
+    }
+
+    /**
+     * 添加报修日志
+     */
+    public Boolean repairlog(Long faultId, String processAuditor, Integer processAuditorId, Long departmentId,
+                             Date processTime,
+
+                             String processDepartment, String processResult, String processAuditorCid) {
+
+        FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
+        failureRepairlogDto.setFaultId(faultId);
+        failureRepairlogDto.setProcessAuditor(processAuditor);
+        failureRepairlogDto.setProcessAuditorId(processAuditorId);
+        failureRepairlogDto.setProcessDepartmentId(departmentId);
+        failureRepairlogDto.setProcessTime(processTime);
+        failureRepairlogDto.setProcessDepartment(processDepartment);
+        failureRepairlogDto.setProcessResult(processResult);
+        failureRepairlogDto.setProcessAuditorCid(processAuditorCid);
+        failureRepairlogService.createWithModel(failureRepairlogDto);
+        if (ObjectUtils.isNotEmpty(failureRepairlogDto)) {
+            return true;
+        }
+        return false;
+
+    }
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureVerifyServiceImpl.java

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureVerifyDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureVerify;
+import com.yeejoin.amos.boot.module.common.api.enums.AuditResultEnum;
+import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
+import com.yeejoin.amos.boot.module.common.api.mapper.FailureVerifyMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFailureVerifyService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 故障报修验收记录服务实现类
+ *
+ * @author system_generator
+ * @date 2021-08-18
+ */
+@Service
+public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, FailureVerify, FailureVerifyMapper> implements IFailureVerifyService {
+    @Autowired
+    FailureDetailsServiceImpl failureDetailsService;
+    @Autowired
+    FailureRepairlogServiceImpl failureRepairlogService;
+
+    /**
+     * 分页查询
+     */
+    public Page<FailureVerifyDto> queryForFailureVerifyPage(Page<FailureVerifyDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<FailureVerifyDto> queryForFailureVerifyList() {
+        return this.queryForList("", false);
+    }
+
+    @Transactional
+    public Object savemodel(FailureVerifyDto model, ReginParams userInfo) throws Exception {
+
+        int condition = Integer.parseInt(model.getCondition());
+        model.setVerifyTime(new Date());
+        model.setVerifyDepartmentId(userInfo.getDepartment().getSequenceNbr());
+        model.setAcceptor(userInfo.getUserModel().getUserName());
+        model.setVerifyDepartment(userInfo.getDepartment().getDepartmentName());
+
+        FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
+
+        int verifyResult = 0;
+        boolean result = failureDetailsService.checkExcuteTaskAuth(failureDetailsDto.getSequenceNbr(), userInfo);
+        if (!result) {
+            return new RuntimeException("无权限");
+        }
+        Boolean repairResult = null;
+        //根据验收的结果进行业务操作
+     /*   if (condition == AuditResultEnum.AGREE.getCode() ) {
+            verifyResult = AuditResultEnum.AGREE.getCode();
+            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_ACCEPTANCE, userInfo, condition);
+        } else*/
+        if (condition == (AuditResultEnum.REFUSE.getCode())) {
+            verifyResult = AuditResultEnum.REFUSE.getCode();
+            repairResult = updateStatus(model, FailureStatuEnum.REFUSE, userInfo, condition);
+        } /*else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
+            verifyResult = AuditResultEnum.SEND_BACK.getCode();
+            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo, condition);
+        } */ else if (condition == AuditResultEnum.AGREE.getCode()) {
+            verifyResult = AuditResultEnum.AGREE.getCode();
+            repairResult = updateStatus(model, FailureStatuEnum.FINISH, userInfo, condition);
+        }
+
+        model.setVerifyResult(verifyResult);
+
+        List<FailureVerify> byfaultId = findByfaultId(failureDetailsDto.getSequenceNbr());
+
+      /*  if (byfaultId.size() == 0) {
+            this.createWithModel(model);
+        } else {*/
+            this.createWithModel(model);
+            if (!failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo, condition + "")) {
+                throw new Exception("执行流程失败");
+            }
+     /*   }*/
+        return true;
+    }
+
+
+    /**
+     * 修改故障保修单任务状态
+     */
+    @Transactional
+    public Boolean updateStatus(FailureVerifyDto model, FailureStatuEnum status, ReginParams userInfo, int condition) throws Exception {
+
+        FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
+        //当前角色部门id为应急指挥科的时候 并且同意时 不修改主表状态 依然为待验收
+        //当前角色部门id为维修部门的时候 修改状态
+        List<FailureVerify> byfaultId = findByfaultId(failureDetailsDto.getSequenceNbr());
+
+        if (byfaultId.size() != 0) {
+            failureDetailsDto.setCurrentStatus(status.getCode());
+        }
+
+        failureDetailsDto.setSequenceNbr(model.getFaultId());
+        failureDetailsService.updateWithModel(failureDetailsDto);
+
+        String conditionText;
+
+        //添加报修日志
+        Long faultId = model.getFaultId();
+        Date processTime = model.getVerifyTime();
+        String processDepartment = model.getVerifyDepartment();
+        Integer processAuditorId = Integer.parseInt(userInfo.getUserModel().getUserId());
+        String processVerifyor = model.getAcceptor();
+        String processAuditorCid = userInfo.getUserModel().getUserName();
+        Long auditDepartmentId = (userInfo.getDepartment().getSequenceNbr());
+        Boolean repairlog = null;
+        if (condition == AuditResultEnum.AGREE.getCode()) {
+            conditionText = AuditResultEnum.AGREE.getName();
+            repairlog = repairlog(faultId, processVerifyor, processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorCid);
+        } else if (condition == AuditResultEnum.REFUSE.getCode()) {
+            conditionText = AuditResultEnum.REFUSE.getName();
+            repairlog = repairlog(faultId, processVerifyor, processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorCid);
+        }
+        if (!repairlog) {
+            throw new Exception("执行流程失败");
+        } else {
+            return true;
+        }
+
+
+    }
+
+    /**
+     * 添加报修日志
+     */
+    @Transactional
+    public Boolean repairlog(Long faultId, String processAuditor, Integer processAuditorId, Long departmentId, Date processTime,
+                             String processDepartment, String processResult, String processVerifyorCid) {
+        FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
+        failureRepairlogDto.setFaultId(faultId);
+        failureRepairlogDto.setProcessAuditor(processAuditor);
+        failureRepairlogDto.setProcessAuditorId(processAuditorId);
+        failureRepairlogDto.setProcessDepartmentId(departmentId);
+        failureRepairlogDto.setProcessTime(processTime);
+        failureRepairlogDto.setProcessDepartment(processDepartment);
+        failureRepairlogDto.setProcessResult(processResult);
+        failureRepairlogDto.setProcessAuditorCid(processVerifyorCid);
+        failureRepairlogService.createWithModel(failureRepairlogDto);
+        if (ObjectUtils.isNotEmpty(failureRepairlogDto)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 根据FaultId查询
+     */
+    public List<FailureVerify> findByfaultId(Long faultId) {
+        Page<FailureVerify> page = new Page<>();
+        QueryWrapper<FailureVerify> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("fault_id", faultId).orderByDesc("verify_time");
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    public FailureVerify findByFaultId(Long faultId) {
+        LambdaQueryWrapper<FailureVerify> wrapper = new LambdaQueryWrapper<FailureVerify>();
+        wrapper.eq(FailureVerify::getIsDelete, false);
+        wrapper.eq(FailureVerify::getFaultId, faultId);
+        wrapper.orderByAsc(FailureVerify::getVerifyTime);
+        wrapper.last("LIMIT 1");
+        return this.baseMapper.selectOne(wrapper);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
+import com.yeejoin.amos.boot.module.common.api.feign.SupervisionFeign;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -50,7 +51,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	DynamicFormColumnServiceImpl alertFormServiceImpl;
 	@Resource
 	OrgUsrMapper orgUsrMapper;
-
+	@Autowired
+	SupervisionFeign supervisionFeign;
 	@Autowired
 	ESOrgUsrService eSOrgUsrService;
 	@Override
@@ -399,7 +401,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) {
+	public void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception {
 		orgUsr.setRecDate(new Date());
 		AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
 		orgUsr.setRecUserName(user.getRealName());
@@ -417,6 +419,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		});
 		// 保存动态表单数据
 		alertFormValueServiceImpl.saveBatch(alertFromValuelist);
+		OrgUsrFormDto formDto = this.selectCompanyById(orgUsr.getSequenceNbr());
+		if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
+			supervisionFeign.asyncOwner(formDto);
+		}
 	}
 
 	@Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/InputItemController.java

@@ -402,4 +402,18 @@ public class InputItemController extends AbstractBaseController {
         List<InputItemTemplateVo> itemTemplateVoList = ExcelUtils.importExcel(file, 1, 1, InputItemTemplateVo.class);
         return CommonResponseUtil.success(inputItemService.uploadListByTemplate(itemTemplateVoList, orgCode, userId));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取字典值", notes = "获取字典值")
+    @GetMapping(value = "/diction")
+    public CommonResponse getCheckItemClassify() {
+        return CommonResponseUtil.success(inputItemService.generateDictionaryValue());
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取上一级", notes = "获取上一级")
+    @GetMapping(value = "/parent/item")
+    public CommonResponse getItemParent(@ApiParam(value = "检查项id") @RequestParam(required = false) String id) {
+        return CommonResponseUtil.success(inputItemService.getItemParent(id));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PointController.java

@@ -11,6 +11,7 @@ import java.util.Set;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.vo.MaintenanceResourceData;
 import com.yeejoin.amos.supervision.business.vo.PointClassifyVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
@@ -216,7 +217,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点信息
      *
-     * @param point
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -270,7 +271,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点信息
      *
-     * @param point
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -499,7 +500,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点的巡检项
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -518,7 +519,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点的巡检项
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -537,7 +538,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点的分类
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -556,7 +557,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 根据分类id查询对应项
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -576,7 +577,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 根据点id查询点的分类及对应项
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -672,7 +673,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点信息
      *
-     * @param point
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -808,15 +809,34 @@ public class PointController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "装备维保项", notes = "装备维保项")
-    @RequestMapping(value = "/equipmentInput", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+    @ApiOperation(value = "机场单位同步", notes = "机场单位同步")
+    @RequestMapping(value = "/teamInput", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse syncSavePoint(
-            @ApiParam(value = "同步请求参数") @RequestBody() List<MaintenanceResourceData> list) {
+            @ApiParam(value = "同步请求参数") @RequestBody OrgUsrFormDto orgUsrFormDto) {
         ReginParams reginParams = getSelectedOrgInfo();
         AgencyUserModel model = getUserInfo();
         String orgCode = getOrgCode(reginParams);
-        iPointService.syncSavePoint(list, orgCode, model.getUserId());
+        iPointService.syncSavePoint(orgUsrFormDto, orgCode, model.getUserId());
         return CommonResponseUtil.success();
     }
 
+    /**
+     * 删除巡检点
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "同步删除机场单位", notes = "同步删除机场单位")
+    @PostMapping(value = "/delete", produces = "application/json;charset=UTF-8")
+    public CommonResponse deleteOwner(@ApiParam(value = "巡检点ID", required = true) @RequestBody Long id) {
+        try {
+            iPointService.delPointByPointNo(id);
+            return CommonResponseUtil.success();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return CommonResponseUtil.failure("删除检查点失败");
+        }
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/InputItemMapper.java

@@ -32,4 +32,6 @@ public interface InputItemMapper {
     List<PointInputItemVo> queryCustomInputItemByPointId(@Param("pointId") Long pointId, @Param("equipmentId") String equipmentName);
 
     Integer insertList(List<InputItem> list);
+
+    List<InputItemVo> getInputItemParent(@Param("id") String id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPointDao.java

@@ -36,4 +36,12 @@ public interface IPointDao extends BaseDao<Point, Long> {
     void delPointBIds(Long id);
 
     List<Point> findAllByOriginalId(String relationId);
+
+    @Modifying
+    @Transactional
+    @Query(value = "UPDATE p_point SET is_delete = 1 WHERE point_no IN (?1)", nativeQuery = true)
+    void delPointByPointNo(Long id);
+
+    @Query(value = "SELECT id FROM p_point p WHERE is_delete = 0 AND p.point_no = (?1)", nativeQuery = true)
+    List<Long> findPointByPointNo(String pointNo);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/FormValue.java

+package com.yeejoin.amos.supervision.business.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @return
+ * <PRE>
+ * author tw
+ * date 2021/6/21
+ * </PRE>
+ * 动态表单值
+ */
+@Data
+@ApiModel(value="FormValue", description="动态表单值")
+public class FormValue implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+	@ApiModelProperty(value = "key")
+    private String  key;
+    @ApiModelProperty(value = "label")
+    private String label;
+    @ApiModelProperty(value = "type")
+    private String type;
+    @ApiModelProperty(value = "value")
+    private String value;
+    @ApiModelProperty(value = "是否一行显示")
+    private boolean block;
+  
+    public FormValue() {
+    }
+
+	public FormValue(String key, String label, String type, String value, boolean block) {
+		super();
+		this.key = key;
+		this.label = label;
+		this.type = type;
+		this.value = value;
+		this.block = block;
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/OrgPersonFormDto.java

+package com.yeejoin.amos.supervision.business.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+* 机构/部门/人员表
+*
+* @author tb
+* @date 2021-06-18
+*/
+@Data
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+@ApiModel(value="OrgUsrVo", description="人员信息")
+public class OrgPersonFormDto extends BaseEntity{
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "机构/部门id")
+    private Long id;
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构类型`")
+    private String bizOrgType;
+
+    @ApiModelProperty(value = "所属建筑名称")
+    private String buildName;
+
+    @ApiModelProperty(value = "所属建筑ID")
+    private String buildId;
+
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentId;
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentName;
+
+    @ApiModelProperty(value = "动态表单值")
+    private List<FormValue> dynamicFormAlert;
+
+    public OrgPersonFormDto() {
+    }
+
+    public OrgPersonFormDto(List<FormValue> dynamicFormAlert) {
+        this.dynamicFormAlert = dynamicFormAlert;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/OrgUsrFormDto.java

+package com.yeejoin.amos.supervision.business.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* 机构/部门/人员表
+*
+* @author tb
+* @date 2021-06-18
+*/
+@Data
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+@ApiModel(value="OrgUsrVo", description="机构/部门/人员表")
+public class OrgUsrFormDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位id")
+    private Long id;
+    @ApiModelProperty(value = "单位id")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "单位名称")
+    private String currentUnit;
+
+    @ApiModelProperty(value = "归属机构/部门")
+    private String parentId;
+    
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构类型`")
+    private String bizOrgType;
+
+    @ApiModelProperty(value = "所属建筑名称")
+    private String buildName;
+
+    @ApiModelProperty(value = "所属建筑ID")
+    private String buildId;
+
+    private Integer personNum;
+
+    @ApiModelProperty(value = "动态表单值")
+    private List<FormValue> dynamicFormAlert;
+
+    @ApiModelProperty(value = "单位人员信息值")
+    private List<OrgPersonFormDto> children;
+
+    public List<FormValue> getDynamicFormAlert() {
+		return dynamicFormAlert;
+	}
+
+    @ApiModelProperty(value = "转换动态表单")
+    private Map<String,Object> map=new HashMap<>();;
+
+	public void setDynamicFormAlert(List<FormValue> dynamicFormAlert) {
+		  if(dynamicFormAlert!=null) {
+			  dynamicFormAlert.forEach(formValue->{
+					this.map.put(formValue.getKey(), formValue.getValue());
+				});
+		  }
+		  this.dynamicFormAlert=dynamicFormAlert;
+	}
+
+	public OrgUsrFormDto() {
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/InputItemServiceImpl.java

@@ -10,9 +10,11 @@ import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.ICatalogTreeService;
 import com.yeejoin.amos.supervision.business.service.intfc.IInputItemService;
 import com.yeejoin.amos.supervision.business.util.DaoCriteria;
+import com.yeejoin.amos.supervision.business.util.StringUtil;
 import com.yeejoin.amos.supervision.business.vo.InputItemTemplateVo;
 import com.yeejoin.amos.supervision.business.vo.InputItemVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
+import com.yeejoin.amos.supervision.common.enums.DictTypeEnum;
 import com.yeejoin.amos.supervision.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.supervision.dao.entity.InputItem;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
@@ -25,6 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import java.util.*;
 
@@ -93,6 +96,46 @@ public class InputItemServiceImpl implements IInputItemService {
     }
 
     @Override
+    public List<Map<String, Object>> generateDictionaryValue() {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (Map<String, String> map : DictTypeEnum.getEnumList()) {
+            JSONArray jsonArray = remoteSecurityService.listDictionaryByDictCode(RequestContext.getToken(),
+                    RequestContext.getProduct(), RequestContext.getAppKey(), map.get("code"));
+            Map<String, Object> map1 = new HashMap<>();
+            List lists = new LinkedList();
+            for (int i = 0, size = jsonArray.size(); i < size; i++) {
+                Map<String, String> m = new HashMap<>();
+                JSONObject jsonObject = jsonArray.getJSONObject(i);
+                m.put("id", jsonObject.get("dictDataKey").toString());
+                m.put("name", jsonObject.get("dictDataValue").toString());
+                lists.add(m);
+            }
+            if ("itemClassify".equals(map.get("code"))) {
+                map1.put("CHECK_ITEM_CLASSIFY", lists);
+                list.add(map1);
+            }
+            if ("itemType".equals(map.get("code"))) {
+                map1.put("CHECK_ITEM_TYPE", lists);
+                list.add(map1);
+            }
+            if ("itemLevel".equals(map.get("code"))) {
+                map1.put("CHECK_ITEM_LEVEL", lists);
+                list.add(map1);
+            }
+            if ("checkType".equals(map.get("code"))) {
+                map1.put("CHECK_ITEM_CONTENT", lists);
+                list.add(map1);
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public List getItemParent(String id) {
+        return inputItemMapper.getInputItemParent(id);
+    }
+
+    @Override
     public List<InputItem> queryInputItemByCondition(List<DaoCriteria> criterias) {
         BaseQuerySpecification<InputItem> specification = new BaseQuerySpecification<>(criterias);
         return inputItemDao.findAll(specification);

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

 package com.yeejoin.amos.supervision.business.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
@@ -20,6 +21,8 @@ import com.yeejoin.amos.supervision.business.dao.repository.IPointInputItemDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IPointPhotoDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointItemDao;
+import com.yeejoin.amos.supervision.business.dto.FormValue;
+import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.dto.PointDto;
 import com.yeejoin.amos.supervision.business.entity.mybatis.CheckPtListBo;
 import com.yeejoin.amos.supervision.business.feign.EquipFeign;
@@ -1118,45 +1121,53 @@ public class PointServiceImpl implements IPointService {
     }
 
     @Override
-    public void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId) {
+    public void syncSavePoint(OrgUsrFormDto orgUsrFormDto, String orgCode, String userId) {
         List<Point> points = new ArrayList<>();
         List<PointInputItem> inputItems = new ArrayList<>();
         List<Long> ids = new ArrayList<Long>();
-        for (MaintenanceResourceData x : list) {
-            Point point = new Point();
-            String pointNo = StringUtil.isNotEmpty(x.getFireFacilityCode()) ? x.getFireFacilityCode() : String.valueOf(sequence.nextId());
-            String originalId = String.valueOf(x.getFireFacilityId());
-            point.setOriginalId(originalId);
-            point.setName(x.getFireFacilityName());
-            point.setPointNo(pointNo);
-            point.setEquipmentId(x.getClassifyId() == null ? "" : x.getClassifyId().toString());
-            point.setEquipmentName(x.getClassifyName());
-            point.setBelongSystemId(x.getFireFightSysId() == null ? "" : x.getFireFightSysId().toString());
-            point.setBelongSystemName(x.getFireFightSysName());
-            point.setOwnerId(String.valueOf(x.getOwnerUnitId()));
-            point.setOwnerName(x.getOwnerUnitName());
-            point.setAddress(x.getLocation());
-            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()) {
-                inputItemVos.forEach(y -> {
-                    PointInputItem inputItem = new PointInputItem();
-                    inputItem.setPointId(point.getId());
-                    inputItem.setOrderNo(y.getOrderNo());
-                    inputItem.setInputItemId(y.getId());
-                    inputItems.add(inputItem);
-                });
+        Point point = new Point();
+        String pointNo = StringUtil.isNotEmpty(orgUsrFormDto.getSequenceNbr()) ? String.valueOf(orgUsrFormDto.getSequenceNbr()) : String.valueOf(sequence.nextId());
+        point.setName(orgUsrFormDto.getBizOrgName());
+        point.setPointNo(pointNo);
+        point.setOrgCode(orgUsrFormDto.getBizOrgCode());
+        point.setBuildingId(orgUsrFormDto.getBuildId());
+        point.setBuildingName(orgUsrFormDto.getBuildName());
+        point.setOriginalId(orgUsrFormDto.getParentId());
+        String data = JSON.toJSONString(orgUsrFormDto.getMap());
+        point.setExtendJson(data);
+        point.setOwnerId(pointNo);
+        point.setOwnerName(orgUsrFormDto.getBizOrgName());
+        if (0 < orgUsrFormDto.getDynamicFormAlert().size()) {
+            for (FormValue formValue : orgUsrFormDto.getDynamicFormAlert()) {
+                if ("longitude".equals(formValue.getKey())) {
+                    point.setLongitude(formValue.getValue());
+                }
+                if ("latitude".equals(formValue.getKey())) {
+                    point.setLatitude(formValue.getValue());
+                }
+                if ("companyLocation".equals(formValue.getKey())) {
+                    point.setAddress(formValue.getValue());
+                }
             }
         }
+        point.setOrgCode(orgUsrFormDto.getAmosOrgCode());
+        points.add(point);
+        Long id = iPointDao.findPointByEquipmentIdAndFireFacilityId(pointNo, point.getOriginalId());
+        if (null != id) {
+            ids.add(id);
+            iPointDao.delPointBIds(id);
+        }
+        iPointDao.save(point);
+        List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(point.getName(), orgCode);
+        if (0 < inputItemVos.size()) {
+            inputItemVos.forEach(y -> {
+                PointInputItem inputItem = new PointInputItem();
+                inputItem.setPointId(point.getId());
+                inputItem.setOrderNo(y.getOrderNo());
+                inputItem.setInputItemId(y.getId());
+                inputItems.add(inputItem);
+            });
+        }
         if (0 < ids.size()) {
             iPointInputItemDao.deleteByPointId(ids);
         }
@@ -1183,4 +1194,12 @@ public class PointServiceImpl implements IPointService {
         Pageable pageable = new CommonPageable(pointPage.getNumber(), pointPage.getSize(), pointPage.getSort());
         return new PageImpl<>(pointDtos, pageable, pointPage.getTotalElements());
     }
+
+    @Override
+    public void delPointByPointNo(Long id) {
+        List<Long> idLists = new ArrayList<>();
+        idLists = iPointDao.findPointByPointNo(String.valueOf(id));
+        iPointInputItemDao.deleteByPointId(idLists);
+        iPointDao.delPointByPointNo(id);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IInputItemService.java

@@ -112,4 +112,8 @@ public interface IInputItemService {
     Boolean uploadListByTemplate(List<InputItemTemplateVo> itemTemplateVoList, String orgCode, String userId) throws Exception;
 
     Integer insertList(List<InputItem> list);
+
+    List generateDictionaryValue();
+
+    List getItemParent(String id);
 }

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

 package com.yeejoin.amos.supervision.business.service.intfc;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.dto.PointDto;
 import com.yeejoin.amos.supervision.business.param.*;
 import com.yeejoin.amos.supervision.business.param.CheckPtListPageParam;
@@ -309,7 +310,7 @@ public interface IPointService {
 
     LinkedHashMap<String,Object> getRegionTress ();
 
-    void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId);
+    void syncSavePoint(OrgUsrFormDto orgUsrFormDto, String orgCode, String userId);
     /**
      * 查询巡检点及点及点的项
      * @param queryRequests 请求参数
@@ -319,4 +320,11 @@ public interface IPointService {
      */
     Page<PointDto> queryPointInfoWithItem(List<DaoCriteria> queryRequests, CommonPageable commonPageable, Long ownerId);
 
+    /**
+     * 删除巡检点
+     *
+     * @param ids
+     */
+    void delPointByPointNo(Long id);
+
 }

amos-boot-system-supervision/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -16,4 +16,76 @@
              ALTER TABLE p_point ADD COLUMN `last_check_id` varchar(32) DEFAULT NULL COMMENT '最近检查记录（漏检不算）' AFTER `original_id`;
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1629261435-1" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="check_type"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN check_type</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `check_type` varchar(32) DEFAULT NULL COMMENT '检查类别' AFTER `test_requirement`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-2" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_parent"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_parent</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_parent` varchar(50) DEFAULT NULL COMMENT '父类检查项id' AFTER `check_type`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-3" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_classify"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_classify</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_classify` varchar(50) DEFAULT NULL COMMENT '检查项分类' AFTER `item_parent`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-4" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_type_classify"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_type_classify</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_type_classify` varchar(50) DEFAULT NULL COMMENT '适用检查类别' AFTER `item_classify`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-5" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_level"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_level</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_level` varchar(50) DEFAULT NULL COMMENT '检查项等级' AFTER `item_type_classify`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-6" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_start"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_start</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_start` bit(1) DEFAULT b'0' COMMENT '检查项状态' AFTER `item_level`;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -94,7 +94,8 @@
 		a.test_requirement,
 		a.check_method,
 		a.create_date,
-		a.input_classify
+		a.input_classify,
+		a.check_type
 		from
 		p_input_item a left join p_catalog_tree b on a.catalog_id = b.id
 		where a.is_delete = '0'
@@ -226,9 +227,9 @@
         from
         p_input_item pii
         where is_delete = '0' and input_type = 1 and equipment_name=#{equipmentName}
-        <if test="orgCode!=null and orgCode !=''">
-            and org_Code = #{orgCode}
-        </if>
+<!--        <if test="orgCode!=null and orgCode !=''">-->
+<!--            and org_Code = #{orgCode}-->
+<!--        </if>-->
     </select>
     <insert id="insertList" parameterType="java.util.List">
         INSERT INTO p_input_item (
@@ -260,4 +261,18 @@
             )
         </foreach>
     </insert>
+
+	<select id="getInputItemParent" resultType="com.yeejoin.amos.supervision.business.vo.InputItemVo">
+		SELECT
+			pii.id AS id,
+			pii.name AS name
+		FROM
+			p_input_item pii
+		WHERE
+		1=1
+		<if test="id !=null and id !=''">
+			AND pii.id != #{id}
+		</if>
+		ORDER BY create_date DESC;
+	</select>
 </mapper>
\ No newline at end of file