Skip to content

R
RuoYi-Vue-master
Commit b27bc19a authored by 周昊's avatar 周昊
Browse files
Options

1、开发接口任务创建

parent 80e253d0
Show whitespace changes
Inline Side-by-side
Showing with 175 additions and 61 deletions
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java
View file @ b27bc19a
......@@ -2,15 +2,14 @@ package com.censoft.censoftrongtong.controller;
import com.censoft.censoftrongtong.domain.LedgerBuilding;
import com.censoft.censoftrongtong.domain.LedgerProject;
import com.censoft.censoftrongtong.domain.RiskPlan;
import com.censoft.censoftrongtong.service.ILedgerBuildingService;
import com.censoft.censoftrongtong.service.ILedgerProjectService;
import com.censoft.censoftrongtong.service.IRiskPlanService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
......@@ -32,6 +31,9 @@ public class RiskPlanAppController extends BaseController {
@Resource
private ILedgerBuildingService ledgerBuildingService;
@Resource
private IRiskPlanService riskPlanService;
/**
* 获取自身部门及以下的项目
*
......@@ -44,14 +46,28 @@ public class RiskPlanAppController extends BaseController {
ledgerProject.setDeptId(getLoginUser().getDeptId());
return R.ok(ledgerProjectService.getProjectListByDeptId(ledgerProject));
}
/**
* 获取项目下的楼宇
*
* @param projectId 项目id
* @real_return {@link R<List<LedgerProject>>}
* @real_return {@link R<List<LedgerBuilding>>}
*/
@GetMapping("/building/list/{projectId}")
public R<List<LedgerBuilding>> getBuildingListByProjectId(@PathVariable Long projectId){
return R.ok(ledgerBuildingService.getBuildingListByProjectId(projectId));
}
/**
* 保存计划
*
* @param riskPlan 项目id
* @real_return {@link R<List<LedgerProject>>}
*/
@PostMapping()
public R<Integer> saveRiskPlan(@RequestBody RiskPlan riskPlan){
riskPlan.setCreateUserId(getUserId());
riskPlan.setCreateDeptId(getDeptId());
return R.ok(riskPlanService.saveRiskPlan(riskPlan));
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlan.java
View file @ b27bc19a
......@@ -52,6 +52,10 @@ public class RiskPlan extends BaseEntity
@Excel(name = "执行人员ids")
private String workUserIds;
/** 审批人id */
@Excel(name = "审批人id")
private Long approveUserId;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
......@@ -187,6 +191,14 @@ public class RiskPlan extends BaseEntity
return delFlag;
}
public Long getApproveUserId() {
return approveUserId;
}
public void setApproveUserId(Long approveUserId) {
this.approveUserId = approveUserId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanTask.java
View file @ b27bc19a
......@@ -24,6 +24,10 @@ public class RiskPlanTask extends BaseEntity
@Excel(name = "计划id")
private Long planId;
/** 任务状态key值 */
@Excel(name = "任务状态key值")
private String taskKey;
/** 任务名称 */
@Excel(name = "任务名称")
private String taskName;
......@@ -36,14 +40,6 @@ public class RiskPlanTask extends BaseEntity
@Excel(name = "经办意见")
private String taskOpinion;
/** 审批单位 */
@Excel(name = "审批单位")
private Long approvalDeptId;
/** 审批角色 */
@Excel(name = "审批角色")
private String approvalRoleKey;
/** 状态 */
@Excel(name = "状态")
private String status;
......@@ -107,24 +103,15 @@ public class RiskPlanTask extends BaseEntity
{
return taskOpinion;
}
public void setApprovalDeptId(Long approvalDeptId)
{
this.approvalDeptId = approvalDeptId;
}
public Long getApprovalDeptId()
{
return approvalDeptId;
}
public void setApprovalRoleKey(String approvalRoleKey)
{
this.approvalRoleKey = approvalRoleKey;
public String getTaskKey() {
return taskKey;
}
public String getApprovalRoleKey()
{
return approvalRoleKey;
public void setTaskKey(String taskKey) {
this.taskKey = taskKey;
}
public void setStatus(String status)
{
this.status = status;
......@@ -170,8 +157,6 @@ public class RiskPlanTask extends BaseEntity
.append("taskName", getTaskName())
.append("taskResult", getTaskResult())
.append("taskOpinion", getTaskOpinion())
.append("approvalDeptId", getApprovalDeptId())
.append("approvalRoleKey", getApprovalRoleKey())
.append("status", getStatus())
.append("approvalUserId", getApprovalUserId())
.append("startTime", getStartTime())
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/enums/RiskPlanStatusType.java 0 → 100644
View file @ b27bc19a
package com.censoft.censoftrongtong.enums;
public enum RiskPlanStatusType {
/**
* 任务发起
*/
WAIT_START("WAIT_START"),
/**
* 风险评估
*/
RUNNING("RUNNING"),
/**
* 评估审核
*/
WAIT_FINISH("WAIT_APPROVE"),
/**
* 项目完成
*/
FINISH("FINISH"),
/**
* 已退回
*/
WAIT_ADJUST("WAIT_RETURN"),
/**
* 已撤销
*/
REVOKE("REVOKE");
private final String status;
RiskPlanStatusType(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public static String getTitleByStatus(String status){
switch (status){
case "WAIT_START":
return "任务发起";
case "RUNNING":
return "风险评估";
case "WAIT_APPROVE":
return "评估审核";
case "FINISH":
return "项目完成";
case "WAIT_RETURN":
return "已退回";
case "REVOKE":
return "已撤销";
}
return "";
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanService.java
View file @ b27bc19a
......@@ -59,4 +59,6 @@ public interface IRiskPlanService
* @return 结果
*/
public int deleteRiskPlanById(Long id);
int saveRiskPlan(RiskPlan riskPlan);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java
View file @ b27bc19a
package com.censoft.censoftrongtong.service.impl;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Random;
import com.censoft.censoftrongtong.domain.RiskPlan;
import com.censoft.censoftrongtong.domain.RiskPlanTask;
import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
import com.censoft.censoftrongtong.mapper.RiskPlanMapper;
import com.censoft.censoftrongtong.service.IRiskPlanService;
import com.censoft.censoftrongtong.service.IRiskPlanTaskService;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* 风险计划Service业务层处理
*
......@@ -16,11 +24,13 @@ import org.springframework.stereotype.Service;
* @date 2023-06-26
*/
@Service
public class RiskPlanServiceImpl implements IRiskPlanService
{
public class RiskPlanServiceImpl implements IRiskPlanService {
@Autowired
private RiskPlanMapper riskPlanMapper;
@Resource
private IRiskPlanTaskService riskPlanTaskService;
/**
* 查询风险计划
*
......@@ -28,8 +38,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService
* @return 风险计划
*/
@Override
public RiskPlan selectRiskPlanById(Long id)
{
public RiskPlan selectRiskPlanById(Long id) {
return riskPlanMapper.selectRiskPlanById(id);
}
......@@ -40,8 +49,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService
* @return 风险计划
*/
@Override
public List<RiskPlan> selectRiskPlanList(RiskPlan riskPlan)
{
public List<RiskPlan> selectRiskPlanList(RiskPlan riskPlan) {
return riskPlanMapper.selectRiskPlanList(riskPlan);
}
......@@ -52,8 +60,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService
* @return 结果
*/
@Override
public int insertRiskPlan(RiskPlan riskPlan)
{
public int insertRiskPlan(RiskPlan riskPlan) {
riskPlan.setCreateTime(DateUtils.getNowDate());
return riskPlanMapper.insertRiskPlan(riskPlan);
}
......@@ -65,8 +72,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService
* @return 结果
*/
@Override
public int updateRiskPlan(RiskPlan riskPlan)
{
public int updateRiskPlan(RiskPlan riskPlan) {
riskPlan.setUpdateTime(DateUtils.getNowDate());
return riskPlanMapper.updateRiskPlan(riskPlan);
}
......@@ -78,8 +84,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService
* @return 结果
*/
@Override
public int deleteRiskPlanByIds(Long[] ids)
{
public int deleteRiskPlanByIds(Long[] ids) {
return riskPlanMapper.deleteRiskPlanByIds(ids);
}
......@@ -90,8 +95,43 @@ public class RiskPlanServiceImpl implements IRiskPlanService
* @return 结果
*/
@Override
public int deleteRiskPlanById(Long id)
{
public int deleteRiskPlanById(Long id) {
return riskPlanMapper.deleteRiskPlanById(id);
}
@Override
public int saveRiskPlan(RiskPlan riskPlan) {
//插入主表
riskPlan.setNo(getNo());
riskPlan.setStatus(RiskPlanStatusType.RUNNING.getStatus());
int i = insertRiskPlan(riskPlan);
//插入任务表 已完成任务发起
RiskPlanTask riskPlanTask = new RiskPlanTask();
riskPlanTask.setPlanId(riskPlan.getId());
riskPlanTask.setTaskKey(RiskPlanStatusType.WAIT_START.getStatus());
riskPlanTask.setTaskName(RiskPlanStatusType.getTitleByStatus(RiskPlanStatusType.WAIT_START.getStatus()));
riskPlanTask.setStatus("completed");
riskPlanTask.setStartTime(new Date());
riskPlanTask.setCompletedTime(new Date());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask);
//插入任务表 待执行风险评估
RiskPlanTask riskPlanTask1 = new RiskPlanTask();
riskPlanTask1.setPlanId(riskPlan.getId());
riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
riskPlanTask1.setTaskKey(RiskPlanStatusType.RUNNING.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.getTitleByStatus(RiskPlanStatusType.RUNNING.getStatus()));
riskPlanTask1.setStatus("running");
riskPlanTask1.setStartTime(new Date());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
return i;
}
private String getNo() {
Random random = new Random();
int randomNumber = random.nextInt(1000); // 生成0到999之间的随机数
String formattedNumber = String.format("%03d", randomNumber); // 格式化为三位数，不足三位前面补0
return DateUtils.dateTimeNow() + formattedNumber;
}
}
censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml
View file @ b27bc19a
......@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createDeptId" column="create_dept_id" />
<result property="leaderUserId" column="leader_user_id" />
<result property="workUserIds" column="work_user_ids" />
<result property="approveUserId" column="approve_user_id" />
<result property="startTime" column="start_time" />
<result property="endTime" column="end_time" />
<result property="status" column="status" />
......@@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectRiskPlanVo">
select id, name, no, project_id, building_ids, create_user_id, create_dept_id, leader_user_id, work_user_ids, start_time, end_time, status, del_flag, create_by, create_time, update_by, update_time from risk_plan
select id, name, no, project_id, building_ids, create_user_id, create_dept_id, leader_user_id, work_user_ids,approve_user_id, start_time, end_time, status, del_flag, create_by, create_time, update_by, update_time from risk_plan
</sql>
<select id="selectRiskPlanList" parameterType="com.censoft.censoftrongtong.domain.RiskPlan" resultMap="RiskPlanResult">
......@@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createDeptId != null "> and create_dept_id = #{createDeptId}</if>
<if test="leaderUserId != null "> and leader_user_id = #{leaderUserId}</if>
<if test="workUserIds != null and workUserIds != ''"> and work_user_ids = #{workUserIds}</if>
<if test="approveUserId != null "> and approve_user_id = #{approveUserId}</if>
<if test="startTime != null "> and start_time = #{startTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
......@@ -61,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createDeptId != null">create_dept_id,</if>
<if test="leaderUserId != null">leader_user_id,</if>
<if test="workUserIds != null">work_user_ids,</if>
<if test="approveUserId != null">approve_user_id,</if>
<if test="startTime != null">start_time,</if>
<if test="endTime != null">end_time,</if>
<if test="status != null">status,</if>
......@@ -79,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createDeptId != null">#{createDeptId},</if>
<if test="leaderUserId != null">#{leaderUserId},</if>
<if test="workUserIds != null">#{workUserIds},</if>
<if test="approveUserId != null">#{approveUserId},</if>
<if test="startTime != null">#{startTime},</if>
<if test="endTime != null">#{endTime},</if>
<if test="status != null">#{status},</if>
......@@ -101,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createDeptId != null">create_dept_id = #{createDeptId},</if>
<if test="leaderUserId != null">leader_user_id = #{leaderUserId},</if>
<if test="workUserIds != null">work_user_ids = #{workUserIds},</if>
<if test="approveUserId != null">approve_user_id = #{approveUserId},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="endTime != null">end_time = #{endTime},</if>
<if test="status != null">status = #{status},</if>
......
censoft-rongtong/src/main/resources/mapper/system/RiskPlanTaskMapper.xml
View file @ b27bc19a
......@@ -7,11 +7,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="com.censoft.censoftrongtong.domain.RiskPlanTask" id="RiskPlanTaskResult">
<result property="id" column="id" />
<result property="planId" column="plan_id" />
<result property="taskKey" column="task_key" />
<result property="taskName" column="task_name" />
<result property="taskResult" column="task_result" />
<result property="taskOpinion" column="task_opinion" />
<result property="approvalDeptId" column="approval_dept_id" />
<result property="approvalRoleKey" column="approval_role_key" />
<result property="status" column="status" />
<result property="approvalUserId" column="approval_user_id" />
<result property="startTime" column="start_time" />
......@@ -19,18 +18,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectRiskPlanTaskVo">
select id, plan_id, task_name, task_result, task_opinion, approval_dept_id, approval_role_key, status, approval_user_id, start_time, completed_time from risk_plan_task
select id, plan_id, task_key, task_name, task_result, task_opinion, status, approval_user_id, start_time, completed_time from risk_plan_task
</sql>
<select id="selectRiskPlanTaskList" parameterType="com.censoft.censoftrongtong.domain.RiskPlanTask" resultMap="RiskPlanTaskResult">
<include refid="selectRiskPlanTaskVo"/>
<where>
<if test="planId != null "> and plan_id = #{planId}</if>
<if test="taskKey != null and taskKey != ''"> and task_key = #{taskKey}</if>
<if test="taskName != null and taskName != ''"> and task_name like concat('%', #{taskName}, '%')</if>
<if test="taskResult != null and taskResult != ''"> and task_result = #{taskResult}</if>
<if test="taskOpinion != null and taskOpinion != ''"> and task_opinion = #{taskOpinion}</if>
<if test="approvalDeptId != null "> and approval_dept_id = #{approvalDeptId}</if>
<if test="approvalRoleKey != null and approvalRoleKey != ''"> and approval_role_key = #{approvalRoleKey}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="approvalUserId != null "> and approval_user_id = #{approvalUserId}</if>
<if test="startTime != null "> and start_time = #{startTime}</if>
......@@ -47,11 +45,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into risk_plan_task
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="planId != null">plan_id,</if>
<if test="taskKey != null">task_key,</if>
<if test="taskName != null">task_name,</if>
<if test="taskResult != null">task_result,</if>
<if test="taskOpinion != null">task_opinion,</if>
<if test="approvalDeptId != null">approval_dept_id,</if>
<if test="approvalRoleKey != null">approval_role_key,</if>
<if test="status != null">status,</if>
<if test="approvalUserId != null">approval_user_id,</if>
<if test="startTime != null">start_time,</if>
......@@ -59,11 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="planId != null">#{planId},</if>
<if test="taskKey != null">#{taskKey},</if>
<if test="taskName != null">#{taskName},</if>
<if test="taskResult != null">#{taskResult},</if>
<if test="taskOpinion != null">#{taskOpinion},</if>
<if test="approvalDeptId != null">#{approvalDeptId},</if>
<if test="approvalRoleKey != null">#{approvalRoleKey},</if>
<if test="status != null">#{status},</if>
<if test="approvalUserId != null">#{approvalUserId},</if>
<if test="startTime != null">#{startTime},</if>
......@@ -75,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update risk_plan_task
<trim prefix="SET" suffixOverrides=",">
<if test="planId != null">plan_id = #{planId},</if>
<if test="taskKey != null">task_key = #{taskKey},</if>
<if test="taskName != null">task_name = #{taskName},</if>
<if test="taskResult != null">task_result = #{taskResult},</if>
<if test="taskOpinion != null">task_opinion = #{taskOpinion},</if>
......
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