'优化移动端-消防整改-去整改接口\消防整改信息表增加整改单编号字段'

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemFireReformController.java

@@ -5,6 +5,7 @@ import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.DemReformReview;
 import com.usky.fire.service.vo.DemFireReformVO;
+import com.usky.fire.service.vo.DemReformReviewMaterialVO;
 import com.usky.fire.service.vo.MobileScheduleVO;
 import com.usky.fire.service.vo.UpdateReformReviewVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -114,8 +115,8 @@ public class DemFireReformController {
      * @return
      */
     @PostMapping("addReformMaterial")
-    public ApiResult<Void> addReformMaterial(@RequestBody DemReformReview demReformReview){
-        demFireReformService.addReformMaterial(demReformReview);
+    public ApiResult<Void> addReformMaterial(@RequestBody DemReformReviewMaterialVO demReformReviewMaterialVO){
+        demFireReformService.addReformMaterial(demReformReviewMaterialVO);
         return ApiResult.success();
     }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemFireReform.java

@@ -28,6 +28,11 @@ public class DemFireReform implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    /**
+     * 整改编号
+     */
+    private String reformCode;
+
     /**
      * 单位ID
      */

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemFireReformService.java

@@ -5,6 +5,7 @@ import com.usky.fire.domain.DemFireReform;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemReformReview;
 import com.usky.fire.service.vo.DemFireReformVO;
+import com.usky.fire.service.vo.DemReformReviewMaterialVO;
 import com.usky.fire.service.vo.MobileScheduleVO;
 import com.usky.fire.service.vo.UpdateReformReviewVO;
 
@@ -31,5 +32,5 @@ public interface DemFireReformService extends CrudService<DemFireReform> {
 
     void updateMobileReformStatus(String reformId);
 
-    void addReformMaterial(DemReformReview demReformReview);
+    void addReformMaterial(DemReformReviewMaterialVO demReformReviewMaterialVO);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFireReformServiceImpl.java

@@ -12,12 +12,9 @@ import com.usky.fire.mapper.DemFireReformMapper;
 import com.usky.fire.service.DemFireReformService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.service.DemReformReviewService;
-import com.usky.fire.service.vo.DemReformReviewVO;
-import com.usky.fire.service.vo.MobileScheduleVO;
-import com.usky.fire.service.vo.UpdateReformReviewVO;
+import com.usky.fire.service.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.usky.fire.service.vo.DemFireReformVO;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -95,10 +92,11 @@ public class DemFireReformServiceImpl extends AbstractCrudService<DemFireReformM
     @Override
     public void updateReformReview(UpdateReformReviewVO updateReformReviewVO){
         LambdaQueryWrapper<DemFireReform> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(DemFireReform::getId, updateReformReviewVO.getReFormId());
+        queryWrapper.eq(DemFireReform::getReformCode, updateReformReviewVO.getReFormId());
         List<DemFireReform> list = this.list(queryWrapper);
         DemFireReform demFireReform = new DemFireReform();
         demFireReform.setId(list.get(0).getId());
+        demFireReform.setReformCode(list.get(0).getReformCode());
         demFireReform.setCompanyId(list.get(0).getCompanyId());
         demFireReform.setCompanyCode(list.get(0).getCompanyCode());
         demFireReform.setReformPart(list.get(0).getReformPart());
@@ -107,7 +105,7 @@ public class DemFireReformServiceImpl extends AbstractCrudService<DemFireReformM
         this.updateById(demFireReform);
 
         LambdaQueryWrapper<DemReformReview> queryWrapper1 = Wrappers.lambdaQuery();
-        queryWrapper1.eq(DemReformReview::getReformId, updateReformReviewVO.getReFormId());
+        queryWrapper1.eq(DemReformReview::getReformId, list.get(0).getId());
         List<DemReformReview> list1 = demReformReviewService.list(queryWrapper1);
         DemReformReview demReformReview = new DemReformReview();
         demReformReview.setId(list1.get(0).getId());
@@ -130,30 +128,31 @@ public class DemFireReformServiceImpl extends AbstractCrudService<DemFireReformM
     @Override
     public void updateMobileReformStatus(String reformId){
         LambdaQueryWrapper<DemFireReform> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(DemFireReform::getId, reformId);
+        queryWrapper.eq(DemFireReform::getReformCode, reformId);
         List<DemFireReform> list = this.list(queryWrapper);
         list.get(0).setReformStatus(2);
         this.updateById(list.get(0));
 
         LambdaQueryWrapper<DemReformReview> queryWrapper1 = Wrappers.lambdaQuery();
-        queryWrapper1.eq(DemReformReview::getReformId,reformId);
+        queryWrapper1.eq(DemReformReview::getReformId,list.get(0).getId());
         List<DemReformReview> list1 = demReformReviewService.list(queryWrapper1);
         if(list1.size() > 0){
             demReformReviewService.removeById(list1.get(0).getId());
         }
 
         DemReformReview demReformReview = new DemReformReview();
-        demReformReview.setReformId(Integer.parseInt(reformId));
+        demReformReview.setReformId(list.get(0).getId());
         demReformReview.setReformTime(LocalDateTime.now());
         demReformReviewService.save(demReformReview);
     }@Override
 
-    public void addReformMaterial(DemReformReview demReformReview){
+    public void addReformMaterial(DemReformReviewMaterialVO demReformReviewMaterialVO){
         LambdaQueryWrapper<DemFireReform> queryWrapper1 = Wrappers.lambdaQuery();
-        queryWrapper1.eq(DemFireReform::getId,demReformReview.getReformId());
+        queryWrapper1.eq(DemFireReform::getReformCode,demReformReviewMaterialVO.getReformId());
         List<DemFireReform> list1 = this.list(queryWrapper1);
         DemFireReform demFireReform = new DemFireReform();
         demFireReform.setId(list1.get(0).getId());
+        demFireReform.setReformCode(list1.get(0).getReformCode());
         demFireReform.setCompanyId(list1.get(0).getCompanyId());
         demFireReform.setCompanyCode(list1.get(0).getCompanyCode());
         demFireReform.setReformPart(list1.get(0).getReformPart());
@@ -164,10 +163,19 @@ public class DemFireReformServiceImpl extends AbstractCrudService<DemFireReformM
 
         LambdaQueryWrapper<DemReformReview> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DemReformReview::getId)
-                .eq(DemReformReview::getReformId, demReformReview.getReformId());
+                .eq(DemReformReview::getReformId, list1.get(0).getId());
         List<DemReformReview> list = demReformReviewService.list(queryWrapper);
+        DemReformReview demReformReview = new DemReformReview();
         demReformReview.setId(list.get(0).getId());
+        demReformReview.setReformId(list1.get(0).getId());
         demReformReview.setReformTime(LocalDateTime.now());
+        demReformReview.setReformPerson(demReformReviewMaterialVO.getReformPerson());
+        demReformReview.setReformRemark(demReformReviewMaterialVO.getReformRemark());
+        demReformReview.setReformPath1(demReformReviewMaterialVO.getReformPath1());
+        demReformReview.setReformPath2(demReformReviewMaterialVO.getReformPath2());
+        demReformReview.setReformPath3(demReformReviewMaterialVO.getReformPath3());
+        demReformReview.setReformPath4(demReformReviewMaterialVO.getReformPath4());
+        demReformReview.setReformPath5(demReformReviewMaterialVO.getReformPath5());
         demReformReviewService.updateById(demReformReview);
     }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemReformReviewMaterialVO.java

@@ -0,0 +1,88 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-02-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DemReformReviewMaterialVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 整改编号
+     */
+    private String reformId;
+
+    /**
+     * 整改时间
+     */
+    private LocalDateTime reformTime;
+
+    /**
+     * 整改提交人
+     */
+    private String reformPerson;
+
+    /**
+     * 整改备注
+     */
+    private String reformRemark;
+
+    /**
+     * 整改相关图片或文件路径1
+     */
+    private String reformPath1;
+
+    /**
+     * 整改相关图片或文件路径2
+     */
+    private String reformPath2;
+
+    /**
+     * 整改相关图片或文件路径3
+     */
+    private String reformPath3;
+
+    /**
+     * 整改相关图片或文件路径4
+     */
+    private String reformPath4;
+
+    /**
+     * 整改相关图片或文件路径5
+     */
+    private String reformPath5;
+
+    /**
+     * 审核时间
+     */
+    private LocalDateTime reviewTime;
+
+    /**
+     * 审核人
+     */
+    private String reviewPerson;
+
+    /**
+     * 审核备注
+     */
+    private String reviewRemark;
+}

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemFireReformMapper.xml

@@ -14,7 +14,7 @@
 
     <select id="fireReformList" resultType="com.usky.fire.service.vo.DemFireReformVO">
         SELECT
-        a.id AS reFormId,
+        a.reform_code AS reFormId,
         b.company_name AS companyName,
         b.company_type AS companyType,
         c.fire_duty_name AS fireDutyName,
@@ -34,7 +34,7 @@
                 and b.company_name LIKE CONCAT(CONCAT('%',#{companyName}),'%')
             </if>
             <if test="reformId != null and reformId != ''">
-                and a.id LIKE CONCAT(CONCAT('%', #{reformId}),'%')
+                and a.reform_code LIKE CONCAT(CONCAT('%', #{reformId}),'%')
             </if>
             <if test="companyType != null and companyType != ''">
                 and b.company_type LIKE CONCAT(CONCAT('%', #{companyType}),'%')
@@ -47,7 +47,7 @@
 
     <select id="mobileScheduleList" resultType="com.usky.fire.service.vo.MobileScheduleVO">
         SELECT
-        a.id AS reformId ,
+        a.reform_code AS reformId ,
         DATE_FORMAT(a.send_time, '%Y-%m-%d %H:%i:%s') AS sendTime,
         DATE_FORMAT(a.limit_time, '%Y-%m-%d %H:%i:%s') AS limitTime,
         a.reform_status AS reformStatus,
@@ -69,7 +69,7 @@
                 and a.company_id  = #{companyId}
             </if>
             <if test="reformId != null and reformId != ''">
-                and a.id = #{reformId}
+                and a.reform_code = #{reformId}
             </if>
             <if test="reformStatus > 0">
                 and a.reform_status = #{reformStatus}
@@ -82,7 +82,7 @@
 
     <select id="reformReview" resultType="com.usky.fire.service.vo.DemReformReviewVO">
         SELECT
-            a.id AS reFormId,
+            a.reform_code AS reFormId,
             a.reform_part AS reformPart,
             DATE_FORMAT(a.send_time,'%Y-%m-%d %H:%i:%s') AS sendTime,
             DATE_FORMAT(b.reform_time,'%Y-%m-%d %H:%i:%s') AS reformTime,
@@ -97,7 +97,7 @@
         LEFT JOIN dem_reform_review AS b ON a.id = b.reform_id
         <where>
             <if test="reformId != null and reformId != 0">
-                and a.id LIKE CONCAT(CONCAT('%', #{reformId}),'%')
+                and a.reform_code = #{reformId}
             </if>
         </where>
     </select>