Merge branch 'master' into han

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

@@ -3,7 +3,10 @@ package com.usky.fire.controller.web;
 
 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;
 import org.springframework.web.bind.annotation.*;
@@ -11,8 +14,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 +50,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 +95,29 @@ 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();
+    }
+
+    /**
+     * 移动端-消防整改-待办事项上传整改资料
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("addReformMaterial")
+    public ApiResult<Void> addReformMaterial(@RequestBody DemReformReviewMaterialVO demReformReviewMaterialVO){
+        demFireReformService.addReformMaterial(demReformReviewMaterialVO);
+        return ApiResult.success();
+    }
 }
 

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

@@ -1,9 +1,10 @@
 package com.usky.fire.controller.web;
 
 
+
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,9 +14,8 @@ import org.springframework.stereotype.Controller;
  * @author ZYJ
  * @since 2023-02-27
  */
-@Controller
+@RestController
 @RequestMapping("/demReformReview")
 public class DemReformReviewController {
-
 }
 

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
      */
@@ -49,9 +54,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

@@ -3,7 +3,10 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 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;
 
 import java.util.Map;
@@ -21,8 +24,13 @@ 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);
+
+    void addReformMaterial(DemReformReviewMaterialVO demReformReviewMaterialVO);
 }

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

@@ -12,5 +12,4 @@ import com.usky.common.mybatis.core.CrudService;
  * @since 2023-02-27
  */
 public interface DemReformReviewService extends CrudService<DemReformReview> {
-
 }

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

@@ -12,11 +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.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;
@@ -52,6 +50,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<>();
@@ -79,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());
@@ -91,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());
@@ -111,4 +125,58 @@ public class DemFireReformServiceImpl extends AbstractCrudService<DemFireReformM
 
     }
 
+    @Override
+    public void updateMobileReformStatus(String reformId){
+        LambdaQueryWrapper<DemFireReform> queryWrapper = Wrappers.lambdaQuery();
+        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,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(list.get(0).getId());
+        demReformReview.setReformTime(LocalDateTime.now());
+        demReformReviewService.save(demReformReview);
+    }@Override
+
+    public void addReformMaterial(DemReformReviewMaterialVO demReformReviewMaterialVO){
+        LambdaQueryWrapper<DemFireReform> queryWrapper1 = Wrappers.lambdaQuery();
+        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());
+        demFireReform.setSendTime(list1.get(0).getSendTime());
+        demFireReform.setReformStatus(3);
+        demFireReform.setLimitTime(list1.get(0).getLimitTime());
+        this.updateById(demFireReform);
+
+        LambdaQueryWrapper<DemReformReview> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemReformReview::getId)
+                .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/impl/DemReformReviewServiceImpl.java

@@ -1,11 +1,20 @@
 package com.usky.fire.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.DemFireReform;
 import com.usky.fire.domain.DemReformReview;
 import com.usky.fire.mapper.DemReformReviewMapper;
+import com.usky.fire.service.DemFireReformService;
 import com.usky.fire.service.DemReformReviewService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 整改审核数据表 服务实现类
@@ -16,5 +25,4 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class DemReformReviewServiceImpl extends AbstractCrudService<DemReformReviewMapper, DemReformReview> implements DemReformReviewService {
-
 }

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

@@ -85,7 +85,8 @@ public class ReservePlanServiceImpl extends AbstractCrudService<ReservePlanMappe
                 .eq(ReservePlan::getEnable, 1)
                 .eq(ReservePlan::getCreator, SecurityUtils.getUsername())
                 .like(StringUtils.isNotBlank(reserveName), ReservePlan::getReserveName, reserveName)
-                .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), ReservePlan::getCreateTime, startDate, endDate);
+                .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), ReservePlan::getCreateTime, startDate, endDate)
+                .orderByDesc(ReservePlan::getId);
         page = this.page(page, queryWrapper);
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
             for (int i = 0; i < page.getRecords().size(); i++) {

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/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/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.16.120.165:8848
+        server-addr: usky-cloud-nacos:8848
       config:
         # 配置中心地址
-        server-addr: 172.16.120.165:8848
+        server-addr: usky-cloud-nacos:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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,
@@ -29,11 +29,12 @@
         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>
             <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}),'%')
@@ -44,9 +45,44 @@
         </if>
     </select>
 
+    <select id="mobileScheduleList" resultType="com.usky.fire.service.vo.MobileScheduleVO">
+        SELECT
+        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,
+        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.reform_code = #{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,
+            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,
@@ -61,10 +97,9 @@
         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>
 
-
 </mapper>