代码提交

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @author system_generator
+ * @date 2021-08-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "FailureAuditDto", description = "")
+public class FailureAuditDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "审核人")
+    private String auditor;
+
+    @ApiModelProperty(value = "审核部门")
+    private String auditDepartment;
+
+    @ApiModelProperty(value = "审核时间")
+    private Date auditTime;
+
+    @ApiModelProperty(value = "审核意见")
+    private String auditOpinion;
+
+    @ApiModelProperty(value = "审核结果")
+    private Integer auditResult;
+
+    @ApiModelProperty(value = "设备故障报修单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/dto/FailureDetailsDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author system_generator
+ * @date 2021-08-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "FailureDetailsDto", description = "")
+public class FailureDetailsDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "当前状态")
+    private Integer currentStatus;
+
+    @ApiModelProperty(value = "故障单号")
+    private String failureCode;
+
+    @ApiModelProperty(value = "故障设备ID")
+    private Integer failureEquipmentId;
+
+    @ApiModelProperty(value = "故障设备")
+    private String failureEquipment;
+
+    @ApiModelProperty(value = "故障时间")
+    private Date faultTime;
+
+    @ApiModelProperty(value = "故障现象")
+    private String faultPhenomenon;
+
+    @ApiModelProperty(value = "报送人")
+    private String submissionName;
+
+    @ApiModelProperty(value = "报送人ID")
+    private Integer submissionPid;
+
+    @ApiModelProperty(value = "组织code")
+    private String bizCode;
+
+    @ApiModelProperty(value = "报送时间")
+    private Date submissionTime;
+
+    @ApiModelProperty(value = "送达部门")
+    private String submissionBranch;
+
+    @ApiModelProperty(value = "送达部门ID")
+    private Long submissionBranchId;
+
+    @ApiModelProperty(value = "流程ID")
+    private String processId;
+
+    @ApiModelProperty(value = "附件")
+    private List<SourceFile> attachment;
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author system_generator
+ * @date 2021-08-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "FailureMaintainDto", description = "")
+public class FailureMaintainDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "维修人")
+    private String maintainMan;
+
+    @ApiModelProperty(value = "维修时间")
+    private Date maintainTime;
+
+    @ApiModelProperty(value = "维修人手机号")
+    private Long maintainPhone;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String bizId;
+
+    @ApiModelProperty(value = "所属部门")
+    private String department;
+
+    @ApiModelProperty(value = "维修内容")
+    private String maintainContent;
+
+    @ApiModelProperty(value = "记录类型")
+    private String recoreType;
+
+    @ApiModelProperty(value = "验收意见")
+    private String acceptanceOpinion;
+
+    @ApiModelProperty(value = "设备故障报修主表ID")
+    private Long faultId;
+
+    @ApiModelProperty(value = "附件")
+    private List<SourceFile> attachment;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FailureAudit.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-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_failure_audit")
+public class FailureAudit extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 审核人
+     */
+	@TableField("auditor")
+    private String auditor;
+
+    /**
+     * 审核部门
+     */
+	@TableField("audit_department")
+    private String auditDepartment;
+
+    /**
+     * 审核时间
+     */
+	@TableField("audit_time")
+    private Date auditTime;
+
+    /**
+     * 审核意见
+     */
+	@TableField("audit_opinion")
+    private String auditOpinion;
+
+    /**
+     * 设备故障报修单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/entity/FailureDetails.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-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_failure_details")
+public class FailureDetails extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当前状态
+     */
+	@TableField("current_status")
+    private Integer currentStatus;
+
+    /**
+     * 故障单号
+     */
+	@TableField("failure_code")
+    private String failureCode;
+
+    /**
+     * 故障设备ID
+     */
+	@TableField("failure_equipment_id")
+    private Integer failureEquipmentId;
+
+    /**
+     * 故障设备
+     */
+	@TableField("failure_equipment")
+    private String failureEquipment;
+
+    /**
+     * 故障时间
+     */
+	@TableField("fault_time")
+    private Date faultTime;
+
+    /**
+     * 故障现象
+     */
+	@TableField("fault_phenomenon")
+    private String faultPhenomenon;
+
+    /**
+     * 报送人
+     */
+	@TableField("submission_name")
+    private String submissionName;
+
+    /**
+     * 报送人ID
+     */
+	@TableField("submission_pid")
+    private Integer submissionPid;
+
+    /**
+     * 组织code
+     */
+	@TableField("biz_code")
+    private String bizCode;
+
+    /**
+     * 报送时间
+     */
+	@TableField("submission_time")
+    private Date submissionTime;
+
+    /**
+     * 送达部门
+     */
+	@TableField("submission_branch")
+    private String submissionBranch;
+
+    /**
+     * 送达部门ID
+     */
+	@TableField("submission_branch_id")
+    private Long submissionBranchId;
+
+    /**
+     * 流程ID
+     */
+	@TableField("process_id")
+    private String processId;
+
+}

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

