Merge branch 'xjchen' into 'develop'

任务台账及详情20230724

See merge request !19

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

@@ -11,6 +11,8 @@ import cn.hutool.core.convert.Convert;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.dto.RiskInherentListExportDto;
 import com.censoft.censoftrongtong.domain.dto.RiskNotificationExportWordDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppTaskDetailsDto;
+import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 import com.censoft.censoftrongtong.service.IRiskPlanInherentListService;
 import com.censoft.censoftrongtong.service.IRiskPlanService;
 import com.ruoyi.common.utils.WordUtil;
@@ -50,27 +52,31 @@ public class RiskPlanController extends BaseController
     /**
      * 查询风险计划列表
      */
-    @PreAuthorize("@ss.hasPermi('system:riskPlan:list')")
     @GetMapping("/list")
     public TableDataInfo list(RiskPlan riskPlan)
     {
         startPage();
-        List<RiskPlan> list = riskPlanService.selectRiskPlanList(riskPlan);
+        List<RiskPlanAppTaskDetailsDto> list = riskPlanService.selectRiskPlanList(riskPlan);
+        list.forEach(dto -> {
+            dto.setStatusName(RiskPlanStatusType.getTitleByStatus(dto.getStatus()).getTitle());
+        });
+
+
         return getDataTable(list);
     }
 
     /**
      * 导出风险计划列表
      */
-    @PreAuthorize("@ss.hasPermi('system:riskPlan:export')")
-    @Log(title = "风险计划", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, RiskPlan riskPlan)
-    {
-        List<RiskPlan> list = riskPlanService.selectRiskPlanList(riskPlan);
-        ExcelUtil<RiskPlan> util = new ExcelUtil<RiskPlan>(RiskPlan.class);
-        util.exportExcel(response, list, "风险计划数据");
-    }
+    //@PreAuthorize("@ss.hasPermi('system:riskPlan:export')")
+    //@Log(title = "风险计划", businessType = BusinessType.EXPORT)
+    //@PostMapping("/export")
+    //public void export(HttpServletResponse response, RiskPlan riskPlan)
+    //{
+    //    List<RiskPlan> list = riskPlanService.selectRiskPlanList(riskPlan);
+    //    ExcelUtil<RiskPlan> util = new ExcelUtil<RiskPlan>(RiskPlan.class);
+    //    util.exportExcel(response, list, "风险计划数据");
+    //}
 
     /**
      * 获取风险计划详细信息

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

 package com.censoft.censoftrongtong.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,6 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-06-26
  */
+@Data
 public class RiskPlan extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -74,163 +78,11 @@ public class RiskPlan extends BaseEntity
     @Excel(name = "状态")
     private String status;
 
+
     /** 删除标志（0代表存在 1代表删除） */
     private String delFlag;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setNo(String no) 
-    {
-        this.no = no;
-    }
-
-    public String getNo() 
-    {
-        return no;
-    }
-    public void setProjectId(Long projectId) 
-    {
-        this.projectId = projectId;
-    }
-
-    public Long getProjectId() 
-    {
-        return projectId;
-    }
-    public void setBuildingIds(String buildingIds) 
-    {
-        this.buildingIds = buildingIds;
-    }
-
-    public String getBuildingIds() 
-    {
-        return buildingIds;
-    }
-    public void setCreateUserId(Long createUserId) 
-    {
-        this.createUserId = createUserId;
-    }
-
-    public Long getCreateUserId() 
-    {
-        return createUserId;
-    }
-    public void setCreateDeptId(Long createDeptId) 
-    {
-        this.createDeptId = createDeptId;
-    }
-
-    public Long getCreateDeptId() 
-    {
-        return createDeptId;
-    }
-    public void setLeaderUserId(Long leaderUserId) 
-    {
-        this.leaderUserId = leaderUserId;
-    }
-
-    public Long getLeaderUserId() 
-    {
-        return leaderUserId;
-    }
-    public void setWorkUserIds(String workUserIds) 
-    {
-        this.workUserIds = workUserIds;
-    }
-
-    public String getWorkUserIds() 
-    {
-        return workUserIds;
-    }
-    public void setStartTime(Date startTime) 
-    {
-        this.startTime = startTime;
-    }
-
-    public Date getStartTime() 
-    {
-        return startTime;
-    }
-    public void setEndTime(Date endTime) 
-    {
-        this.endTime = endTime;
-    }
-
-    public Date getEndTime() 
-    {
-        return endTime;
-    }
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
-
-    public String getStatus() 
-    {
-        return status;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    public Long getApproveUserId() {
-        return approveUserId;
-    }
-
-    public void setApproveUserId(Long approveUserId) {
-        this.approveUserId = approveUserId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("no", getNo())
-            .append("projectId", getProjectId())
-            .append("buildingIds", getBuildingIds())
-            .append("createUserId", getCreateUserId())
-            .append("createDeptId", getCreateDeptId())
-            .append("leaderUserId", getLeaderUserId())
-            .append("workUserIds", getWorkUserIds())
-            .append("startTime", getStartTime())
-            .append("endTime", getEndTime())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
+
+
+
 }

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

 package com.censoft.censoftrongtong.domain.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -17,8 +18,9 @@ public class RiskPlanAppApproveListDto {
     private Long taskId;
 
     /**
-     * 开始时间
+     * 操作时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /**

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

 package com.censoft.censoftrongtong.domain.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.web.domain.server.SysFile;
 import lombok.Data;
 
@@ -32,9 +33,11 @@ public class RiskPlanAppDetailsDto {
     private String status;
 
     /** 发起时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
 
     /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
 
     /** 任务流程节点 */

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

@@ -36,6 +36,7 @@ public class RiskPlanAppTaskDetailsDto {
     private String createDeptName;
 
     /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /** 项目id */
@@ -72,12 +73,18 @@ public class RiskPlanAppTaskDetailsDto {
     private String workUserNames;
 
     /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
 
     /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
     /**
      * 状态
      */
     private String status;
+    /**
+     * 状态名称
+     */
+    private String statusName;
 }

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

@@ -30,7 +30,7 @@ public interface RiskPlanMapper
      * @param riskPlan 风险计划
      * @return 风险计划集合
      */
-    public List<RiskPlan> selectRiskPlanList(RiskPlan riskPlan);
+    public List<RiskPlanAppTaskDetailsDto> selectRiskPlanList(RiskPlan riskPlan);
 
     /**
      * 新增风险计划

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

@@ -5,6 +5,7 @@ import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppApproveDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppTaskDetailsDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 
 import java.util.List;
@@ -31,7 +32,7 @@ public interface IRiskPlanService
      * @param riskPlan 风险计划
      * @return 风险计划集合
      */
-    public List<RiskPlan> selectRiskPlanList(RiskPlan riskPlan);
+    public List<RiskPlanAppTaskDetailsDto> selectRiskPlanList(RiskPlan riskPlan);
 
     /**
      * 新增风险计划

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

@@ -11,6 +11,7 @@ import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppApproveDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppTaskDetailsDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 import com.censoft.censoftrongtong.mapper.RiskPlanMapper;
 import com.censoft.censoftrongtong.service.*;
@@ -61,7 +62,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
      * @return 风险计划
      */
     @Override
-    public List<RiskPlan> selectRiskPlanList(RiskPlan riskPlan) {
+    public List<RiskPlanAppTaskDetailsDto> selectRiskPlanList(RiskPlan riskPlan) {
         return riskPlanMapper.selectRiskPlanList(riskPlan);
     }