Skip to content

R
RuoYi-Vue-master
Commit 564a64b5 authored by 陈晓晋's avatar 陈晓晋
Browse files
Options

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

parents 39a9ee5b 18935870
Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 33 deletions
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/LedgerRoomController.java
View file @ 564a64b5
......@@ -45,6 +45,7 @@ public class LedgerRoomController extends BaseController
public TableDataInfo list(LedgerRoom ledgerRoom)
{
QueryWrapper<LedgerRoom> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("floor_id",ledgerRoom.getFloorId()).eq("del_flag","0");
startPage();
List<LedgerRoom> list = ledgerRoomService.list(queryWrapper);
return getDataTable(list);
......@@ -79,7 +80,7 @@ public class LedgerRoomController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('system:ledgerRoom:add')")
@Log(title = "基础数据-楼层", businessType = BusinessType.INSERT)
@PostMapping
@PostMapping(value = "/save")
public AjaxResult add(@RequestBody LedgerRoom ledgerRoom)
{
return toAjax(ledgerRoomService.save(ledgerRoom));
......@@ -90,7 +91,7 @@ public class LedgerRoomController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('system:ledgerRoom:edit')")
@Log(title = "基础数据-楼层", businessType = BusinessType.UPDATE)
@PutMapping
@PostMapping("/update")
public AjaxResult edit(@RequestBody LedgerRoom ledgerRoom)
{
return toAjax(ledgerRoomService.updateById(ledgerRoom));
......@@ -101,10 +102,12 @@ public class LedgerRoomController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('system:ledgerRoom:remove')")
@Log(title = "基础数据-楼层", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@PostMapping("/delete/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
ledgerRoomService.removeBatchByIds(Arrays.asList(ids));
QueryWrapper<LedgerRoom> queryWrapper = new QueryWrapper<>();
queryWrapper.in("id", Arrays.asList(ids));
ledgerRoomService.remove(queryWrapper);
return AjaxResult.success();
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java
View file @ 564a64b5
......@@ -197,11 +197,34 @@ public class RiskPlanAppController extends BaseController {
/**
* 风险评估列表
*
* @param status 状态 running 待执行，finish 已执行，return 已退回
* @real_return {@link R<List<RiskPlanAppListDto>>}
*/
@GetMapping("/task/list")
public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByLeaderUser() {
return R.ok(riskPlanService.getRiskPlanAppListDtoList(null, null, getUserId(),null));
public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByLeaderUser(String status) {
List<RiskPlanStatusType> statusList = new ArrayList<>();
String state = "";
if ("running".equals(status)) {
statusList = Arrays.asList(RiskPlanStatusType.CREATE_TASK,RiskPlanStatusType.WAIT_START,RiskPlanStatusType.RUNNING);
state = "待执行";
} else if ("finish".equals(status)) {
statusList = Arrays.asList(RiskPlanStatusType.WAIT_LEADER_APPROVE,RiskPlanStatusType.WAIT_APPROVE
,RiskPlanStatusType.PROJECT_REPORT,RiskPlanStatusType.FINISH);
state = "已执行";
} else if ("return".equals(status)) {
statusList = Arrays.asList(RiskPlanStatusType.WAIT_RETURN);
state = "已退回";
}
List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList, null, null,getUserId());
String finalState = state;
list.forEach(dto -> {
Long finishNumber = riskPlanUserBuildingService.countStatusByPlanIdAndStatus(dto.getId(), "finish");
Long totalNumber = riskPlanUserBuildingService.countStatusByPlanIdAndStatus(dto.getId(), null);
dto.setState(finalState+"("+finishNumber+"/"+totalNumber+")");
});
return R.ok(list);
}
/**
......@@ -401,7 +424,7 @@ public class RiskPlanAppController extends BaseController {
* @param buildingId 楼宇id
* @real_return {@link R<Integer>}
*/
@PostMapping("/submit/{planId}/{building}")
@PostMapping("/submit/{planId}/{buildingId}")
public R<Integer> submitByPlanIdAndBuildingId(@PathVariable Long planId, @PathVariable Long buildingId) {
return R.ok(riskPlanUserBuildingService.submitByPlanIdAndBuildingId(planId,buildingId, getUserId()));
}
......@@ -410,11 +433,12 @@ public class RiskPlanAppController extends BaseController {
/**
* 根据风险任务审批列表
*
* @param status 状态 running 待审批 completed 已审批
* @real_return {@link R<List<RiskPlanAppExistingListDto>>}
*/
@GetMapping("/approve/list")
public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByApproveUser() {
return R.ok(riskPlanService.getRiskPlanAppListDtoListByApproveUser(getUserId()));
public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByApproveUser(String status) {
return R.ok(riskPlanService.getRiskPlanAppListDtoListByApproveUser(getUserId(),status));
}
......@@ -425,6 +449,7 @@ public class RiskPlanAppController extends BaseController {
*/
@PostMapping("/approve")
public R<Integer> approveAppApproveDto(@RequestBody RiskPlanAppApproveDto appApproveDto) {
appApproveDto.setUserId(getUserId());
return R.ok(riskPlanService.approveAppApproveDto(appApproveDto));
}
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/SysMenuAppController.java 0 → 100644
View file @ 564a64b5
package com.censoft.censoftrongtong.controller;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
* 菜单信息
*
* @author ruoyi
*/
@RestController
@RequestMapping("/app-api/menu")
public class SysMenuAppController extends BaseController
{
@Autowired
private ISysMenuService menuService;
/**
* 查询角色菜单列表信息
*/
@GetMapping(value = "/roleMenuTreeselect")
public AjaxResult roleMenuTreeselect()
{
//根数据
List<SysMenu> rootList = new ArrayList<>();
//初始化树
AjaxResult ajax = AjaxResult.success();
List<SysMenu> list = menuService.queryMenu(getUserId());
if(CollectionUtils.isEmpty(list)){
return ajax;
}
list.stream().filter(sysMenu -> 0L == sysMenu.getParentId()).forEach(rootList::add);
SysMenu sysMenu = rootList.get(0);
buildTreeNew(sysMenu,list);
ajax.put("list", sysMenu.getChildren());
return ajax;
}
public static void buildTreeNew(SysMenu root, List<SysMenu> nodeList) {
//step1 找出所有的下级
List<SysMenu> resultList = new ArrayList<>();
nodeList.forEach(node ->{
//如果id对应，则为下级
if(root.getMenuId().equals(node.getParentId())){
//递归查找下级的下级
buildTreeNew(node,nodeList);
resultList.add(node);
}
});
root.setChildren(resultList);
}
}
\ No newline at end of file
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanUserBuilding.java
View file @ 564a64b5
......@@ -63,4 +63,22 @@ public class RiskPlanUserBuilding {
@TableField("submit_user_id")
private Long submitUserId;
/**
* 经办结果
*/
@TableField("task_result")
private String taskResult;
/**
* 经办意见
*/
@TableField("task_opinion")
private String taskOpinion;
/**
* 审批人id
*/
@TableField("approval_user_id")
private Long approvalUserId;
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppApproveBuildingDto.java 0 → 100644
View file @ 564a64b5
package com.censoft.censoftrongtong.domain.dto;
import lombok.Data;
import java.util.List;
/**
* @author 周昊
* @desc ...
* @date 2023-06-27 14:45:45
*/
@Data
public class RiskPlanAppApproveBuildingDto {
/** id */
private Long buildingId;
/** 经办结果 */
private String taskResult;
/** 经办意见 */
private String taskOpinion;
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppApproveDto.java
View file @ 564a64b5
......@@ -3,6 +3,8 @@ package com.censoft.censoftrongtong.domain.dto;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.util.List;
/**
* @author 周昊
......@@ -19,4 +21,10 @@ public class RiskPlanAppApproveDto {
/** 经办意见 */
private String taskOpinion;
/** 操作人id */
private Long userId;
/** 楼宇经办意见 */
private List<RiskPlanAppApproveBuildingDto> buildingDtos;
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanMapper.java
View file @ 564a64b5
......@@ -76,5 +76,5 @@ public interface RiskPlanMapper
List<RiskPlanAppApproveListDto> getApproveListDtoByPlanId(@Param("planId") Long planId);
List<RiskPlanAppListDto> getRiskPlanAppListDtoListByApproveUser(@Param("userId") Long userId);
List<RiskPlanAppListDto> getRiskPlanAppListDtoListByApproveUser(@Param("userId") Long userId,@Param("status") String status);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanService.java
View file @ 564a64b5
......@@ -78,5 +78,5 @@ public interface IRiskPlanService
int revokeByPlanId(Long planId, Long userId);
List<RiskPlanAppListDto> getRiskPlanAppListDtoListByApproveUser(Long userId);
List<RiskPlanAppListDto> getRiskPlanAppListDtoListByApproveUser(Long userId,String status);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanUserBuildingService.java
View file @ 564a64b5
......@@ -2,6 +2,7 @@ package com.censoft.censoftrongtong.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppApproveBuildingDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppBuildingListDto;
import java.util.List;
......@@ -19,4 +20,6 @@ public interface IRiskPlanUserBuildingService extends IService<RiskPlanUserBuild
List<RiskPlanAppBuildingListDto> getRiskPlanAppBuildingListDtoByPlanId(Long planId);
Integer submitByPlanIdAndBuildingId(Long planId, Long buildingId, Long userId);
void updateByRiskPlanAppApproveBuildingDto(Long planId,Long userId, List<RiskPlanAppApproveBuildingDto> buildingDtos);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java
View file @ 564a64b5
......@@ -207,6 +207,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
@Override
public int approveAppApproveDto(RiskPlanAppApproveDto appApproveDto) {
//获取最新的task
RiskPlanTask lastRiskPlanTask = riskPlanTaskService.getLastRiskPlanTaskByPlanId(appApproveDto.getId());
lastRiskPlanTask.setTaskResult(appApproveDto.getTaskResult());
......@@ -223,9 +224,8 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
//插入任务表 已退回风险评估
RiskPlanTask riskPlanTask1 = new RiskPlanTask();
riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_RETURN.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_RETURN.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_RETURN.getTitle());
riskPlanTask1.setStatus("running");
riskPlanTask1.setStartTime(new Date());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
......@@ -233,10 +233,53 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
//修改计划状态
riskPlan.setStatus(RiskPlanStatusType.WAIT_RETURN.getStatus());
updateRiskPlan(riskPlan);
//如果是组长审批 同时退回修改 楼宇单子的状态
riskPlanUserBuildingService.updateByRiskPlanAppApproveBuildingDto(appApproveDto.getId(),appApproveDto.getUserId()
,appApproveDto.getBuildingDtos());
} else {
//修改计划状态
riskPlan.setStatus(RiskPlanStatusType.FINISH.getStatus());
updateRiskPlan(riskPlan);
if (riskPlan.getStatus().equals(RiskPlanStatusType.WAIT_LEADER_APPROVE.getStatus())){
//修改计划状态
riskPlan.setStatus(RiskPlanStatusType.WAIT_APPROVE.getStatus());
updateRiskPlan(riskPlan);
//插入任务表 审批任务
RiskPlanTask riskPlanTask1 = new RiskPlanTask();
riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
riskPlanTask1.setApprovalUserId(riskPlan.getCreateUserId());
riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_APPROVE.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_APPROVE.getTitle());
riskPlanTask1.setStatus("running");
riskPlanTask1.setStartTime(new Date());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
}else {
//修改计划状态
riskPlan.setStatus(RiskPlanStatusType.FINISH.getStatus());
updateRiskPlan(riskPlan);
//插入任务表 项目评估报告
RiskPlanTask riskPlanTask1 = new RiskPlanTask();
riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
riskPlanTask1.setTaskKey(RiskPlanStatusType.PROJECT_REPORT.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.PROJECT_REPORT.getTitle());
riskPlanTask1.setStatus("completed");
riskPlanTask1.setStartTime(new Date());
riskPlanTask1.setCompletedTime(new Date());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
//插入任务表 已完成
RiskPlanTask riskPlanTask2 = new RiskPlanTask();
riskPlanTask2.setPlanId(lastRiskPlanTask.getPlanId());
riskPlanTask2.setTaskKey(RiskPlanStatusType.FINISH.getStatus());
riskPlanTask2.setTaskName(RiskPlanStatusType.FINISH.getTitle());
riskPlanTask2.setStatus("completed");
riskPlanTask2.setStartTime(new Date());
riskPlanTask2.setCompletedTime(new Date());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask2);
}
}
return 1;
}
......@@ -256,7 +299,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
RiskPlanTask riskPlanTask1 = new RiskPlanTask();
riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
riskPlanTask1.setTaskKey(RiskPlanStatusType.REVOKE.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.REVOKE.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.REVOKE.getTitle());
riskPlanTask1.setStatus("completed");
riskPlanTask1.setStartTime(new Date());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
......@@ -269,13 +312,13 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
}
@Override
public List<RiskPlanAppListDto> getRiskPlanAppListDtoListByApproveUser(Long userId) {
public List<RiskPlanAppListDto> getRiskPlanAppListDtoListByApproveUser(Long userId,String status) {
//查询并把状态值转化为状态名称
return riskPlanMapper.getRiskPlanAppListDtoListByApproveUser(userId)
return riskPlanMapper.getRiskPlanAppListDtoListByApproveUser(userId,status)
.stream()
.map(dto -> {
String status = RiskPlanStatusType.getTitleByStatus(dto.getStatus()).getTitle();
dto.setStatus(status);
String statusName = RiskPlanStatusType.getTitleByStatus(dto.getStatus()).getTitle();
dto.setStatus(statusName);
return dto;
}).collect(Collectors.toList());
}
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanUserBuildingServiceImpl.java
View file @ 564a64b5
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.censoft.censoftrongtong.domain.RiskPlan;
import com.censoft.censoftrongtong.domain.RiskPlanTask;
import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppApproveBuildingDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppBuildingListDto;
import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
import com.censoft.censoftrongtong.mapper.RiskPlanUserBuildingMapper;
......@@ -41,7 +42,10 @@ public class RiskPlanUserBuildingServiceImpl
@Override
public Long countStatusByPlanIdAndStatus(Long planId, String status) {
LambdaQueryWrapper<RiskPlanUserBuilding> wrapper = new LambdaQueryWrapper<>();
wrapper = wrapper.eq(RiskPlanUserBuilding::getPlanId, planId).eq(RiskPlanUserBuilding::getStatus, status);
wrapper = wrapper.eq(RiskPlanUserBuilding::getPlanId, planId);
if (status != null){
wrapper = wrapper.eq(RiskPlanUserBuilding::getStatus, status);
}
return count(wrapper);
}
......@@ -54,7 +58,7 @@ public class RiskPlanUserBuildingServiceImpl
public Integer submitByPlanIdAndBuildingId(Long planId, Long buildingId, Long userId) {
//更新楼宇人员关系表状态
LambdaQueryWrapper<RiskPlanUserBuilding> wrapper = new LambdaQueryWrapper<>();
wrapper = wrapper.eq(RiskPlanUserBuilding::getPlanId,planId).eq(RiskPlanUserBuilding::getBuildingId,buildingId);
wrapper = wrapper.eq(RiskPlanUserBuilding::getPlanId, planId).eq(RiskPlanUserBuilding::getBuildingId, buildingId);
RiskPlanUserBuilding riskPlanUserBuilding = getOne(wrapper);
riskPlanUserBuilding.setStatus("finish");
......@@ -64,9 +68,9 @@ public class RiskPlanUserBuildingServiceImpl
//查看是否全部楼宇提交
LambdaQueryWrapper<RiskPlanUserBuilding> wrapper2 = new LambdaQueryWrapper<>();
wrapper2 = wrapper2.eq(RiskPlanUserBuilding::getPlanId,planId).eq(RiskPlanUserBuilding::getBuildingId,buildingId);
wrapper2 = wrapper2.eq(RiskPlanUserBuilding::getPlanId, planId);
List<RiskPlanUserBuilding> list = list(wrapper2);
if (list.stream().allMatch(po -> po.getStatus().equals("finish"))){
if (list.stream().allMatch(po -> po.getStatus().equals("finish"))) {
//获取最新的task
RiskPlanTask lastRiskPlanTask = riskPlanTaskService.getLastRiskPlanTaskByPlanId(planId);
......@@ -82,7 +86,7 @@ public class RiskPlanUserBuildingServiceImpl
riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_LEADER_APPROVE.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_LEADER_APPROVE.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_LEADER_APPROVE.getTitle());
riskPlanTask1.setStatus("running");
riskPlanTask1.setStartTime(new Date());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
......@@ -94,4 +98,20 @@ public class RiskPlanUserBuildingServiceImpl
}
return 1;
}
@Override
public void updateByRiskPlanAppApproveBuildingDto(Long planId, Long userId, List<RiskPlanAppApproveBuildingDto> buildingDtos) {
buildingDtos.forEach(dto -> {
LambdaQueryWrapper<RiskPlanUserBuilding> wrapper = new LambdaQueryWrapper<>();
wrapper = wrapper
.eq(RiskPlanUserBuilding::getPlanId, planId)
.eq(RiskPlanUserBuilding::getBuildingId, dto.getBuildingId());
RiskPlanUserBuilding planUserBuilding = getOne(wrapper);
planUserBuilding.setTaskResult(dto.getTaskResult());
planUserBuilding.setTaskOpinion(dto.getTaskOpinion());
planUserBuilding.setStatus("return");
planUserBuilding.setApprovalUserId(userId);
updateById(planUserBuilding);
});
}
}
censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml
View file @ 564a64b5
......@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="createUserId != null"> and rp.create_user_id = #{createUserId}</if>
<if test="leaderUserId != null"> and rp.leader_user_id = #{leaderUserId}</if>
<if test="workUserId != null"> and (find_in_set(#{leaderUserId},rp.work_user_ids) or rp.leader_user_id = #{leaderUserId}) </if>
<if test="workUserId != null"> and (find_in_set(#{workUserId},rp.work_user_ids) or rp.leader_user_id = #{workUserId}) </if>
<if test="statusStringList != null and statusStringList.size >0">
and rp.`status` in
<foreach collection="statusStringList" item="status" open="(" separator="," close=")">
......@@ -186,14 +186,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
risk_plan rp
LEFT JOIN sys_user su ON su.user_id = rp.leader_user_id
LEFT JOIN risk_plan_task rpt ON rpt.plan_id = rp.id
<where>
<if test="userId != null">
and ((rp.approval_user_id = #{userId} and rp.`status` = 'WAIT_LEADER_APPROVE')
and ((rpt.approval_user_id = #{userId} and (rpt.task_key = 'WAIT_LEADER_APPROVE' or rpt.task_key = 'WAIT_RETURN'))
or
(rp.create_user_id = #{userId} and rp.`status` = 'WAIT_APPROVE'))
(rpt.approval_user_id = #{userId} and rpt.task_key = 'WAIT_APPROVE'))
</if>
<if test="status != null and status != '' ">
and rpt.`status` = #{status}
</if>
</where>
GROUP BY
rp.id
ORDER BY
rp.start_time DESC
</select>
......
censoft-rongtong/src/main/resources/mapper/system/RiskPlanTaskMapper.xml
View file @ 564a64b5
......@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getLastRiskPlanTaskByPlanId" resultMap="RiskPlanTaskResult">
<include refid="selectRiskPlanTaskVo"/>
where plan_id = #{id}
order BY start_time desc
order BY start_time desc,id desc
limit 1
</select>
......@@ -81,8 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="taskName != null">task_name = #{taskName},</if>
<if test="taskResult != null">task_result = #{taskResult},</if>
<if test="taskOpinion != null">task_opinion = #{taskOpinion},</if>
<if test="approvalDeptId != null">approval_dept_id = #{approvalDeptId},</if>
<if test="approvalRoleKey != null">approval_role_key = #{approvalRoleKey},</if>
<if test="status != null">status = #{status},</if>
<if test="approvalUserId != null">approval_user_id = #{approvalUserId},</if>
<if test="startTime != null">start_time = #{startTime},</if>
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
View file @ 564a64b5
......@@ -36,7 +36,7 @@ public class SysMenuController extends BaseController
/**
* 获取菜单列表
*/
@PreAuthorize("@ss.hasPermi('system:menu:list')")
//@PreAuthorize("@ss.hasPermi('system:menu:list')")
@GetMapping("/list")
public AjaxResult list(SysMenu menu)
{
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
View file @ 564a64b5
......@@ -129,4 +129,11 @@ public interface SysMenuMapper
* @return 结果
*/
public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
/**
* 根据用户 id 查询角色列表
* @param userId 用户 id
* @return 返回信息
*/
List<SysMenu> queryMenu(@Param("userId")Long userId);
}
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
View file @ 564a64b5
......@@ -148,4 +148,11 @@ public interface ISysMenuService {
* @return 结果
*/
public boolean checkMenuNameUnique(SysMenu menu);
/**
* 根据用户 id 查询角色列表
* @param userId 用户 id
* @return 返回信息
*/
List<SysMenu> queryMenu(Long userId);
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View file @ 564a64b5
......@@ -476,4 +476,9 @@ public class SysMenuServiceImpl implements ISysMenuService {
return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, "."},
new String[]{"", "", "", "/"});
}
@Override
public List<SysMenu> queryMenu(Long userId) {
return menuMapper.queryMenu(userId);
}
}
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
View file @ 564a64b5
......@@ -220,4 +220,19 @@
delete from sys_menu where menu_id = #{menuId}
</delete>
<select id="queryMenu" resultMap="SysMenuResult">
SELECT
*
FROM
sys_menu
WHERE
menu_id IN (
SELECT
menu_id
FROM
sys_role_menu
WHERE
role_id IN ( SELECT role_id FROM sys_user_role WHERE user_id = #{userId} ))
order by order_num
</select>
</mapper>
\ 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