Commit 7bdb2750 authored by 周昊's avatar 周昊

1、开发接口获取任务管理列表

parent 718fb005
...@@ -3,6 +3,8 @@ package com.censoft.censoftrongtong.controller; ...@@ -3,6 +3,8 @@ package com.censoft.censoftrongtong.controller;
import com.censoft.censoftrongtong.domain.LedgerBuilding; import com.censoft.censoftrongtong.domain.LedgerBuilding;
import com.censoft.censoftrongtong.domain.LedgerProject; import com.censoft.censoftrongtong.domain.LedgerProject;
import com.censoft.censoftrongtong.domain.RiskPlan; import com.censoft.censoftrongtong.domain.RiskPlan;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
import com.censoft.censoftrongtong.service.ILedgerBuildingService; import com.censoft.censoftrongtong.service.ILedgerBuildingService;
import com.censoft.censoftrongtong.service.ILedgerProjectService; import com.censoft.censoftrongtong.service.ILedgerProjectService;
import com.censoft.censoftrongtong.service.IRiskPlanService; import com.censoft.censoftrongtong.service.IRiskPlanService;
...@@ -13,8 +15,10 @@ import com.ruoyi.common.core.domain.entity.SysUser; ...@@ -13,8 +15,10 @@ import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
* 计划app端接口 * 计划app端接口
* *
...@@ -82,4 +86,22 @@ public class RiskPlanAppController extends BaseController { ...@@ -82,4 +86,22 @@ public class RiskPlanAppController extends BaseController {
riskPlan.setCreateDeptId(getDeptId()); riskPlan.setCreateDeptId(getDeptId());
return R.ok(riskPlanService.saveRiskPlan(riskPlan)); return R.ok(riskPlanService.saveRiskPlan(riskPlan));
} }
/**
* 任务管理列表
*
* @param status 状态
* @real_return {@link R<List<RiskPlanAppListDto>>}
*/
@GetMapping("/create/list")
public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByCreateUser(String status){
List<RiskPlanStatusType> statusList;
if ("running".equals(status)){
statusList = Arrays.asList(RiskPlanStatusType.WAIT_START,RiskPlanStatusType.RUNNING);
}else {
statusList = Arrays.asList(RiskPlanStatusType.WAIT_FINISH,RiskPlanStatusType.FINISH
,RiskPlanStatusType.WAIT_ADJUST,RiskPlanStatusType.REVOKE);
}
return R.ok(riskPlanService.getRiskPlanAppListDtoList(statusList,getUserId()));
}
} }
package com.censoft.censoftrongtong.domain.dto;
import lombok.Data;
import java.util.Date;
/**
* @author 周昊
* @desc ...
* @date 2023-06-27 14:45:45
*/
@Data
public class RiskPlanAppListDto {
/** id */
private Long id;
/** 计划名称 */
private String name;
/** 发起时间 */
private Date startTime;
/** 状态 */
private String status;
/** 处理人员 */
private String leaderUserName;
}
package com.censoft.censoftrongtong.mapper; package com.censoft.censoftrongtong.mapper;
import com.censoft.censoftrongtong.domain.RiskPlan; import com.censoft.censoftrongtong.domain.RiskPlan;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -59,4 +61,6 @@ public interface RiskPlanMapper ...@@ -59,4 +61,6 @@ public interface RiskPlanMapper
* @return 结果 * @return 结果
*/ */
public int deleteRiskPlanByIds(Long[] ids); public int deleteRiskPlanByIds(Long[] ids);
List<RiskPlanAppListDto> getRiskPlanAppListDtoList(@Param("statusStringList") List<String> statusStringList, @Param("userId") Long userId);
} }
package com.censoft.censoftrongtong.service; package com.censoft.censoftrongtong.service;
import com.censoft.censoftrongtong.domain.RiskPlan; import com.censoft.censoftrongtong.domain.RiskPlan;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
import java.util.List; import java.util.List;
...@@ -61,4 +63,6 @@ public interface IRiskPlanService ...@@ -61,4 +63,6 @@ public interface IRiskPlanService
public int deleteRiskPlanById(Long id); public int deleteRiskPlanById(Long id);
int saveRiskPlan(RiskPlan riskPlan); int saveRiskPlan(RiskPlan riskPlan);
List<RiskPlanAppListDto> getRiskPlanAppListDtoList(List<RiskPlanStatusType> statusList, Long userId);
} }
...@@ -4,9 +4,11 @@ import java.text.SimpleDateFormat; ...@@ -4,9 +4,11 @@ import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.stream.Collectors;
import com.censoft.censoftrongtong.domain.RiskPlan; import com.censoft.censoftrongtong.domain.RiskPlan;
import com.censoft.censoftrongtong.domain.RiskPlanTask; import com.censoft.censoftrongtong.domain.RiskPlanTask;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
import com.censoft.censoftrongtong.enums.RiskPlanStatusType; import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
import com.censoft.censoftrongtong.mapper.RiskPlanMapper; import com.censoft.censoftrongtong.mapper.RiskPlanMapper;
import com.censoft.censoftrongtong.service.IRiskPlanService; import com.censoft.censoftrongtong.service.IRiskPlanService;
...@@ -128,6 +130,21 @@ public class RiskPlanServiceImpl implements IRiskPlanService { ...@@ -128,6 +130,21 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
return i; return i;
} }
@Override
public List<RiskPlanAppListDto> getRiskPlanAppListDtoList(List<RiskPlanStatusType> statusList, Long userId) {
//枚举类转化为数据库存的状态值
List<String> statusStringList = statusList.stream()
.map(RiskPlanStatusType::getStatus)
.collect(Collectors.toList());
//查询并把状态值转化为状态名称
return riskPlanMapper.getRiskPlanAppListDtoList(statusStringList, userId).stream().map(dto -> {
String status = RiskPlanStatusType.getTitleByStatus(dto.getStatus());
dto.setStatus(status);
return dto;
}).collect(Collectors.toList());
}
private String getNo() { private String getNo() {
Random random = new Random(); Random random = new Random();
int randomNumber = random.nextInt(1000); // 生成0到999之间的随机数 int randomNumber = random.nextInt(1000); // 生成0到999之间的随机数
......
...@@ -51,7 +51,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -51,7 +51,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectRiskPlanVo"/> <include refid="selectRiskPlanVo"/>
where id = #{id} where id = #{id}
</select> </select>
<select id="getRiskPlanAppListDtoList"
resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto">
SELECT
rp.id,
rp.`name`,
rp.start_time AS startTime,
rp.`status`,
su.nick_name AS leaderUserName
FROM
risk_plan rp
LEFT JOIN sys_user su ON su.user_id = rp.leader_user_id
<where>
<if test="userId != null"> and rp.create_user_id = #{userId}</if>
<if test="statusStringList != null and statusStringList.size >0">
and rp.`status` in
<foreach collection="statusStringList" item="status" open="(" separator="," close=")">
#{status}
</foreach>
</if>
</where>
ORDER BY
rp.start_time DESC
</select>
<insert id="insertRiskPlan" parameterType="com.censoft.censoftrongtong.domain.RiskPlan" useGeneratedKeys="true" keyProperty="id"> <insert id="insertRiskPlan" parameterType="com.censoft.censoftrongtong.domain.RiskPlan" useGeneratedKeys="true" keyProperty="id">
insert into risk_plan insert into risk_plan
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
......
...@@ -126,6 +126,13 @@ ...@@ -126,6 +126,13 @@
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
</dependency> </dependency>
<!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.18</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment