Merge branch 'usky-zyj' of uskycloud/usky-modules into master

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

@@ -0,0 +1,78 @@
+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.UpdateReformReviewVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+/**
+ * <p>
+ * 消防整改数据表 前端控制器
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/demFireReform")
+public class DemFireReformController {
+
+    @Autowired
+    private DemFireReformService demFireReformService;
+
+    /**
+     * 重点单位信息-消防整改审核-列表查询
+     *
+     * @param companyName 单位名称
+     * @param reformId   整改单编号
+     * @param companyType  单位类型（1：重点单位、2：一般单位、3：九小场所、9：其他单位）
+     * @param pageNum   当前页
+     * @param pageSize   每页条数
+     * @return
+     */
+    @GetMapping("fireReformList")
+    public ApiResult<CommonPage<DemFireReformVO>> fireReformList(@RequestParam(value = "companyName",required = false) String companyName,
+                                                                 @RequestParam(value = "reformId",required = false) String reformId,
+                                                                 @RequestParam(value = "companyType",required = false) Integer companyType,
+                                                                 @RequestParam(value = "pageNum",required = false,defaultValue = "1") Integer pageNum,
+                                                                 @RequestParam(value = "pageSize",required = false,defaultValue = "10") Integer pageSize){
+        return ApiResult.success(demFireReformService.fireReformList(companyName, reformId, companyType, pageNum, pageSize));
+    }
+
+    /**
+     * 重点单位信息-消防整改审核-审核/查看资料
+     *
+     * @param reformId  整改单编号
+     * @return
+     */
+    @GetMapping("reformReview")
+    public ApiResult<List<Map<String,Object>>> reformView(@RequestParam(value = "reformId") String reformId){
+        return ApiResult.success(demFireReformService.reformReview(reformId));
+    }
+
+    /**
+     * 重点单位信息-消防整改审核-通过/不通过
+     *
+     * @param updateReformReviewVO
+     * @return
+     */
+    @Log(title = "重点单位信息-消防整改审核-通过/不通过", businessType = BusinessType.UPDATE)
+    @PutMapping("updateReformReview")
+    public ApiResult<Void> updateReformReview(@RequestBody UpdateReformReviewVO updateReformReviewVO){
+        demFireReformService.updateReformReview(updateReformReviewVO);
+
+        return ApiResult.success();
+    }
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 整改审核数据表 前端控制器
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-02-27
+ */
+@Controller
+@RequestMapping("/demReformReview")
+public class DemReformReviewController {
+
+}
+

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

@@ -142,5 +142,9 @@ public class BaseCompanyChange implements Serializable {
      */
     private LocalDateTime createTime;
 
+    /**
+     * 街镇
+     */
+    private String streetTown;
 
 }

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

@@ -0,0 +1,57 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 消防整改数据表
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-02-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemFireReform implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 整改说明
+     */
+    private String reformPart;
+
+    /**
+     * 发出时间
+     */
+    private LocalDateTime sendTime;
+
+    /**
+     * 整改状态（1 已接收、2 整改中、3 整改完成、4 审核不通过、5 审核通过）
+     */
+    private Integer reformStatus;
+
+
+}

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

@@ -0,0 +1,91 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 整改审核数据表
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-02-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemReformReview implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 消防整改主表ID
+     */
+    private Integer 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/mapper/AlarmElectricalFireMapper.java

@@ -2,8 +2,10 @@ package com.usky.fire.mapper;
 
 import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.fire.domain.AlarmElectricalFire;
+import com.usky.fire.domain.DemFireReform;
 import com.usky.fire.service.vo.AlarmFireStatisticalVo;
 import com.usky.fire.service.vo.DataCountVo;
+import com.usky.fire.service.vo.DemFireReformVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -29,3 +31,5 @@ public interface AlarmElectricalFireMapper extends CrudMapper<AlarmElectricalFir
 
     List<DataCountVo> alarmFireCount(@Param("companyId") String companyId);
 }
+
+

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

