质量巡检相关

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

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

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

@@ -18,5 +18,6 @@ import java.util.List;
 public class RoutingInspectionDTO extends RoutingInspection {
 
     @ApiModelProperty(value = "检查项目集合")
-    private List<InspectionRectify> list;
+    private List<InspectionRectifyDTO> list;
+
 }

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

@@ -46,9 +46,21 @@ public class InspectionRectify extends BaseEntity {
     @ApiModelProperty(value = "整改附件")
     private String rectifyAttachment;
 
+    @ApiModelProperty(value = "整改附件")
+    private String rectifyAttachmentName;
+
     @ApiModelProperty(value = "整改图片")
     private String rectifyPdfUrl;
 
+    @ApiModelProperty(value = "是否显示图片 0不显示1显示")
+    private String isShowImage;
+
+    @ApiModelProperty(value = "节点id")
+    private String primaryKeyId;
+
+    @ApiModelProperty(value = "检查部位")
+    private String inspectLocation;
+
 
 
 }

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

@@ -37,7 +37,7 @@ public class RoutingInspection extends BaseEntity {
     private LocalDate rectifyDate;
 
     @ApiModelProperty(value = "整改人")
-    private Long rectifyUser;
+    private String rectifyUser;
 
     @ApiModelProperty(value = "检查部位")
     private String inspectLocation;

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

@@ -3,6 +3,7 @@ package org.springblade.manager.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.manager.dto.InspectionRectifyDTO;
 import org.springblade.manager.entity.InspectionRectify;
 import org.springblade.manager.entity.RoutingInspection;
 
@@ -18,6 +19,6 @@ import java.util.List;
 public class RoutingInspectionVO2 extends RoutingInspection {
 
     @ApiModelProperty(value = "检查项目集合")
-    private List<InspectionRectify> list;
+    private List<InspectionRectifyDTO> list;
 
 }

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

@@ -3,11 +3,16 @@ package org.springblade.manager.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.manager.dto.InspectionRectifyDTO;
 import org.springblade.manager.entity.InspectionRectify;
 import org.springblade.manager.entity.RoutingInspection;
 
+import java.util.List;
+
 
 public interface InspectionRectifyMapper extends BaseMapper<InspectionRectify> {
 
     void deleteByInspectId(@Param("inspectId") Long inspectId);
+
+    List<InspectionRectifyDTO> getDTOList(@Param("inspectId") Long inspectId);
 }

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

@@ -6,4 +6,9 @@
         DELETE FROM m_inspection_rectify
         WHERE inspect_id = #{inspectId}
     </delete>
+    <select id="getDTOList" resultType="org.springblade.manager.dto.InspectionRectifyDTO">
+        select *
+        from m_inspection_rectify
+        where is_deleted = 0 and inspect_id = #{inspectId}
+    </select>
 </mapper>

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

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

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

@@ -3,6 +3,7 @@ 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.dto.InspectionRectifyDTO;
 import org.springblade.manager.entity.InspectionRectify;
 import org.springblade.manager.entity.RoutingInspection;
 import org.springblade.manager.mapper.InspectionRectifyMapper;
@@ -11,6 +12,8 @@ import org.springblade.manager.service.IInspectionRectifyService;
 import org.springblade.manager.service.IRoutingInspectionService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @AllArgsConstructor
 public class InspectionRectifyServiceImpl extends BaseServiceImpl<InspectionRectifyMapper, InspectionRectify> implements IInspectionRectifyService {
@@ -19,4 +22,9 @@ public class InspectionRectifyServiceImpl extends BaseServiceImpl<InspectionRect
     public void deleteByInspectId(Long inspectId) {
         baseMapper.deleteByInspectId(inspectId);
     }
+
+    @Override
+    public List<InspectionRectifyDTO> getDTOList(Long inspectId) {
+        return baseMapper.getDTOList(inspectId);
+    }
 }

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

@@ -1,5 +1,6 @@
 package org.springblade.manager.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -17,10 +18,7 @@ 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.dto.*;
 import org.springblade.manager.entity.*;
 import org.springblade.manager.mapper.ArchiveAutoRuleWbsMapper;
 import org.springblade.manager.mapper.ArchiveTreeMapper;
@@ -33,6 +31,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -46,7 +45,7 @@ public class RoutingInspectionServiceImpl extends BaseServiceImpl<RoutingInspect
     @Transactional
     public void add(RoutingInspectionDTO dto) {
         //获取检查部位
-        List<InspectionRectify> list = dto.getList();
+        List<InspectionRectifyDTO> list = dto.getList();
         if (list == null || list.size() == 0){
             throw new ServiceException("请填写检查项目");
         }
@@ -57,15 +56,22 @@ public class RoutingInspectionServiceImpl extends BaseServiceImpl<RoutingInspect
         inspection.setId(id);
         this.save(inspection);
         //再保存具体的巡检项目
-        list.stream().forEach(l->l.setInspectId(id));
-        rectifyService.saveBatch(list);
+        List<InspectionRectify> list1 = list.stream().map(l -> {
+            InspectionRectify rectify = new InspectionRectify();
+            BeanUtils.copyProperties(l, rectify);
+            rectify.setInspectId(id);
+            List<String> autoExpandKeys = l.getAutoExpandKeys();
+            rectify.setInspectLocation(JSON.toJSONString(autoExpandKeys));
+            return rectify;
+        }).collect(Collectors.toList());
+        rectifyService.saveBatch(list1);
     }
 
     @Override
     @Transactional
     public void Update(RoutingInspectionDTO dto) {
         //获取检查部位
-        List<InspectionRectify> list = dto.getList();
+        List<InspectionRectifyDTO> list = dto.getList();
         if (list == null || list.size() == 0){
             throw new ServiceException("请填写检查项目");
         }
@@ -74,8 +80,16 @@ public class RoutingInspectionServiceImpl extends BaseServiceImpl<RoutingInspect
         this.updateById(inspection);
         //修改先删除，再保存
         rectifyService.deleteByInspectId(dto.getId());
-        list.stream().forEach(l->l.setInspectId(dto.getId()));
-        rectifyService.saveBatch(list);
+        //再保存具体的巡检项目
+        List<InspectionRectify> list1 = list.stream().map(l -> {
+            InspectionRectify rectify = new InspectionRectify();
+            BeanUtils.copyProperties(l, rectify);
+            rectify.setInspectId(dto.getId());
+            List<String> autoExpandKeys = l.getAutoExpandKeys();
+            rectify.setInspectLocation(JSON.toJSONString(autoExpandKeys));
+            return rectify;
+        }).collect(Collectors.toList());
+        rectifyService.saveBatch(list1);
     }
 
     @Override
@@ -97,7 +111,8 @@ public class RoutingInspectionServiceImpl extends BaseServiceImpl<RoutingInspect
     @Override
     public RoutingInspectionVO2 detail(Long id) {
         //先查出巡检项目集合
-        List<InspectionRectify> list = rectifyService.list(new LambdaQueryWrapper<InspectionRectify>().eq(InspectionRectify::getInspectId, id));
+        List<InspectionRectifyDTO> list = rectifyService.getDTOList(id);
+        list.stream().forEach(l->l.setAutoExpandKeys(JSON.parseArray(l.getInspectLocation(),String.class)));
         //再查出巡检信息，集合设置进巡检信息
         RoutingInspection inspection = this.getById(id);
         RoutingInspectionVO2 vo2 = new RoutingInspectionVO2();
@@ -113,6 +128,7 @@ public class RoutingInspectionServiceImpl extends BaseServiceImpl<RoutingInspect
             //复检未通过,修改复检状态为2未通过
             this.update(new LambdaUpdateWrapper<RoutingInspection>()
                     .set(RoutingInspection::getReviewInspectStatus,2)
+                    .set(RoutingInspection::getSubmitRectify,1)
                     .eq(RoutingInspection::getId,id));
         }else if (status == 2){
             //复检通过，修改复检状态为3通过，修改整改状态为2不用整改
@@ -131,10 +147,20 @@ public class RoutingInspectionServiceImpl extends BaseServiceImpl<RoutingInspect
         //修改巡检信息状态为已经整改
         this.update(new LambdaUpdateWrapper<RoutingInspection>()
                 .set(RoutingInspection::getSubmitRectify,2)
+                .set(RoutingInspection::getActualRectifyDate, LocalDate.now())
                 .eq(RoutingInspection::getId,dto.getId()));
         //保存检查项目
-        List<InspectionRectify> list = dto.getList();
-        rectifyService.updateBatchById(list);
+        List<InspectionRectifyDTO> list = dto.getList();
+        //再保存具体的巡检项目
+        List<InspectionRectify> list1 = list.stream().map(l -> {
+            InspectionRectify rectify = new InspectionRectify();
+            BeanUtils.copyProperties(l, rectify);
+            //整改只能修改整改信息
+            List<String> autoExpandKeys = l.getAutoExpandKeys();
+            rectify.setInspectLocation(JSON.toJSONString(autoExpandKeys));
+            return rectify;
+        }).collect(Collectors.toList());
+        rectifyService.updateBatchById(list1);
     }
 
     @Override
@@ -142,6 +168,7 @@ public class RoutingInspectionServiceImpl extends BaseServiceImpl<RoutingInspect
         //修改巡检信息为未整改
         this.update(new LambdaUpdateWrapper<RoutingInspection>()
                 .set(RoutingInspection::getSubmitRectify,1)
+                .set(RoutingInspection::getActualRectifyDate,null)
                 .eq(RoutingInspection::getId,id));
     }
 }