+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-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_failure_maintain")
+public class FailureMaintain extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 维修人
+     */
+	@TableField("maintain_man")
+    private String maintainMan;
+
+    /**
+     * 维修时间
+     */
+	@TableField("maintain_time")
+    private Date maintainTime;
+
+    /**
+     * 维修人手机号
+     */
+	@TableField("maintain_phone")
+    private Long maintainPhone;
+
+    /**
+     * 所属部门ID
+     */
+	@TableField("biz_id")
+    private String bizId;
+
+    /**
+     * 所属部门
+     */
+	@TableField("department")
+    private String department;
+
+    /**
+     * 维修内容
+     */
+	@TableField("maintain_content")
+    private String maintainContent;
+
+    /**
+     * 记录类型
+     */
+	@TableField("recore_type")
+    private String recoreType;
+
+    /**
+     * 验收意见
+     */
+	@TableField("acceptance_opinion")
+    private String acceptanceOpinion;
+
+    /**
+     * 设备故障报修主表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/enums/AuditResultEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+public enum AuditResultEnum {
+    SEND_BACK(2,"退回"),
+    AGREE(0,"同意"),
+    REFUSE(1,"拒绝");
+
+
+    private AuditResultEnum(int code,String name){
+        this.code=code;
+        this.name=name;
+    }
+
+    private int code;
+
+    private String name;
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

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

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+public enum FailureStatuEnum {
+
+        WAITING_AUDIT(0,"待审核"),
+        WAITING_SUBMIT(1,"待提交"),
+        WAITING_MAINTAIN(2,"待维修"),
+        WAITING_ACCEPTANCE(3,"待验收"),
+        REFUSE(4,"已拒绝"),
+        FINISH(5,"已完结");
+
+
+        private FailureStatuEnum(Integer code, String name){
+            this.code=code;
+            this.name=name;
+        }
+
+        private Integer code;
+
+        private String name;
+
+        public Integer getCode() {
+            return code;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+    }
+

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

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+public interface FailureAuditMapper extends BaseMapper<FailureAudit> {
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
+}

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

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureMaintain;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+public interface FailureMaintainMapper extends BaseMapper<FailureMaintain> {
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+public interface IFailureAuditService {
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+public interface IFailureDetailsService {
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+public interface IFailureMaintainService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureAuditMapper.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.FailureAuditMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.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.FailureDetailsMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureMaintainMapper.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.FailureMaintainMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/pom.xml

@@ -20,5 +20,17 @@
 			<artifactId>amos-boot-module-jcs-api</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
+      <dependency>
+          <groupId>com.amosframework.boot</groupId>
+          <artifactId>amos-boot-module-maintenance-biz</artifactId>
+          <version>1.0.0</version>
+          <scope>compile</scope>
+      </dependency>
+      <!-- <dependency>
+           <groupId>com.amosframework.boot</groupId>
+           <artifactId>amos-boot-module-patrol-biz</artifactId>
+           <version>1.0.0</version>
+           <scope>compile</scope>
+       </dependency>-->
   </dependencies>
 </project>

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

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureAuditServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+@RestController
+@Api(tags = "故障维修审核Api")
+@RequestMapping(value = "/common/failure-audit")
+public class FailureAuditController extends BaseController {
+
+    @Autowired
+    FailureAuditServiceImpl failureAuditServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<FailureAuditDto> save(@RequestBody FailureAuditDto model) {
+	    model = failureAuditServiceImpl.savemodel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<FailureAuditDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(failureAuditServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<FailureAuditDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<FailureAuditDto> page = new Page<FailureAuditDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(failureAuditServiceImpl.queryForFailureAuditPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<FailureAuditDto>> selectForList() {
+	    return ResponseHelper.buildResponse(failureAuditServiceImpl.queryForFailureAuditList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureDetailsServiceImpl;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+/*import com.yeejoin.amos.patrol.business.util.CommonResponse;
+import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;*/
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+@RestController
+@Api(tags = "故障维修单Api")
+@RequestMapping(value = "/common/failure-details")
+public class FailureDetailsController extends BaseController {
+
+	private final Logger logger = LoggerFactory.getLogger(FailureDetailsServiceImpl.class);
+
+    @Autowired
+    FailureDetailsServiceImpl failureDetailsServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+/*
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public CommonResponse save(@RequestBody FailureDetailsDto model) {
+	  */
+/*  model = failureDetailsServiceImpl.savemodel(model);
+	    return ResponseHelper.buildResponse(model);*//*
+
+
+		CommonResponse commonResponse = new CommonResponse();
+		try {
+			AgencyUserModel user = getUserInfo();
+			if (ObjectUtils.isEmpty(user)) {
+				return CommonResponseUtil.failure("用户session过期");
+			}
+			return failureDetailsServiceImpl.savemodel(model);
+		} catch (Exception e) {
+			logger.error("", e.getMessage());
+			return CommonResponseUtil.failure("系统繁忙，请稍后再试");
+		}
+	}
+*/
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<FailureDetailsDto> updateBySequenceNbrFailureDetails(@RequestBody FailureDetailsDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(failureDetailsServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据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(failureDetailsServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<FailureDetailsDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<FailureDetailsDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<FailureDetailsDto> page = new Page<FailureDetailsDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<FailureDetailsDto>> selectForList() {
+	    return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsList());
+	}
+
+	/**
+	 * 根据状态查询当前下全部数据
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "根据状态查询当前下全部数据",   notes = "根据状态查询当前下全部数据")
+	@GetMapping(value = "/list/{currentStatus}")
+	public ResponseModel<List<FailureDetails>> selectStatusForList(@PathVariable Long currentStatus) {
+
+		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsList(currentStatus));
+	}
+
+
+}

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

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureMaintainDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureMaintainServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+@RestController
+@Api(tags = "故障维修记录Api")
+@RequestMapping(value = "/common/failure-maintain")
+public class FailureMaintainController extends BaseController {
+
+    @Autowired
+    FailureMaintainServiceImpl failureMaintainServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<FailureMaintainDto> save(@RequestBody FailureMaintainDto model) {
+	    model = failureMaintainServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+	 * 根据传递的Status状态确认验收状态
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "验收操作", notes = "根据sequenceNbr更新")
+	public ResponseModel<FailureMaintainDto> updateBySequenceNbrFailureMaintain(@RequestBody FailureMaintainDto model,Integer status,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateModel(model,status));
+	}
+
+/*
+	*/
+/**
+     * 根据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));
+	}
+
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<FailureMaintainDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<FailureMaintainDto> page = new Page<FailureMaintainDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.queryForFailureMaintainPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<FailureMaintainDto>> selectForList() {
+	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.queryForFailureMaintainList());
+	}
+
+
+}

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

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
+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.FailureAuditMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFailureAuditService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+@Service
+public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, FailureAudit, FailureAuditMapper> implements IFailureAuditService {
+    @Autowired
+    FailureDetailsServiceImpl failureDetailsService;
+   /* @Autowired
+    RemoteWorkFlowService remoteWorkFlowService;*/
+
+    /**
+     * 分页查询
+     */
+    public Page<FailureAuditDto> queryForFailureAuditPage(Page<FailureAuditDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<FailureAuditDto> queryForFailureAuditList() {
+        return this.queryForList("", false);
+    }
+
+    /**
+     * 发起审核
+     */
+    public FailureAuditDto savemodel(FailureAuditDto model) {
+
+       // remoteWorkFlowService.currentTask();
+
+        this.createWithModel(model);
+        Integer auditResult = model.getAuditResult();
+        if (auditResult.equal(AuditResultEnum.AGREE.getCode())) {
+            updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN.getCode());
+        } else if (auditResult.equal( AuditResultEnum.REFUSE.getCode())) {
+            updateStatus(model, FailureStatuEnum.REFUSE.getCode());
+        }else if (auditResult.equal(AuditResultEnum.SEND_BACK.getCode())){
+            updateStatus(model, FailureStatuEnum.WAITING_SUBMIT.getCode());
+        }
+        return model;
+    }
+
+    /**
+     * 修改故障保修单任务状态
+     */
+    FailureDetailsDto updateStatus(FailureAuditDto model, Integer status) {
+        FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
+        failureDetailsDto.setCurrentStatus(status);
+        failureDetailsDto.setSequenceNbr(model.getFaultId());
+        return failureDetailsService.updateWithModel(failureDetailsDto);
+
+    }
+}
\ 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/FailureDetailsServiceImpl.java

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
+
+import com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFailureDetailsService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+@Service
+public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, FailureDetails, FailureDetailsMapper> implements IFailureDetailsService {
+
+
+    @Autowired
+    SourceFileServiceImpl sourceFileServiceImpl;
+
+    @Autowired
+    private RemoteWorkFlowService remoteWorkFlowService;
+
+    @Value("${params.work.flow.processDefinitionKey}")
+    private String processDefinitionKey;
+*/
+
+    private final Logger logger = LoggerFactory.getLogger(FailureDetailsServiceImpl.class);
+
+
+    /**
+     * 分页查询
+     */
+    public Page<FailureDetailsDto> queryForFailureDetailsPage(Page<FailureDetailsDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<FailureDetailsDto> queryForFailureDetailsList() {
+        return this.queryForList("", false);
+    }
+
+    /**
+     * 根据状态查询
+     */
+    public List<FailureDetails> queryForFailureDetailsList(Long currentStatus) {
+        QueryWrapper<FailureDetails> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("current_status",currentStatus).orderByDesc("submission_time");
+        return baseMapper.selectList(queryWrapper);
+
+    }
+
+    /**
+     * 发起故障保修单
+     */
+      /*  public CommonResponse savemodel(FailureDetailsDto failureDetailsDto) {
+    String businessKey = RandomUtil.buildOrderNo();
+        JSONObject jsonObject = remoteWorkFlow.start( businessKey, processDefinitionKey);
+        if (jsonObject == null) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return CommonResponseUtil.failure("启动流程失败");
+        }
+        JSONObject instance = jsonObject.getJSONObject("data");
+        if(instance==null){
+            return CommonResponseUtil.failure("无提交隐患权限");
+        }
+        failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_AUDIT.getCode());
+        FailureDetailsDto model = this.createWithModel(failureDetailsDto);
+
+        sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), failureDetailsDto.getAttachment());
+        return CommonResponseUtil.success(model);
+    }*/
+
+
+}
\ 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/FailureMaintainServiceImpl.java

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureMaintainDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureMaintain;
+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.FailureMaintainMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFailureMaintainService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+@Service
+public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,FailureMaintain,FailureMaintainMapper> implements IFailureMaintainService {
+    @Autowired
+    SourceFileServiceImpl sourceFileServiceImpl;
+    @Autowired
+    FailureDetailsServiceImpl failureDetailsService;
+
+    /**
+     * 分页查询
+     */
+    public Page<FailureMaintainDto> queryForFailureMaintainPage(Page<FailureMaintainDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<FailureMaintainDto> queryForFailureMaintainList()   {
+        return this.queryForList("" , false);
+    }
+
+    /**
+     * 添加维修记录
+     */
+    public FailureMaintainDto savemodel(FailureMaintainDto failureMaintainDto)   {
+        this.createWithModel(failureMaintainDto);
+
+        //添加完成后修改保修单状态为待验收
+        FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
+        failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_ACCEPTANCE.getCode());
+        failureDetailsService.updateWithModel(failureDetailsDto);
+
+        sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),failureMaintainDto.getAttachment());
+        return failureMaintainDto;
+    }
+
+    /**
+     *根据审核结果更新维修表
+     */
+    public FailureMaintainDto updateModel(FailureMaintainDto failureMaintainDto,Integer status)   {
+
+        this.updateWithModel(failureMaintainDto);
+        //根据status修改状态
+        FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
+        if (status == AuditResultEnum.AGREE.getCode()) {//同意状态为已完结
+            failureDetailsDto.setCurrentStatus(FailureStatuEnum.FINISH.getCode());
+            failureDetailsService.updateWithModel(failureDetailsDto);
+        }else {//不同意状态为已拒绝
+            failureDetailsDto.setCurrentStatus(FailureStatuEnum.REFUSE.getCode());
+            failureDetailsService.updateWithModel(failureDetailsDto);
+        }
+        return failureMaintainDto;
+    }
+}
\ No newline at end of file