'移动端-消防整改-待办事项列表查询接口和移动端-消防整改-待办事项去整改按钮接口'

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

@@ -4,6 +4,7 @@ package com.usky.fire.controller.web;
 import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.service.vo.DemFireReformVO;
+import com.usky.fire.service.vo.MobileScheduleVO;
 import com.usky.fire.service.vo.UpdateReformReviewVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -11,8 +12,6 @@ import com.usky.fire.service.DemFireReformService;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 
-import org.springframework.stereotype.Controller;
-
 import java.util.Map;
 import java.util.List;
 /**
@@ -49,6 +48,26 @@ public class DemFireReformController {
         return ApiResult.success(demFireReformService.fireReformList(companyName, reformId, companyType, pageNum, pageSize));
     }
 
+    /**
+     * 移动端-消防整改-待办事项列表查询
+     *
+     * @param companyId  单位编号
+     * @param reformId   整改单编号
+     * @param reformStatus 整改状态（1 已接收、2 整改中、3 整改完成、4 审核不通过、5 审核通过）
+     * @param pageNum   当前页
+     * @param pageSize   每页条数
+     * @return
+     */
+    @GetMapping("mobileScheduleList")
+    public ApiResult<CommonPage<MobileScheduleVO>> mobileScheduleList(@RequestParam(value = "companyId", required = false) String companyId,
+                                                                      @RequestParam(value = "reformId", required = false) String reformId,
+                                                                      @RequestParam(value = "reformStatus", required = false) Integer reformStatus,
+                                                                      @RequestParam(value = "pageNum",required = false,defaultValue = "1") Integer pageNum,
+                                                                      @RequestParam(value = "pageSize",required = false,defaultValue = "10") Integer pageSize){
+        return ApiResult.success(demFireReformService.mobileScheduleList(companyId, reformId, reformStatus, pageNum, pageSize));
+    }
+
+
     /**
      * 重点单位信息-消防整改审核-审核/查看资料
      *
@@ -74,5 +93,17 @@ public class DemFireReformController {
         return ApiResult.success();
     }
 
+    /**
+     * 移动端-消防整改-去整改
+     *
+     * @param reformId 整改单编号
+     * @return
+     */
+    @Log(title="移动端-消防整改-去整改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateMobileReformStatus")
+    public ApiResult<Void> updateMobileReformStatus(@RequestParam(value="reformId") String reformId){
+        demFireReformService.updateMobileReformStatus(reformId);
+        return ApiResult.success();
+    }
 }
 

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

@@ -49,9 +49,14 @@ public class DemFireReform implements Serializable {
     private LocalDateTime sendTime;
 
     /**
-     * 整改状态（1 已接收、2 整改中、3 整改完成、4 审核不通过、5 审核通过）
+     * 整改状态（0 待推送、1 已接收、2 整改中、3 整改完成、4 审核不通过、5 审核通过）
      */
     private Integer reformStatus;
 
+    /**
+     * 整改限期时间
+     */
+    private LocalDateTime limitTime;
+
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemFireReformMapper.java

@@ -4,6 +4,7 @@ import com.usky.fire.domain.DemFireReform;
 import com.usky.fire.service.vo.DemFireReformVO;
 import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.fire.service.vo.DemReformReviewVO;
+import com.usky.fire.service.vo.MobileScheduleVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -26,5 +27,11 @@ public interface DemFireReformMapper extends CrudMapper<DemFireReform> {
                                          @Param("current") Integer current,
                                          @Param("size") Integer size);
 
+    List<MobileScheduleVO> mobileScheduleList(@Param("companyId") String companyId,
+                                              @Param("reformId") String reformId,
+                                              @Param("reformStatus") Integer reformStatus,
+                                              @Param("current") Integer current,
+                                              @Param("size") Integer size);
+
     List<DemReformReviewVO> reformReview(@Param("reformId") String reformId);
 }

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

@@ -4,6 +4,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.domain.DemFireReform;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.service.vo.DemFireReformVO;
+import com.usky.fire.service.vo.MobileScheduleVO;
 import com.usky.fire.service.vo.UpdateReformReviewVO;
 
 import java.util.Map;
@@ -21,8 +22,11 @@ public interface DemFireReformService extends CrudService<DemFireReform> {
 
     CommonPage<DemFireReformVO> fireReformList(String companyName, String reformId, Integer companyType, Integer pageNum, Integer pageSize);
 
+    CommonPage<MobileScheduleVO> mobileScheduleList(String companyId, String reformId, Integer reformStatus, Integer pageNum, Integer pageSize);
+
     List<Map<String, Object>> reformReview(String reformId);
 
     void updateReformReview(UpdateReformReviewVO updateReformReviewVO);
 
+    void updateMobileReformStatus(String reformId);
 }

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

