yinq
/
hwbm-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目周报完善

Browse Source
dev
lh 2 months ago
parent 440fcbf1ed
commit cebf0c0483
7 changed files with 89 additions and 27 deletions
Show Stats Download Patch File Download Diff File

50
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReportDetailVo.java
Unescape Escape View File

@ -30,7 +30,7 @@ public class ErpProjectReportDetailVo implements Serializable {
/**
* 项目周报明细ID
*/
@ExcelProperty(value = "项目周报明细ID")
// @ExcelProperty(value = "项目周报明细ID")
private Long reportDetailId;
/**
@ -44,7 +44,29 @@ public class ErpProjectReportDetailVo implements Serializable {
*/
@ExcelProperty(value = "项目ID")
private Long projectId;
/**
* 部门名称
*/
@ExcelProperty(value = "部门名称")
private String deptName;
/**
* 项目经理名称
*/
@ExcelProperty(value = "项目经理名称")
private String managerName;
/**
* 部门负责人名称
*/
@ExcelProperty(value = "部门负责人名称")
private String chargeName;
/**
* 分管副总名称
*/
@ExcelProperty(value = "分管副总名称")
private String deputyName;
/**
* 填写日期
*/
@ -121,7 +143,7 @@ public class ErpProjectReportDetailVo implements Serializable {
/**
* 排序号
*/
@ExcelProperty(value = "排序号")
// @ExcelProperty(value = "排序号")
private Long sortOrder;
/**
@ -151,32 +173,10 @@ public class ErpProjectReportDetailVo implements Serializable {
/**
* 激活标识（1是 0否）
*/
@ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class)
// @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "1=是,0=否")
private String activeFlag;
/**
* 部门名称
*/
@ExcelProperty(value = "部门名称")
private String deptName;
/**
* 项目经理名称
*/
@ExcelProperty(value = "项目经理名称")
private String managerName;
/**
* 部门负责人名称
*/
@ExcelProperty(value = "部门负责人名称")
private String chargeName;
/**
* 分管副总名称
*/
@ExcelProperty(value = "分管副总名称")
private String deputyName;
}

2
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java
Unescape Escape View File

@ -78,7 +78,6 @@ public class ErpProjectReportServiceImpl implements IErpProjectReportService {
MPJLambdaWrapper<ErpProjectReport> lqw = JoinWrappers.lambda(ErpProjectReport.class)
.selectAll(ErpProjectReport.class)
.eq(bo.getProjectId() != null, ErpProjectReport::getProjectId, bo.getProjectId())
.eq(StringUtils.isNotBlank(bo.getMilestonePlan()), ErpProjectReport::getMilestonePlan, bo.getMilestonePlan())
.eq(bo.getManagerId() != null, ErpProjectReport::getManagerId, bo.getManagerId())
.eq(bo.getDeptId() != null, ErpProjectReport::getDeptId, bo.getDeptId())
.eq(bo.getChargeId() != null, ErpProjectReport::getChargeId, bo.getChargeId())
@ -88,6 +87,7 @@ public class ErpProjectReportServiceImpl implements IErpProjectReportService {
.eq(StringUtils.isNotBlank(bo.getOssId()), ErpProjectReport::getOssId, bo.getOssId())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpProjectReport::getActiveFlag, bo.getActiveFlag())
.eq("t.del_flag", "0")
.like(StringUtils.isNotBlank(bo.getMilestonePlan()), ErpProjectReport::getMilestonePlan, bo.getMilestonePlan())
.like(StringUtils.isNotBlank(bo.getProjectName()), ErpProjectReport::getProjectName, bo.getProjectName())
.like(StringUtils.isNotBlank(bo.getProjectCode()), ErpProjectReport::getProjectCode, bo.getProjectCode())
.apply(StringUtils.isNotBlank(bo.getDeptName()), "d.dept_name LIKE CONCAT('%', {0}, '%')", bo.getDeptName())

12
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package org.dromara.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.map.MapUtil;
import cn.hutool.crypto.digest.BCrypt;
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.util.ArrayUtil;
@ -39,6 +40,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 用户信息
@ -314,4 +316,14 @@ public class SysUserController extends BaseController {
List<SysUserVo> list = userService.selectUserList();
return R.ok(list);
}
/**
* 根据部门ID和角色名查询用户列表
* @return 用户列表
*/
@SaCheckPermission("system:user:list")
@GetMapping("/listByDeptAndRole")
public R<List<SysUserVo>> listByDeptAndRole(@RequestParam Long deptId, @RequestParam(required = false) String roleName) {
return R.ok(userService.selectUserListByDeptAndRole(deptId, roleName));
}
}

8
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
Unescape Escape View File

@ -128,4 +128,12 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
})
int updateById(@Param(Constants.ENTITY) SysUser user);
/**
* 根据部门ID和角色名查询用户列表
*
* @param deptId 部门ID
* @param roleName 角色名
* @return 用户列表
*/
List<SysUserVo> selectUserListByDeptAndRole(@Param("deptId") Long deptId, @Param("roleName") String roleName);
}

9
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package org.dromara.system.service;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.domain.bo.SysUserBo;
@ -280,5 +281,13 @@ public interface ISysUserService {
* @return 用户信息集合信息
*/
public List<SysUserVo> selectUserList();
/**
* 通过部门ID和角色名查询用户列表
*
* @param deptId 部门ID
* @param roleName 角色名（如"项目经理"）
* @return 用户信息集合
*/
List<SysUserVo> selectUserListByDeptAndRole(@Param("roleName") Long deptId, @Param("roleName") String roleName);
}

13
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
Unescape Escape View File

@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.exception.ServiceException;
@ -692,5 +693,15 @@ public class SysUserServiceImpl implements ISysUserService {
lqw.orderByAsc(SysUser::getNickName);
return baseMapper.selectVoList(lqw);
}
/**
* 通过部门ID和角色名查询用户列表
*
* @param deptId 部门ID
* @param roleName 角色名（如"项目经理"）
* @return 用户信息集合
*/
@Override
public List<SysUserVo> selectUserListByDeptAndRole(@Param("deptId") Long deptId, @Param("roleName") String roleName) {
return baseMapper.selectUserListByDeptAndRole(deptId, roleName);
}
}

22
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
Unescape Escape View File

@ -38,5 +38,27 @@
left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment}
</select>
<select id="selectUserListByDeptAndRole" resultType="org.dromara.system.domain.vo.SysUserVo">
SELECT
u.user_id,
u.dept_id,
u.nick_name,
r.role_id,
r.role_name
FROM sys_user u
INNER JOIN sys_user_role ur ON u.user_id = ur.user_id
INNER JOIN sys_role r ON ur.role_id = r.role_id
WHERE u.del_flag = '0'
AND u.status = '0'
AND r.del_flag = '0'
AND r.status = '0'
<if test="deptId != null">
AND u.dept_id = #{deptId}
</if>
<if test="roleName != null and roleName != ''">
AND r.role_name = #{roleName}
</if>
ORDER BY u.user_id
</select>
</mapper>

Write Preview
Loading…
Cancel
Save