Merge branch 'master' of http://121.41.40.202:3000/zhuwei/bladex

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/RoutingInspectionDTO.java

@@ -0,0 +1,22 @@
+package org.springblade.manager.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.manager.entity.InspectionRectify;
+import org.springblade.manager.entity.RoutingInspection;
+
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/11/2 14:19
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RoutingInspectionDTO extends RoutingInspection {
+
+    @ApiModelProperty(value = "检查项目集合")
+    private List<InspectionRectify> list;
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/InspectionRectify.java

@@ -0,0 +1,54 @@
+package org.springblade.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.time.LocalDate;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/11/2 13:38
+ **/
+@Data
+@TableName("m_inspection_rectify")
+@EqualsAndHashCode(callSuper = true)
+public class InspectionRectify extends BaseEntity {
+
+    @ApiModelProperty(value = "项目名称")
+    private Long projectId;
+
+    @ApiModelProperty(value = "巡检id")
+    private Long inspectId;
+
+    @ApiModelProperty(value = "检查项目")
+    private String inspectProject;
+
+    @ApiModelProperty(value = "检查内容")
+    private String inspectContent;
+
+    @ApiModelProperty(value = "扣分标准")
+    private String deductionStandard;
+
+    @ApiModelProperty(value = "检查人名称")
+    private String inspectUserName;
+
+    @ApiModelProperty(value = "检查图片")
+    private String inspectPdfUrl;
+
+    @ApiModelProperty(value = "整改反馈")
+    private String rectifyFeedback;
+
+    @ApiModelProperty(value = "整改附件")
+    private String rectifyAttachment;
+
+    @ApiModelProperty(value = "整改图片")
+    private String rectifyPdfUrl;
+
+
+
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/RoutingInspection.java

@@ -0,0 +1,55 @@
+package org.springblade.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/11/2 13:38
+ **/
+@Data
+@TableName("m_routing_inspection")
+@EqualsAndHashCode(callSuper = true)
+public class RoutingInspection extends BaseEntity {
+
+    @ApiModelProperty(value = "项目名称")
+    private Long projectId;
+
+    @ApiModelProperty(value = "检查名称")
+    private String inspectName;
+
+    @ApiModelProperty(value = "巡检类别 1安全巡检2质量巡检")
+    private Integer inspectType;
+
+    @ApiModelProperty(value = "是否需要整改 1需要2不需要")
+    private Integer isRectify;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "整改日期")
+    private LocalDate rectifyDate;
+
+    @ApiModelProperty(value = "整改人")
+    private Long rectifyUser;
+
+    @ApiModelProperty(value = "检查部位")
+    private String inspectLocation;
+
+    @ApiModelProperty(value = "复核检查状态 1未检查2检查不通过3检查通过")
+    private Integer reviewInspectStatus;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "实际整改日期")
+    private LocalDate actualRectifyDate;
+
+    @ApiModelProperty(value = "是否提交整改 1已整改2未整改")
+    private String submitRectify;
+
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/RoutingInspectionVO.java

@@ -0,0 +1,28 @@
+package org.springblade.manager.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.manager.entity.RoutingInspection;
+
+/**
+ * @Param
+ * @Author wangwl 分页显示
+ * @Date 2023/11/2 14:44
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RoutingInspectionVO extends RoutingInspection {
+
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
+    @ApiModelProperty(value = "检查类别名称")
+    private String inspectTypeName;
+
+    @ApiModelProperty(value = "复核检查状态名称")
+    private String reviewInspectStatusName;
+
+    @ApiModelProperty(value = "是否需要整改名称")
+    private String isRectifyName;
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/RoutingInspectionVO2.java

@@ -0,0 +1,23 @@
+package org.springblade.manager.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.manager.entity.InspectionRectify;
+import org.springblade.manager.entity.RoutingInspection;
+
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl 单挑详细信息显示
+ * @Date 2023/11/2 14:44
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RoutingInspectionVO2 extends RoutingInspection {
+
+    @ApiModelProperty(value = "检查项目集合")
+    private List<InspectionRectify> list;
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/InspectionRectifyController.java

@@ -0,0 +1,19 @@
+package org.springblade.manager.controller;
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/11/2 13:55
+ **/
+@RestController
+@AllArgsConstructor
+@RequestMapping("/inspectionRectify")
+@Api(value = "检查与整改接口", tags = "检查与整改接口")
+public class InspectionRectifyController {
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/RoutingInspectionController.java

@@ -0,0 +1,145 @@
+package org.springblade.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.manager.dto.RoutingInspectionDTO;
+import org.springblade.manager.entity.RoutingInspection;
+import org.springblade.manager.service.IRoutingInspectionService;
+import org.springblade.manager.vo.RoutingInspectionVO;
+import org.springblade.manager.vo.RoutingInspectionVO2;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/11/2 13:55
+ **/
+@RestController
+@AllArgsConstructor
+@RequestMapping("/routingInspection")
+@Api(value = "巡检接口", tags = "巡检接口")
+public class RoutingInspectionController {
+
+    private final IRoutingInspectionService inspectionService;
+
+    /**
+     * 新增
+     */
+    @PostMapping("/add")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "新增", notes = "传入对象")
+    public R addOrUpdate(@RequestBody RoutingInspectionDTO dto) {
+        inspectionService.add(dto);
+        return R.success("新增成功");
+    }
+
+
+    @GetMapping("/page")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "巡检分页", notes = "巡检分页")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "projectId", value = "项目id", required = true)
+    })
+    public R<IPage<RoutingInspectionVO>> page(Query query, RoutingInspection inspection)  {
+        IPage<RoutingInspectionVO> page = inspectionService.page(query, inspection);
+        return R.data(page);
+    }
+
+    /**
+     * 查看单个巡检信息
+     */
+    @GetMapping("/detail")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "查看单个巡检信息，整改也调用此接口", notes = "传入巡检id")
+    public R<RoutingInspectionVO2> detail(Long id) {
+        RoutingInspectionVO2 vo2 = inspectionService.detail(id);
+        return R.data(vo2);
+    }
+
+    /**
+     * 巡检修改
+     */
+    @PostMapping("/Update")
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "巡检修改", notes = "传入对象")
+    public R Update(@RequestBody RoutingInspectionDTO dto) {
+        inspectionService.Update(dto);
+        return R.success("修改成功");
+    }
+
+    @GetMapping("/delete")
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "删除巡检", notes = "传入巡检id")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "巡检id", required = true)
+    })
+    public R delete(Long id)  {
+        inspectionService.delete(id);
+        return R.success("删除成功");
+    }
+
+
+    /**
+     * 提交整改记录
+     */
+    @PostMapping("/submitRectify")
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "提交整改记录", notes = "传入对象")
+    public R submitRectify(@RequestBody RoutingInspectionDTO dto) {
+        inspectionService.submitRectify(dto);
+        return R.success("提交成功");
+    }
+
+
+    @GetMapping("/page2")
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "整改管理分页", notes = "整改管理分页")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "projectId", value = "项目id", required = true)
+    })
+    public R<IPage<RoutingInspectionVO>> page2(Query query, RoutingInspection inspection)  {
+        inspection.setIsRectify(1);
+        IPage<RoutingInspectionVO> page = inspectionService.page(query, inspection);
+        return R.data(page);
+    }
+
+    /**
+     * 复核检测
+     */
+    @GetMapping("/reviewInspect")
+    @ApiOperationSupport(order = 8)
+    @ApiOperation(value = "复核检测", notes = "复核检测")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "巡检信息id", required = true),
+            @ApiImplicitParam(name = "status", value = "复检状态 1未通过2通过", required = true)
+    })
+    public R reviewInspect(Long id,Integer status) {
+        inspectionService.reviewInspect(id,status);
+        return R.success("操作成功");
+    }
+
+    /**
+     * 撤回提交
+     */
+    @GetMapping("/revokeSubmit")
+    @ApiOperationSupport(order = 8)
+    @ApiOperation(value = "撤回提交", notes = "撤回提交")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "巡检信息id", required = true)
+    })
+    public R revokeSubmit(Long id) {
+        inspectionService.revokeSubmit(id);
+        return R.success("撤回成功");
+    }
+
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/InspectionRectifyMapper.java