@@ -13,6 +13,7 @@ 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,6 +53,21 @@ public class DemFireReformServiceImpl extends AbstractCrudService<DemFireReformM
         return new CommonPage<>(list, total, pageSize, pageNum);
     }
 
+    @Override
+    public CommonPage<MobileScheduleVO> mobileScheduleList(String companyId, String reformId, Integer reformStatus, Integer pageNum, Integer pageSize){
+        List<MobileScheduleVO> list1 = baseMapper.mobileScheduleList(companyId, reformId, reformStatus, null, null);
+        int total = 0;
+        if(list1.size() > 0){
+            total = list1.size();
+        }
+        int current = 0;
+        if(pageNum > 0 && pageSize > 0){
+            current = (pageNum - 1)*pageSize;
+        }
+        List<MobileScheduleVO> list = baseMapper.mobileScheduleList(companyId, reformId, reformStatus, current, pageSize);
+        return new CommonPage<>(list, total, pageSize, pageNum);
+    }
+
     @Override
     public List<Map<String, Object>> reformReview(String reformId){
         List<Map<String, Object>> list = new ArrayList<>();
@@ -111,4 +127,19 @@ public class DemFireReformServiceImpl extends AbstractCrudService<DemFireReformM
 
     }
 
+    @Override
+    public void updateMobileReformStatus(String reformId){
+        LambdaQueryWrapper<DemFireReform> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DemFireReform::getId, reformId);
+        List<DemFireReform> list = this.list(queryWrapper);
+        list.get(0).setReformStatus(2);
+        this.updateById(list.get(0));
+
+
+        DemReformReview demReformReview = new DemReformReview();
+        demReformReview.setReformId(Integer.parseInt(reformId));
+        demReformReview.setReformTime(LocalDateTime.now());
+        demReformReviewService.save(demReformReview);
+    }
+
 }

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

@@ -0,0 +1,89 @@
+package com.usky.fire.service.vo;
+
+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 MobileScheduleVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 整改编号
+     */
+    private String reformId;
+
+    /**
+     * 整改单发送时间
+     */
+    private String sendTime;
+
+    /**
+     * 整改状态（1 已接收、2 整改中、3 整改完成、4 审核不通过、5 审核通过）
+     */
+    private Integer reformStatus;
+
+    /**
+     * 整改限期时间
+     */
+    private LocalDateTime limitTime;
+
+    /**
+     * 整改说明
+     */
+    private String reformPart;
+
+    /**
+     * 整改时间
+     */
+    private LocalDateTime reformTime;
+
+    /**
+     * 整改相关图片或文件路径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 reviewRemark;
+}

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

@@ -29,6 +29,7 @@
         LEFT JOIN base_company_person AS c ON a.company_id = c.company_id
         LEFT JOIN dem_reform_review AS d ON a.id = d.reform_id
         <where>
+            a.reform_status != 0
             <if test="companyName != null and companyName != ''">
                 and b.company_name LIKE CONCAT(CONCAT('%',#{companyName}),'%')
             </if>
@@ -44,6 +45,41 @@
         </if>
     </select>
 
+    <select id="mobileScheduleList" resultType="com.usky.fire.service.vo.MobileScheduleVO">
+        SELECT
+        a.id 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,
+        a.reform_part AS reformPart,
+        DATE_FORMAT(d.reform_time, '%Y-%m-%d %H:%i:%s') AS reformTime,
+        d.reform_path1 AS reformPath1,
+        d.reform_path2 AS reformPath2,
+        d.reform_path3 AS reformPath3,
+        d.reform_path4 AS reformPath4,
+        d.reform_path5 AS reformPath5,
+        DATE_FORMAT(d.review_time, '%Y-%m-%d %H:%i:%s') AS reviewTime,
+        d.review_remark AS reviewRemark
+        FROM
+        dem_fire_reform AS a
+        LEFT JOIN dem_reform_review AS d ON a.id = d.reform_id
+        <where>
+            a.reform_status != 0
+            <if test="companyId != null and companyId != ''">
+                and a.company_id  = #{companyId}
+            </if>
+            <if test="reformId != null and reformId != ''">
+                and a.id = #{reformId}
+            </if>
+            <if test="reformStatus > 0">
+                and a.reform_status = #{reformStatus}
+            </if>
+        </where>
+        <if test="current != null and size != null and size != 0">
+            limit #{current},#{size}
+        </if>
+    </select>
+
     <select id="reformReview" resultType="com.usky.fire.service.vo.DemReformReviewVO">
         SELECT
             a.id AS reFormId,
@@ -66,5 +102,4 @@
         </where>
     </select>
 
-
 </mapper>