From 3b184abc961849afc65f37944bfc4cb3642da095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Mon, 17 Nov 2025 19:17:59 +0800 Subject: [PATCH] =?UTF-8?q?11-17-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysRoleWorkController.java | 8 +++ .../service/impl/SysRoleWorkServiceImpl.java | 57 ++++++++++++++----- .../project/service/IBusProjectService.java | 6 ++ .../bx/bxsq/fymx/domain/XzdBxBxsqFymx.java | 5 ++ .../service/impl/XzdBxBxsqServiceImpl.java | 13 ++--- .../controller/XzdSupplierInfoController.java | 26 +++++++++ .../org/dromara/xzd/domain/XzdProject.java | 2 +- .../dromara/xzd/domain/bo/XzdProjectBo.java | 2 +- .../impl/XzdContractDetailsServiceImpl.java | 2 + .../service/impl/XzdProjectServiceImpl.java | 2 +- .../resources/mapper/xzd/XzdProjectMapper.xml | 4 ++ 11 files changed, 103 insertions(+), 24 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/SysRoleWorkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/SysRoleWorkController.java index 069367aa..e61dae49 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/SysRoleWorkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/SysRoleWorkController.java @@ -124,6 +124,14 @@ public class SysRoleWorkController extends BaseController { return R.ok(sysRoleWorkService.isHaveValue(LoginHelper.getUserId())); } + /** + * 根据用户和项目判断是否有角色流程 + */ + @GetMapping("/getRoleWork/{projectId}") + public R getRoleWorkByProject(@PathVariable("projectId") Long projectId) { + return R.ok(sysRoleWorkService.isHaveValueByProject(projectId)); + } + /** * 获取角色对应流程 弃用 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/SysRoleWorkServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/SysRoleWorkServiceImpl.java index 1235338a..040b3a9b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/SysRoleWorkServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/SysRoleWorkServiceImpl.java @@ -244,25 +244,33 @@ public class SysRoleWorkServiceImpl extends ServiceImpl allRoleList = baseMapper.getAllRoleList(userId); //初始化 - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); +// LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); List busProjectVoList = new ArrayList<>(); //获取到该用户所有有流程的项目 说明在该项目下该用户有角色有所属流程 for (SysUserRole sysUserRole : allRoleList) { - lqw.clear(); - lqw.eq(SysRoleWork::getProjectId,sysUserRole.getProjectId()); - lqw.eq(SysRoleWork::getRoleId, sysUserRole.getRoleId()); - SysRoleWork one = getOne(lqw); - if (one != null){ - //先拿到该项目 - BusProjectQueryReq req = new BusProjectQueryReq(); - req.setId(sysUserRole.getProjectId()); - List vos = projectService.queryList(req); - if (vos != null && !vos.isEmpty()){ - if(!busProjectVoList.contains(vos.getFirst())){ - busProjectVoList.add(vos.getFirst()); - } +// lqw.clear(); +// lqw.eq(SysRoleWork::getProjectId,sysUserRole.getProjectId()); +// lqw.eq(SysRoleWork::getRoleId, sysUserRole.getRoleId()); +// SysRoleWork one = getOne(lqw); +// if (one != null){ +// //先拿到该项目 +// BusProjectQueryReq req = new BusProjectQueryReq(); +// req.setId(sysUserRole.getProjectId()); +// List vos = projectService.queryList(req); +// if (vos != null && !vos.isEmpty()){ +// if(!busProjectVoList.contains(vos.getFirst())){ +// busProjectVoList.add(vos.getFirst()); +// } +// } +// } + BusProjectQueryReq req = new BusProjectQueryReq(); + req.setId(sysUserRole.getProjectId()); + List vos = projectService.queryList(req); + if (vos != null && !vos.isEmpty()){ + if(!busProjectVoList.contains(vos.getFirst())){ + busProjectVoList.add(vos.getFirst()); } } } @@ -288,4 +296,25 @@ public class SysRoleWorkServiceImpl extends ServiceImpl roleList = baseMapper.getRoleList(userId, projectId); + if (roleList != null && !roleList.isEmpty()){ + for (SysUserRole userRole : roleList) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(SysRoleWork::getRoleId, userRole.getRoleId()); + lqw.eq(SysRoleWork::getProjectId,projectId); + List list = list(lqw); + if (list != null && !list.isEmpty()){ + return true; + } + } + } + return false; + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java index 9a6e6916..577bc5a2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java @@ -253,4 +253,10 @@ public interface IBusProjectService extends IService { Map> getInfoData(TanchuangInfoReq req); Boolean updatePosition(ProjectUpdateDto dto); + + /** + * 生成项目周报模板 + */ + String testExcel(); + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/fymx/domain/XzdBxBxsqFymx.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/fymx/domain/XzdBxBxsqFymx.java index a1e39956..c122412b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/fymx/domain/XzdBxBxsqFymx.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/fymx/domain/XzdBxBxsqFymx.java @@ -40,6 +40,11 @@ public class XzdBxBxsqFymx extends BaseEntity { */ private Long deptId; + /** + * 类型id + */ + private Long lxId; + /** * 费用类型(1农产品2旅客运输) */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/service/impl/XzdBxBxsqServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/service/impl/XzdBxBxsqServiceImpl.java index 371ef18b..db788a89 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/service/impl/XzdBxBxsqServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/service/impl/XzdBxBxsqServiceImpl.java @@ -19,7 +19,6 @@ import org.dromara.system.domain.vo.SysDeptVo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.service.impl.SysDeptServiceImpl; import org.dromara.system.service.impl.SysUserServiceImpl; -import org.dromara.xzd.bx.bxsq.bxlx.domain.vo.XzdBxBxsqBxlxVo; import org.dromara.xzd.bx.bxsq.bxlx.service.impl.XzdBxBxsqBxlxServiceImpl; import org.dromara.xzd.bx.bxsq.domain.XzdBxBxsq; import org.dromara.xzd.bx.bxsq.domain.bo.XzdBxBxsqBo; @@ -399,12 +398,12 @@ public class XzdBxBxsqServiceImpl extends ServiceImpl> typeList() { return xzdSupplierInfoService.typeList(); } + + /** + * 查询项目信息列表 + */ + @SaCheckPermission(value = {"xzd:supplierInfo:add", "xzd:supplierInfo:edit", "xzd:supplierInfo:list"}, mode = SaMode.OR) + @GetMapping("/projectList") + public TableDataInfo list(XzdProjectBo bo, PageQuery pageQuery) { + return xzdProjectService.queryPageList(bo, pageQuery); + } + + /** + * 获取项目信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"xzd:supplierInfo:add", "xzd:supplierInfo:edit", "xzd:supplierInfo:list"}, mode = SaMode.OR) + @GetMapping("/project/{id}") + public R getProjectInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdProjectService.queryById(id)); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java index f12f8e17..4a219413 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java @@ -156,7 +156,7 @@ public class XzdProject extends BaseEntity { /** * 建设单位 */ - private String constructionUnit; + private Long constructionUnit; /** * 项目属性 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java index 4143c0f0..a0488bb9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java @@ -172,7 +172,7 @@ public class XzdProjectBo extends BaseEntity { * 建设单位 */ // @NotBlank(message = "建设单位不能为空", groups = { AddGroup.class, EditGroup.class }) - private String constructionUnit; + private Long constructionUnit; /** * 项目属性 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java index f6ac49c9..07572ff5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java @@ -125,6 +125,7 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(XzdContractDetails::getCreateTime); + lqw.eq(bo.getShzt() != null, XzdContractDetails::getShzt, bo.getShzt()); lqw.eq(StringUtils.isNotBlank(bo.getHtzt()), XzdContractDetails::getHtzt, bo.getHtzt()); lqw.eq(bo.getId() != null, XzdContractDetails::getId, bo.getId()); lqw.eq(StringUtils.isNotBlank(bo.getContractType()), XzdContractDetails::getContractType, bo.getContractType()); @@ -486,6 +487,7 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl + + AND project.construction_unit = #{constructionUnit} + + ORDER BY project.create_time DESC