| src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/projectManagement/pojo/InfoStage.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/projectManagement/service/RolesService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/projectManagement/vo/SimpleRoleVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/projectManagement/InfoStageMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
@@ -52,4 +52,9 @@ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("è¯·ä¼ å ¥è¦å é¤çID"); return AjaxResult.success(rolesservice.removeBatchByIds(ids)); } @PostMapping("/listSimpleRole") public AjaxResult listSimpleRole() { return AjaxResult.success(rolesservice.listSimpleRole()); } } src/main/java/com/ruoyi/projectManagement/pojo/InfoStage.java
@@ -43,13 +43,13 @@ /** * å®é è´è´£äººid */ @TableField(value = "actually_leader_id") @TableField(value = "actual_leader_id") private Long actualLeaderId; /** * å®é è´è´£äººåç§° */ @TableField(value = "actually_leader_name") @TableField(value = "actual_leader_name") private String actualLeaderName; /** src/main/java/com/ruoyi/projectManagement/service/RolesService.java
@@ -4,7 +4,12 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.projectManagement.pojo.Roles; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.projectManagement.vo.SimpleRoleVo; import java.util.List; public interface RolesService extends IService<Roles> { IPage<Roles> listPage(Page<Roles> page, Roles roles); List<SimpleRoleVo> listSimpleRole(); } src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java
@@ -1,16 +1,21 @@ package com.ruoyi.projectManagement.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.enums.IsDeleteEnum; import com.ruoyi.projectManagement.mapper.RolesMapper; import com.ruoyi.projectManagement.pojo.Roles; import com.ruoyi.projectManagement.service.RolesService; import com.ruoyi.projectManagement.vo.SimpleRoleVo; import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; @AllArgsConstructor @Service @@ -29,4 +34,11 @@ } return rolesmapper.selectPage(page, queryWrapper); } @Override public List<SimpleRoleVo> listSimpleRole() { LambdaQueryWrapper<Roles> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Roles::getStatus, 1); return BeanUtil.copyToList(rolesmapper.selectList(queryWrapper), SimpleRoleVo.class); } } src/main/java/com/ruoyi/projectManagement/vo/SimpleRoleVo.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ package com.ruoyi.projectManagement.vo; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; /** * @author buhuazhen * @date 2026/3/11 * @email 3038525872@qq.com */ @Data @AllArgsConstructor @NoArgsConstructor public class SimpleRoleVo implements java.io.Serializable { private Long id; private String no; private String name; } src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
@@ -27,7 +27,7 @@ and sl.salesman like concat('%',#{req.salesman},'%') </if> <if test="req.shippingNo != null and req.shippingNo != ''"> and rm.shipping_no like concat('%',#{req.shippingNo},'%') and si.shipping_no like concat('%',#{req.shippingNo},'%') </if> <if test="req.projectStage != null and req.projectStage != ''"> and rm.project_stage like concat('%',#{req.projectStage},'%') src/main/resources/mapper/projectManagement/InfoStageMapper.xml
@@ -9,16 +9,14 @@ <result property="projectManagementPlanNodeId" column="project_management_plan_node_id" jdbcType="BIGINT"/> <result property="projectManagementInfoId" column="project_management_info_id" jdbcType="BIGINT"/> <result property="description" column="description" jdbcType="VARCHAR"/> <result property="actuallyLeaderId" column="actually_leader_id" jdbcType="BIGINT"/> <result property="actuallyLeaderName" column="actually_leader_name" jdbcType="VARCHAR"/> <result property="actualLeaderId" column="actually_leader_id" jdbcType="BIGINT"/> <result property="actualLeaderName" column="actually_leader_name" jdbcType="VARCHAR"/> <result property="estimatedDuration" column="estimated_duration" jdbcType="INTEGER"/> <result property="planStartTime" column="plan_start_time" jdbcType="DATE"/> <result property="planEndTime" column="plan_end_time" jdbcType="DATE"/> <result property="actualStartTime" column="actual_start_time" jdbcType="DATE"/> <result property="actualEndTime" column="actual_end_time" jdbcType="DATE"/> <result property="progress" column="progress" jdbcType="INTEGER"/> <result property="actuallyStartTime" column="actually_start_time" jdbcType="DATE"/> <result property="actuallyEndTime" column="actually_end_time" jdbcType="DATE"/> <result property="attachment" column="attachment" jdbcType="VARCHAR"/> <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/> @@ -31,10 +29,9 @@ <sql id="Base_Column_List"> id,project_management_plan_node_id,project_management_info_id, description,actually_leader_id,actually_leader_name, description,actual_leader_id,actual_leader_name, estimated_duration,plan_start_time,plan_end_time, actual_start_time,actual_end_time,progress, actually_start_time,actually_end_time,attachment, actual_start_time,actual_end_time,progress,attachment, create_time,update_time,is_delete, create_user,update_user,create_user_name, update_user_name