@@ -0,0 +1,13 @@
+package org.springblade.manager.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.manager.entity.InspectionRectify;
+import org.springblade.manager.entity.RoutingInspection;
+
+
+public interface InspectionRectifyMapper extends BaseMapper<InspectionRectify> {
+
+    void deleteByInspectId(@Param("inspectId") Long inspectId);
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/InspectionRectifyMapper.xml

@@ -0,0 +1,9 @@
+<?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="org.springblade.manager.mapper.InspectionRectifyMapper">
+
+    <delete id="deleteByInspectId">
+        DELETE FROM m_inspection_rectify
+        WHERE inspect_id = #{inspectId}
+    </delete>
+</mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/RoutingInspectionMapper.java

@@ -0,0 +1,14 @@
+package org.springblade.manager.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.manager.entity.RoutingInspection;
+import org.springblade.manager.vo.RoutingInspectionVO;
+
+
+public interface RoutingInspectionMapper extends BaseMapper<RoutingInspection> {
+
+    IPage<RoutingInspectionVO> page(IPage<RoutingInspectionVO> iPage,@Param("inspection") RoutingInspection inspection);
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/RoutingInspectionMapper.xml

@@ -0,0 +1,20 @@
+<?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="org.springblade.manager.mapper.RoutingInspectionMapper">
+
+    <select id="page" resultType="org.springblade.manager.vo.RoutingInspectionVO">
+        select mri.*,
+               (select project_name from m_project_info where id = mri.project_id) as projectName,
+               (select dict_value from blade_dict where code = 'inspect_type' and dict_key = mri.inspect_type) as inspectTypeName,
+               (select dict_value from blade_dict where code = 'review_inspect_status' and dict_key = mri.review_inspect_status) as reviewInspectStatusName,
+               case mri.is_rectify
+                   when 1 then '未开始'
+                   when 2 then '进行中'
+                   end as isRectifyName
+        from m_routing_inspection mri
+        where mri.is_deleted = 0 and mri.project_id = #{inspection.projectId}
+        <if test="inspection.isRectify != null and inspection.isRectify != ''">
+            and mri.is_rectify = #{inspection.isRectify}
+        </if>
+    </select>
+</mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IInspectionRectifyService.java

@@ -0,0 +1,12 @@
+package org.springblade.manager.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.manager.entity.InspectionRectify;
+import org.springblade.manager.entity.RoutingInspection;
+
+public interface IInspectionRectifyService extends BaseService<InspectionRectify> {
+
+    //真实删除检查项目
+    void deleteByInspectId(Long inspectId);
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IRoutingInspectionService.java

@@ -0,0 +1,36 @@
+package org.springblade.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.mp.support.Query;
+import org.springblade.manager.dto.ArchiveTreeContractAutoRuleMapDTO;
+import org.springblade.manager.dto.ArchiveTreeDTO;
+import org.springblade.manager.dto.ArchiveTreeSortDTO;
+import org.springblade.manager.dto.RoutingInspectionDTO;
+import org.springblade.manager.entity.ArchiveTree;
+import org.springblade.manager.entity.RoutingInspection;
+import org.springblade.manager.vo.ArchiveTreeVO2;
+import org.springblade.manager.vo.RoutingInspectionVO;
+import org.springblade.manager.vo.RoutingInspectionVO2;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IRoutingInspectionService extends BaseService<RoutingInspection> {
+
+    void add(RoutingInspectionDTO dto);
+
+    void Update(RoutingInspectionDTO dto);
+
+    IPage<RoutingInspectionVO> page(Query query, RoutingInspection inspection);
+
+    void delete(Long id);
+
+    RoutingInspectionVO2 detail(Long id);
+
+    void reviewInspect(Long id, Integer status);
+
+    void submitRectify(RoutingInspectionDTO dto);
+
+    void revokeSubmit(Long id);
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/InspectionRectifyServiceImpl.java

@@ -0,0 +1,22 @@
+package org.springblade.manager.service.impl;
+
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.manager.entity.InspectionRectify;
+import org.springblade.manager.entity.RoutingInspection;
+import org.springblade.manager.mapper.InspectionRectifyMapper;
+import org.springblade.manager.mapper.RoutingInspectionMapper;
+import org.springblade.manager.service.IInspectionRectifyService;
+import org.springblade.manager.service.IRoutingInspectionService;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class InspectionRectifyServiceImpl extends BaseServiceImpl<InspectionRectifyMapper, InspectionRectify> implements IInspectionRectifyService {
+
+    @Override
+    public void deleteByInspectId(Long inspectId) {
+        baseMapper.deleteByInspectId(inspectId);
+    }
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/RoutingInspectionServiceImpl.java

@@ -0,0 +1,147 @@
+package org.springblade.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.AllArgsConstructor;
+import org.springblade.common.utils.ForestNodeMergerEx;
+import org.springblade.common.utils.SnowFlakeUtil;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.manager.dto.ArchiveTreeContractAutoRuleMapDTO;
+import org.springblade.manager.dto.ArchiveTreeDTO;
+import org.springblade.manager.dto.ArchiveTreeSortDTO;
+import org.springblade.manager.dto.RoutingInspectionDTO;
+import org.springblade.manager.entity.*;
+import org.springblade.manager.mapper.ArchiveAutoRuleWbsMapper;
+import org.springblade.manager.mapper.ArchiveTreeMapper;
+import org.springblade.manager.mapper.RoutingInspectionMapper;
+import org.springblade.manager.service.*;
+import org.springblade.manager.utils.DiffListUtil;
+import org.springblade.manager.utils.ForestNodeMerger;
+import org.springblade.manager.vo.*;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class RoutingInspectionServiceImpl extends BaseServiceImpl<RoutingInspectionMapper, RoutingInspection> implements IRoutingInspectionService {
+
+    private final IInspectionRectifyService rectifyService;
+
+    @Override
+    @Transactional
+    public void add(RoutingInspectionDTO dto) {
+        //获取检查部位
+        List<InspectionRectify> list = dto.getList();
+        if (list == null || list.size() == 0){
+            throw new ServiceException("请填写检查项目");
+        }
+        //先保存巡检信息
+        Long id = SnowFlakeUtil.getId();
+        RoutingInspection inspection = new RoutingInspection();
+        BeanUtils.copyProperties(dto,inspection);
+        inspection.setId(id);
+        this.save(inspection);
+        //再保存具体的巡检项目
+        list.stream().forEach(l->l.setInspectId(id));
+        rectifyService.saveBatch(list);
+    }
+
+    @Override
+    @Transactional
+    public void Update(RoutingInspectionDTO dto) {
+        //获取检查部位
+        List<InspectionRectify> list = dto.getList();
+        if (list == null || list.size() == 0){
+            throw new ServiceException("请填写检查项目");
+        }
+        RoutingInspection inspection = new RoutingInspection();
+        BeanUtils.copyProperties(dto,inspection);
+        this.updateById(inspection);
+        //修改先删除，再保存
+        rectifyService.deleteByInspectId(dto.getId());
+        list.stream().forEach(l->l.setInspectId(dto.getId()));
+        rectifyService.saveBatch(list);
+    }
+
+    @Override
+    public IPage<RoutingInspectionVO> page(Query query, RoutingInspection inspection) {
+        IPage<RoutingInspectionVO> iPage = new Page<>(query.getCurrent(), query.getSize());
+        baseMapper.page(iPage,inspection);
+        return iPage;
+    }
+
+    @Override
+    @Transactional
+    public void delete(Long id) {
+        //先删除巡检项目
+        rectifyService.deleteByInspectId(id);
+        //再删除巡检信息
+        this.removeById(id);
+    }
+
+    @Override
+    public RoutingInspectionVO2 detail(Long id) {
+        //先查出巡检项目集合
+        List<InspectionRectify> list = rectifyService.list(new LambdaQueryWrapper<InspectionRectify>().eq(InspectionRectify::getInspectId, id));
+        //再查出巡检信息，集合设置进巡检信息
+        RoutingInspection inspection = this.getById(id);
+        RoutingInspectionVO2 vo2 = new RoutingInspectionVO2();
+        BeanUtils.copyProperties(inspection,vo2);
+        vo2.setList(list);
+        return vo2;
+    }
+
+    @Override
+    public void reviewInspect(Long id, Integer status) {
+        //判断复检状态
+        if (status == 1){
+            //复检未通过,修改复检状态为2未通过
+            this.update(new LambdaUpdateWrapper<RoutingInspection>()
+                    .set(RoutingInspection::getReviewInspectStatus,2)
+                    .eq(RoutingInspection::getId,id));
+        }else if (status == 2){
+            //复检通过，修改复检状态为3通过，修改整改状态为2不用整改
+            this.update(new LambdaUpdateWrapper<RoutingInspection>()
+                    .set(RoutingInspection::getReviewInspectStatus,3)
+                    .set(RoutingInspection::getIsRectify,2)
+                    .eq(RoutingInspection::getId,id));
+        }else {
+            throw new ServiceException("参数错误");
+        }
+    }
+
+    @Override
+    @Transactional
+    public void submitRectify(RoutingInspectionDTO dto) {
+        //修改巡检信息状态为已经整改
+        this.update(new LambdaUpdateWrapper<RoutingInspection>()
+                .set(RoutingInspection::getSubmitRectify,2)
+                .eq(RoutingInspection::getId,dto.getId()));
+        //保存检查项目
+        List<InspectionRectify> list = dto.getList();
+        rectifyService.updateBatchById(list);
+    }
+
+    @Override
+    public void revokeSubmit(Long id) {
+        //修改巡检信息为未整改
+        this.update(new LambdaUpdateWrapper<RoutingInspection>()
+                .set(RoutingInspection::getSubmitRectify,1)
+                .eq(RoutingInspection::getId,id));
+    }
+}