Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-vue-master into develop

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanExistingListController.java

+package com.censoft.censoftrongtong.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
+import com.censoft.censoftrongtong.service.IRiskPlanExistingListService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 现有风险清单库Controller
+ *
+ * @author ruoyi
+ * @date 2023-07-31
+ */
+@RestController
+@RequestMapping("/system/risk/existing")
+public class RiskPlanExistingListController extends BaseController
+{
+    @Autowired
+    private IRiskPlanExistingListService riskPlanExistingListService;
+
+    /**
+     * 查询现有风险清单库列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:existing:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RiskPlanExistingList riskPlanExistingList)
+    {
+        startPage();
+        List<RiskPlanExistingList> list = riskPlanExistingListService.selectRiskPlanExistingListList(riskPlanExistingList);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出现有风险清单库列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:export')")
+    @Log(title = "现有风险清单库", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RiskPlanExistingList riskPlanExistingList)
+    {
+        List<RiskPlanExistingList> list = riskPlanExistingListService.selectRiskPlanExistingListList(riskPlanExistingList);
+        ExcelUtil<RiskPlanExistingList> util = new ExcelUtil<RiskPlanExistingList>(RiskPlanExistingList.class);
+        util.exportExcel(response, list, "现有风险清单库数据");
+    }
+
+    /**
+     * 获取现有风险清单库详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(riskPlanExistingListService.selectRiskPlanExistingListById(id));
+    }
+
+    /**
+     * 新增现有风险清单库
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:add')")
+    @Log(title = "现有风险清单库", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RiskPlanExistingList riskPlanExistingList)
+    {
+        return toAjax(riskPlanExistingListService.insertRiskPlanExistingList(riskPlanExistingList));
+    }
+
+    /**
+     * 修改现有风险清单库
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:edit')")
+    @Log(title = "现有风险清单库", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody RiskPlanExistingList riskPlanExistingList)
+    {
+        return toAjax(riskPlanExistingListService.updateRiskPlanExistingList(riskPlanExistingList));
+    }
+
+    /**
+     * 删除现有风险清单库
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:remove')")
+    @Log(title = "现有风险清单库", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(riskPlanExistingListService.deleteRiskPlanExistingListByIds(ids));
+    }
+}
+

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanExistingList.java

@@ -154,5 +154,37 @@ public class RiskPlanExistingList extends BaseEntity {
     @TableField("del_flag")
     private String delFlag;
 
+    /**
+     * 楼栋ID
+     */
+    @TableField(exist = false)
+    private String buildingId;
+    /**
+     * 楼栋名称
+     */
+    @TableField(exist = false)
+    private String buildingName;
+    /**
+     * 楼层ID
+     */
+    @TableField(exist = false)
+    private String floorId;
+    /**
+     * 楼层名称
+     */
+    @TableField(exist = false)
+    private String floorName;
+
+    /**
+     * 用户名
+     */
+    @TableField(exist = false)
+    private String userName;
+    /**
+     * 房间名称
+     */
+    @TableField(exist = false)
+    private String roomName;
+
 
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppExistingListDetailsDto.java

 package com.censoft.censoftrongtong.domain.dto;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.system.domain.SysUploadFile;
 import lombok.Data;
 
@@ -119,4 +120,8 @@ public class RiskPlanAppExistingListDetailsDto {
 
     /** 参考依据 */
     private String referenceBasis;
+
+    /** 参考依据 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createTime;
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppInherentListDetailsDto.java

@@ -2,9 +2,11 @@ package com.censoft.censoftrongtong.domain.dto;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.system.domain.SysUploadFile;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -145,4 +147,10 @@ public class RiskPlanAppInherentListDetailsDto {
 
     /** 参考依据 */
     private String referenceBasis;
+
+    /**
+     * 评估时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanExistingListMapper.java

@@ -6,6 +6,8 @@ import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 现有风险清单库Mapper接口
  *
@@ -14,6 +16,54 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface RiskPlanExistingListMapper extends BaseMapper<RiskPlanExistingList> {
 
+    /**
+     * 查询现有风险清单库
+     *
+     * @param id 现有风险清单库主键
+     * @return 现有风险清单库
+     */
+    public RiskPlanExistingList selectRiskPlanExistingListById(Long id);
+
+    /**
+     * 查询现有风险清单库列表
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 现有风险清单库集合
+     */
+    public List<RiskPlanExistingList> selectRiskPlanExistingListList(RiskPlanExistingList riskPlanExistingList);
+
+    /**
+     * 新增现有风险清单库
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 结果
+     */
+    public int insertRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList);
+
+    /**
+     * 修改现有风险清单库
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 结果
+     */
+    public int updateRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList);
+
+    /**
+     * 删除现有风险清单库
+     *
+     * @param id 现有风险清单库主键
+     * @return 结果
+     */
+    public int deleteRiskPlanExistingListById(Long id);
+
+    /**
+     * 批量删除现有风险清单库
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRiskPlanExistingListByIds(Long[] ids);
+
     RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(@Param("existingId") Long existingId);
 
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanExistingListService.java

@@ -17,6 +17,55 @@ import java.util.List;
  */
 public interface IRiskPlanExistingListService  extends IService<RiskPlanExistingList>
 {
+
+    /**
+     * 查询现有风险清单库
+     *
+     * @param id 现有风险清单库主键
+     * @return 现有风险清单库
+     */
+    public RiskPlanExistingList selectRiskPlanExistingListById(Long id);
+
+    /**
+     * 查询现有风险清单库列表
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 现有风险清单库集合
+     */
+    public List<RiskPlanExistingList> selectRiskPlanExistingListList(RiskPlanExistingList riskPlanExistingList);
+
+    /**
+     * 新增现有风险清单库
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 结果
+     */
+    public int insertRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList);
+
+    /**
+     * 修改现有风险清单库
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 结果
+     */
+    public int updateRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList);
+
+    /**
+     * 批量删除现有风险清单库
+     *
+     * @param ids 需要删除的现有风险清单库主键集合
+     * @return 结果
+     */
+    public int deleteRiskPlanExistingListByIds(Long[] ids);
+
+    /**
+     * 删除现有风险清单库信息
+     *
+     * @param id 现有风险清单库主键
+     * @return 结果
+     */
+    public int deleteRiskPlanExistingListById(Long id);
+
     Boolean saveRiskExistingListSaveDto(RiskExistingListSaveDto saveDto);
     RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(Long existingId);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanExistingListServiceImpl.java

