From dd970d200c6d581317602a85ee4a4ef45e695a10 Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 6 Nov 2025 10:27:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PersonalHomeController.java | 74 ++++++++++--------- .../service/impl/BusBwlServiceImpl.java | 1 + .../service/impl/BusSygjServiceImpl.java | 59 +++++++++++++++ .../domain/vo/XzdPostBidAnalysisVo.java | 7 ++ 4 files changed, 107 insertions(+), 34 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java index a7fc19ad..7487aeb5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java @@ -83,25 +83,8 @@ public class PersonalHomeController extends BaseController { - /** - * 查询实用工具列表 - */ -// @SaCheckPermission("bigscreen:sygj:list") - @GetMapping("/listsygj") - public TableDataInfo listsygj(BusSygjBo bo, PageQuery pageQuery) { - return busSygjService.queryPageList(bo, pageQuery); - } - /** - * 查询文件中心列表 - */ -// @SaCheckPermission("bigscreen:wjzx:list") - @GetMapping("/listBywjzx") - public TableDataInfo listBywjzx(BusWjzxBo bo, PageQuery pageQuery) { - return busWjzxService.queryPageList(bo, pageQuery); - } - @Autowired private IPdMasterService pdMasterService; @@ -185,25 +168,8 @@ public class PersonalHomeController extends BaseController { // endregion - /** - * 查询派单列表 - */ -// @SaCheckPermission("patch:master:list") - @GetMapping("/listPd") - public PdMasterBymiAndQt listPd(PdMasterBo bo, PageQuery pageQuery) { - return pdMasterService.queryPageListBy(bo, pageQuery); - } - /** - * 查询备忘录列表 - */ - @SaCheckPermission("bwl:bwl:list") - @GetMapping("/listbwl") - public TableDataInfo listbwl(BusBwlBo bo, PageQuery pageQuery) { - return busBwlService.queryPageListbwl(bo, pageQuery); - } - @GetMapping("/getTaskList") public R getTaskList(String projectId) { TaskInfoDto taskInfoDto = new TaskInfoDto(); @@ -284,4 +250,44 @@ public class PersonalHomeController extends BaseController { return map; } + + /** + * 查询实用工具列表 + */ +// @SaCheckPermission("bigscreen:sygj:list") + @GetMapping("/listsygj") + public TableDataInfo listsygj(BusSygjBo bo, PageQuery pageQuery) { + return busSygjService.queryPageList(bo, pageQuery); + } + + + /** + * 查询文件中心列表 + */ +// @SaCheckPermission("bigscreen:wjzx:list") + @GetMapping("/listBywjzx") + public TableDataInfo listBywjzx(BusWjzxBo bo, PageQuery pageQuery) { + return busWjzxService.queryPageList(bo, pageQuery); + } + + + /** + * 查询派单列表 + */ +// @SaCheckPermission("patch:master:list") + @GetMapping("/listPd") + public PdMasterBymiAndQt listPd(PdMasterBo bo, PageQuery pageQuery) { + return pdMasterService.queryPageListBy(bo, pageQuery); + } + + + /** + * 查询备忘录列表 + */ +// @SaCheckPermission("bwl:bwl:list") + @GetMapping("/listbwl") + public TableDataInfo listbwl(BusBwlBo bo, PageQuery pageQuery) { + return busBwlService.queryPageList(bo, pageQuery); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusBwlServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusBwlServiceImpl.java index 9041668a..da1ef0a8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusBwlServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusBwlServiceImpl.java @@ -86,6 +86,7 @@ public class BusBwlServiceImpl extends ServiceImpl impleme lqw.eq(StringUtils.isNotBlank(bo.getTitle()), BusBwl::getTitle, bo.getTitle()); lqw.eq(StringUtils.isNotBlank(bo.getContent()), BusBwl::getContent, bo.getContent()); lqw.eq(bo.getStatus() != null, BusBwl::getStatus, bo.getStatus()); + lqw.eq(bo.getCreateBy() != null, BusBwl::getCreateBy, bo.getCreateBy()); lqw.eq(bo.getJhkssj() != null, BusBwl::getJhkssj, bo.getJhkssj()); lqw.eq(bo.getJhjssj() != null, BusBwl::getJhjssj, bo.getJhjssj()); return lqw; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusSygjServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusSygjServiceImpl.java index 3098c454..e894205a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusSygjServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusSygjServiceImpl.java @@ -1,7 +1,12 @@ package org.dromara.bigscreen.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.dromara.bigscreen.domain.BusWjzx; import org.dromara.bigscreen.domain.dto.BusSygjBo; +import org.dromara.common.core.domain.event.ProcessDeleteEvent; +import org.dromara.common.core.domain.event.ProcessEvent; +import org.dromara.common.core.domain.event.ProcessTaskEvent; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -10,6 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; import org.dromara.bigscreen.domain.vo.BusSygjVo; import org.dromara.bigscreen.domain.BusSygj; @@ -28,6 +34,7 @@ import java.util.Collection; */ @RequiredArgsConstructor @Service +@Slf4j public class BusSygjServiceImpl extends ServiceImpl implements IBusSygjService { private final BusSygjMapper baseMapper; @@ -133,4 +140,56 @@ public class BusSygjServiceImpl extends ServiceImpl impl } return baseMapper.deleteByIds(ids) > 0; } + + + + + + + + /** + * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等) + * 正常使用只需#processEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processEvent 参数 + */ + @EventListener(condition = "#processEvent.flowCode.endsWith('grsygj')") + public void processPlansHandlErequipmentList(ProcessEvent processEvent) { + log.info("文件中心审核任务执行了{}", processEvent.toString()); + String id = processEvent.getBusinessId(); + BusSygj vo = baseMapper.selectById(Long.valueOf(id)); + if (vo == null) { + return; + } + vo.setAuditStatus(processEvent.getStatus()); + this.updateById(vo); + } + + /** + * 执行任务创建监听 + * 示例：也可通过 @EventListener(condition = "#processTaskEvent.flowCode=='leave1'")进行判断 + * 在方法中判断流程节点key + * if ("xxx".equals(processTaskEvent.getNodeCode())) { + * //执行业务逻辑 + * } + * + * @param processTaskEvent 参数 + */ + @EventListener(condition = "#processTaskEvent.flowCode.endsWith('grsygj')") + public void processTaskPlansHandlerEquipmentList(ProcessTaskEvent processTaskEvent) { + log.info("文件中心审核任务创建了{}", processTaskEvent.toString()); + } + + /** + * 监听删除流程事件 + * 正常使用只需#processDeleteEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processDeleteEvent 参数 + */ + @EventListener(condition = "#processDeleteEvent.flowCode.endsWith('grsygj')") + public void processDeletePlansHandlerEquipmentList(ProcessDeleteEvent processDeleteEvent) { + log.info("文件中心删除流程事件，文件中心审核任务执行了{}", processDeleteEvent.toString()); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/domain/vo/XzdPostBidAnalysisVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/domain/vo/XzdPostBidAnalysisVo.java index 2a66f691..5656030c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/domain/vo/XzdPostBidAnalysisVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/domain/vo/XzdPostBidAnalysisVo.java @@ -93,6 +93,13 @@ public class XzdPostBidAnalysisVo implements Serializable { @ExcelProperty(value = "建设单位") private String constructionUnit; + + /** + * 建设单位 + */ + @ExcelProperty(value = "建设单位") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "constructionUnit") + private String constructionUnitName; /** * 开标日期 */