@@ -0,0 +1,30 @@
+package com.usky.fire.mapper;
+
+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 org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 消防整改数据表 Mapper 接口
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-02-24
+ */
+@Repository
+public interface DemFireReformMapper extends CrudMapper<DemFireReform> {
+
+    List<DemFireReformVO> fireReformList(@Param("companyName") String companyName,
+                                         @Param("reformId") String reformId,
+                                         @Param("companyType") Integer companyType,
+                                         @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/mapper/DemReformReviewMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemReformReview;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 整改审核数据表 Mapper 接口
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-02-27
+ */
+public interface DemReformReviewMapper extends CrudMapper<DemReformReview> {
+
+}

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

@@ -0,0 +1,28 @@
+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.service.vo.DemFireReformVO;
+import com.usky.fire.service.vo.UpdateReformReviewVO;
+
+import java.util.Map;
+import java.util.List;
+
+/**
+ * <p>
+ * 消防整改数据表 服务类
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-02-24
+ */
+public interface DemFireReformService extends CrudService<DemFireReform> {
+
+    CommonPage<DemFireReformVO> fireReformList(String companyName, String reformId, Integer companyType, Integer pageNum, Integer pageSize);
+
+    List<Map<String, Object>> reformReview(String reformId);
+
+    void updateReformReview(UpdateReformReviewVO updateReformReviewVO);
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemReformReview;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 整改审核数据表 服务类
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-02-27
+ */
+public interface DemReformReviewService extends CrudService<DemReformReview> {
+
+}

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

@@ -821,7 +821,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
         if (StringUtils.isNotBlank(baseCompany.getCompanyId())) {
             LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.select(BaseCompany::getCompanyId,BaseCompany::getOrganization,BaseCompany::getCompanyName,
-                    BaseCompany::getAddress,BaseCompany::getFoundTime)
+                    BaseCompany::getAddress,BaseCompany::getFoundTime,BaseCompany::getCompanyNature, BaseCompany::getStreetTown)
                     .eq(BaseCompany::getCompanyId, baseCompany.getCompanyId())
                     .eq(BaseCompany::getEnable, 0)
                     .orderByDesc(BaseCompany::getId);
@@ -850,10 +850,12 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                 for (int i = 0; i < list1.size(); i++) {
                     BaseCompanyChange baseCompanyChange = new BaseCompanyChange();
                     baseCompanyChange.setCompanyId(list1.get(i).getCompanyId());
+                    baseCompanyChange.setCompanyNature(list1.get(i).getCompanyNature());
                     baseCompanyChange.setCompanyName(list1.get(i).getCompanyName());
                     baseCompanyChange.setOrganization(list1.get(i).getOrganization());
                     baseCompanyChange.setAddress(list1.get(i).getAddress());
                     baseCompanyChange.setFoundTime(list1.get(i).getFoundTime());
+                    baseCompanyChange.setStreetTown(list1.get(i).getStreetTown());
                     for (int j = 0; j < list2.size(); j++) {
                         if (list1.get(i).getCompanyId().equals(list2.get(j).getCompanyId())) {
                             baseCompanyChange.setEmployeeNum(list2.get(j).getEmployeeNum());

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

@@ -0,0 +1,114 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.DemFireReform;
+import com.usky.fire.domain.DemReformReview;
+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 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;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+/**
+ * <p>
+ * 消防整改数据表 服务实现类
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-02-24
+ */
+@Service
+public class DemFireReformServiceImpl extends AbstractCrudService<DemFireReformMapper, DemFireReform> implements DemFireReformService {
+
+    @Autowired
+    private DemReformReviewService demReformReviewService;
+
+    @Override
+    public CommonPage<DemFireReformVO> fireReformList(String companyName, String reformId, Integer companyType, Integer pageNum, Integer pageSize){
+        List<DemFireReformVO> list1 = baseMapper.fireReformList(companyName, reformId, companyType, null, null);
+        int total = 0;
+        if(list1.size() > 0){
+            total = list1.size();
+        }
+        int current = 0;
+        if(pageNum != null && pageSize > 0){
+            current = (pageNum-1)*pageSize;
+        }
+        List<DemFireReformVO> list = baseMapper.fireReformList(companyName, reformId, companyType, 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<>();
+        List<DemReformReviewVO> list1 = baseMapper.reformReview(reformId);
+        if(CollectionUtils.isNotEmpty(list1)){
+            for(int i=0;i<list1.size();i++){
+                Map<String, Object> map = new HashMap<>();
+                map.put("reformId", list1.get(i).getReFormId());
+                map.put("reformPart",list1.get(i).getReformPart());
+                map.put("sendTime",list1.get(i).getSendTime());
+                map.put("reformTime",list1.get(i).getReformTime());
+                map.put("reformPath1",list1.get(i).getReformPath1());
+                map.put("reformPath2",list1.get(i).getReformPath2());
+                map.put("reformPath3",list1.get(i).getReformPath3());
+                map.put("reformPath4",list1.get(i).getReformPath4());
+                map.put("reformPath5",list1.get(i).getReformPath5());
+                map.put("reviewTime",list1.get(i).getReviewTime());
+                list.add(map);
+            }
+        }
+
+        return list;
+    }
+
+    @Override
+    public void updateReformReview(UpdateReformReviewVO updateReformReviewVO){
+        LambdaQueryWrapper<DemFireReform> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DemFireReform::getId, updateReformReviewVO.getReFormId());
+        List<DemFireReform> list = this.list(queryWrapper);
+        DemFireReform demFireReform = new DemFireReform();
+        demFireReform.setId(list.get(0).getId());
+        demFireReform.setCompanyId(list.get(0).getCompanyId());
+        demFireReform.setCompanyCode(list.get(0).getCompanyCode());
+        demFireReform.setReformPart(list.get(0).getReformPart());
+        demFireReform.setSendTime(list.get(0).getSendTime());
+        demFireReform.setReformStatus(updateReformReviewVO.getReformStatus());
+        this.updateById(demFireReform);
+
+        LambdaQueryWrapper<DemReformReview> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.eq(DemReformReview::getReformId, updateReformReviewVO.getReFormId());
+        List<DemReformReview> list1 = demReformReviewService.list(queryWrapper1);
+        DemReformReview demReformReview = new DemReformReview();
+        demReformReview.setId(list1.get(0).getId());
+        demReformReview.setReformId(list1.get(0).getReformId());
+        demReformReview.setReformTime(list1.get(0).getReformTime());
+        demReformReview.setReformPerson(list1.get(0).getReformPerson());
+        demReformReview.setReformRemark(list1.get(0).getReformRemark());
+        demReformReview.setReformPath1(list1.get(0).getReformPath1());
+        demReformReview.setReformPath2(list1.get(0).getReformPath2());
+        demReformReview.setReformPath3(list1.get(0).getReformPath3());
+        demReformReview.setReformPath4(list1.get(0).getReformPath4());
+        demReformReview.setReformPath5(list1.get(0).getReformPath5());
+        demReformReview.setReviewTime(LocalDateTime.now());
+        demReformReview.setReviewPerson(SecurityUtils.getUsername());
+        demReformReview.setReviewRemark(updateReformReviewVO.getReviewRemark());
+        demReformReviewService.updateById(demReformReview);
+
+    }
+
+}

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

@@ -87,14 +87,14 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
                     companyList.add(null);
                 }
                 QueryWrapper1.in(DemInspectList::getCompanyId,companyList)
-                        .eq(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
-                        .eq(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
+                        .like(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
+                        .like(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
                         .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
                 QueryWrapper1.orderByDesc(DemInspectList::getId);
             }
             else{
-                QueryWrapper1.eq(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
-                        .eq(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
+                QueryWrapper1.like(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
+                        .like(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
                         .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
                 QueryWrapper1.orderByDesc(DemInspectList::getId);
             }
@@ -174,14 +174,14 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
                     companyList.add(null);
                 }
                 QueryWrapper1.in(DemInspectList::getCompanyId,companyList)
-                        .eq(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
-                        .eq(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
+                        .like(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
+                        .like(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
                         .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
                 QueryWrapper1.orderByDesc(DemInspectList::getId);
             }
             else{
-                QueryWrapper1.eq(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
-                        .eq(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
+                QueryWrapper1.like(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
+                        .like(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
                         .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
                 QueryWrapper1.orderByDesc(DemInspectList::getId).last("limit 1000");
             }

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

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DemReformReview;
+import com.usky.fire.mapper.DemReformReviewMapper;
+import com.usky.fire.service.DemReformReviewService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 整改审核数据表 服务实现类
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-02-27
+ */
+@Service
+public class DemReformReviewServiceImpl extends AbstractCrudService<DemReformReviewMapper, DemReformReview> implements DemReformReviewService {
+
+}

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

@@ -0,0 +1,73 @@
+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 DemFireReformVO  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 整改编号
+     */
+    private String reFormId;
+
+    /**
+     * 整改单位名称
+     */
+    private String companyName;
+
+    /**
+     * 单位类型
+     */
+    private String companyType;
+
+    /**
+     * 消防安全负责人
+     */
+    private String fireDutyName;
+
+    /**
+     * 消防安全管理人
+     */
+    private String fireManageName;
+
+    /**
+     * 单位属性
+     */
+    private Integer companyNature;
+
+    /**
+     * 整改单生成时间
+     */
+    private String createTime;
+
+    /**
+     * 整改状态（1 已接收、2 整改中、3 整改完成、4 审核不通过、5 审核通过）
+     */
+    private Integer reformStatus;
+
+    /**
+     * 状态变更时间
+     */
+    private String statusTime;
+}

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

@@ -0,0 +1,79 @@
+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 DemReformReviewVO  implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 整改编号
+     */
+    private String reFormId;
+
+    /**
+     * 整改说明
+     */
+    private String reformPart;
+
+    /**
+     * 发出时间
+     */
+    private String sendTime;
+
+    /**
+     * 整改时间
+     */
+    private String reformTime;
+
+    /**
+     * 整改相关图片或文件路径1
+     */
+    private String reformPath1;
+
+    /**
+     * 整改相关图片或文件路径2
+     */
+    private String reformPath2;
+
+    /**
+     * 整改相关图片或文件路径3
+     */
+    private String reformPath3;
+
+    /**
+     * 整改相关图片或文件路径4
+     */
+    private String reformPath4;
+
+    /**
+     * 整改相关图片或文件路径5
+     */
+    private String reformPath5;
+
+    /**
+     * 审核时间
+     */
+    private String reviewTime;
+
+}

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

@@ -0,0 +1,40 @@
+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-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UpdateReformReviewVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 整改单编号
+     */
+    private String reFormId;
+
+    /**
+     * 整改状态（4 审核不通过、5 审核通过）
+     */
+    private Integer reformStatus;
+
+    /**
+     * 审核备注
+     */
+    private String reviewRemark;
+
+}

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

@@ -0,0 +1,70 @@
+<?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="com.usky.fire.mapper.DemFireReformMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFireReform">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="company_code" property="companyCode" />
+        <result column="reform_part" property="reformPart" />
+        <result column="send_time" property="sendTime" />
+        <result column="reform_status" property="reformStatus" />
+    </resultMap>
+
+    <select id="fireReformList" resultType="com.usky.fire.service.vo.DemFireReformVO">
+        SELECT
+        a.id AS reFormId,
+        b.company_name AS companyName,
+        b.company_type AS companyType,
+        c.fire_duty_name AS fireDutyName,
+        c.fire_manage_name AS fireManageName,
+        b.company_nature AS companyNature,
+        DATE_FORMAT(a.send_time,'%Y-%m-%d %H:%i:%s') AS createTime,
+        a.reform_status AS reformStatus,
+        DATE_FORMAT((CASE a.reform_status WHEN '1' THEN a.send_time WHEN '2' THEN '' WHEN '3' THEN d.reform_time ELSE d.review_time END),'%Y-%m-%d %H:%i:%s') AS statusTime
+        FROM
+        dem_fire_reform AS a
+        LEFT JOIN base_company AS b ON a.company_id = b.company_id
+        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>
+            <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}),'%')
+            </if>
+            <if test="companyType != null and companyType != ''">
+                and b.company_type LIKE CONCAT(CONCAT('%', #{companyType}),'%')
+            </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_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,
+            b.reform_path1 AS reformPath1,
+            b.reform_path2 AS reformPath2,
+            b.reform_path3 AS reformPath3,
+            b.reform_path4 AS reformPath4,
+            b.reform_path5 AS reformPath5,
+            DATE_FORMAT(b.review_time,'%Y-%m-%d %H:%i:%s') AS reviewTime
+        FROM
+        dem_fire_reform AS a
+        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}),'%')
+            </if>
+        </where>
+    </select>
+
+
+</mapper>

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

@@ -0,0 +1,22 @@
+<?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="com.usky.fire.mapper.DemReformReviewMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemReformReview">
+        <id column="id" property="id" />
+        <result column="reform_id" property="reformId" />
+        <result column="reform_time" property="reformTime" />
+        <result column="reform_person" property="reformPerson" />
+        <result column="reform_remark" property="reformRemark" />
+        <result column="reform_path1" property="reformPath1" />
+        <result column="reform_path2" property="reformPath2" />
+        <result column="reform_path3" property="reformPath3" />
+        <result column="reform_path4" property="reformPath4" />
+        <result column="reform_path5" property="reformPath5" />
+        <result column="review_time" property="reviewTime" />
+        <result column="review_person" property="reviewPerson" />
+        <result column="review_remark" property="reviewRemark" />
+    </resultMap>
+
+</mapper>