@@ -37,6 +37,81 @@ public class RiskPlanExistingListServiceImpl
     @Resource
     private ISysUploadFileService uploadFileService;
 
+
+    /**
+     * 查询现有风险清单库
+     *
+     * @param id 现有风险清单库主键
+     * @return 现有风险清单库
+     */
+    @Override
+    public RiskPlanExistingList selectRiskPlanExistingListById(Long id)
+    {
+        return riskPlanExistingListMapper.selectRiskPlanExistingListById(id);
+    }
+
+    /**
+     * 查询现有风险清单库列表
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 现有风险清单库
+     */
+    @Override
+    public List<RiskPlanExistingList> selectRiskPlanExistingListList(RiskPlanExistingList riskPlanExistingList)
+    {
+        return riskPlanExistingListMapper.selectRiskPlanExistingListList(riskPlanExistingList);
+    }
+
+    /**
+     * 新增现有风险清单库
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 结果
+     */
+    @Override
+    public int insertRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList)
+    {
+        riskPlanExistingList.setCreateTime(DateUtils.getNowDate());
+        return riskPlanExistingListMapper.insertRiskPlanExistingList(riskPlanExistingList);
+    }
+
+    /**
+     * 修改现有风险清单库
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 结果
+     */
+    @Override
+    public int updateRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList)
+    {
+        riskPlanExistingList.setUpdateTime(DateUtils.getNowDate());
+        return riskPlanExistingListMapper.updateRiskPlanExistingList(riskPlanExistingList);
+    }
+
+    /**
+     * 批量删除现有风险清单库
+     *
+     * @param ids 需要删除的现有风险清单库主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRiskPlanExistingListByIds(Long[] ids)
+    {
+        return riskPlanExistingListMapper.deleteRiskPlanExistingListByIds(ids);
+    }
+
+    /**
+     * 删除现有风险清单库信息
+     *
+     * @param id 现有风险清单库主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRiskPlanExistingListById(Long id)
+    {
+        return riskPlanExistingListMapper.deleteRiskPlanExistingListById(id);
+    }
+
     @Override
     public RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(Long existingId) {
         RiskPlanAppExistingListDetailsDto dto =  riskPlanExistingListMapper.getRiskPlanAppExistingListDetailsDtoByExistingId(existingId);

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
@@ -17,6 +18,7 @@ import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 import com.censoft.censoftrongtong.mapper.RiskPlanMapper;
 import com.censoft.censoftrongtong.service.*;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

censoft-rongtong/src/main/resources/mapper/system/RiskPlanInherentListMapper.xml

@@ -331,7 +331,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rpil.major_hazard_source_description AS majorHazardSourceDescription,
             rpil.measures_emergency AS measuresEmergency,
             rpil.measures_emergency_file_ids AS measuresEmergencyFileIds,
-            rpil.reference_basis AS referenceBasis
+            rpil.reference_basis AS referenceBasis,
+            rpil.create_time
+
         FROM
             risk_plan_inherent_list rpil
                 LEFT JOIN sys_user su ON su.user_id = rpil.user_id