From e1d713b23e0791c5c90b2a7f45ade33933d6d50c 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, 10 Nov 2025 20:17:30 +0800 Subject: [PATCH] =?UTF-8?q?11-10-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysRoleWorkController.java | 7 +- .../dromara/bigscreen/domain/SysRoleWork.java | 5 ++ .../bigscreen/domain/bo/SysRoleWorkBo.java | 5 ++ .../bigscreen/domain/vo/SysRoleWorkVo.java | 6 ++ .../bigscreen/mapper/SysRoleWorkMapper.java | 9 +++ .../service/impl/SysRoleWorkServiceImpl.java | 50 +++++++++---- .../dromara/xzd/bx/bxsq/domain/XzdBxBxsq.java | 15 ++++ .../xzd/bx/bxsq/domain/bo/XzdBxBxsqBo.java | 15 ++++ .../xzd/bx/bxsq/domain/vo/XzdBxBxsqVo.java | 15 ++++ .../dromara/xzd/domain/XzdBusinessSeal.java | 10 ++- .../xzd/domain/XzdContractDetails.java | 22 +++++- .../xzd/domain/bo/XzdBusinessSealBo.java | 9 ++- .../xzd/domain/bo/XzdContractDetailsBo.java | 22 +++++- .../xzd/domain/vo/XzdBusinessSealVo.java | 7 +- .../xzd/domain/vo/XzdContractDetailsVo.java | 22 +++++- .../xzd/mapper/XzdContractDetailsMapper.java | 6 +- .../impl/XzdBusinessSealServiceImpl.java | 73 ++++++++++++++++--- .../impl/XzdContractChangeServiceImpl.java | 33 +++++---- .../impl/XzdContractDetailsServiceImpl.java | 47 ++---------- .../skyfk/fbhtfk/domain/XzdSkyfkFbhtfk.java | 26 +++---- .../fbhtfk/domain/bo/XzdSkyfkFbhtfkBo.java | 26 +++---- .../fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java | 10 +-- .../impl/XzdSkyfkFbhtfkServiceImpl.java | 45 +++++++----- .../mapper/xzd/XzdContractDetailsMapper.xml | 4 +- .../resources/mapper/xzd/XzdProjectMapper.xml | 2 + 25 files changed, 346 insertions(+), 145 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 ca8a0918..4cef8661 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 @@ -5,6 +5,7 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; +import org.dromara.bigscreen.domain.SysRoleWork; import org.dromara.bigscreen.domain.bo.SysRoleWorkBo; import org.dromara.bigscreen.domain.vo.SysRoleWorkVo; import org.dromara.bigscreen.service.impl.SysRoleWorkServiceImpl; @@ -107,9 +108,9 @@ public class SysRoleWorkController extends BaseController { /** * 获取角色对应流程 */ - @GetMapping("/getRoleToWork") - public R getRoleWork() { - return R.ok(sysRoleWorkService.getRoleWork()); + @GetMapping("/getRoleToWork/{projectId}") + public R getRoleWork(@PathVariable("projectId") Long projectId) { + return R.ok(sysRoleWorkService.getRoleWork(projectId)); } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/SysRoleWork.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/SysRoleWork.java index 67f14e06..6e2152d3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/SysRoleWork.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/SysRoleWork.java @@ -33,6 +33,11 @@ public class SysRoleWork extends BaseEntity { */ private Long roleId; + /** + * 绑定项目id + */ + private Long projectId; + /** * 流程名称 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/bo/SysRoleWorkBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/bo/SysRoleWorkBo.java index 9bce394a..2ea5a8c4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/bo/SysRoleWorkBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/bo/SysRoleWorkBo.java @@ -27,6 +27,11 @@ public class SysRoleWorkBo extends BaseEntity { */ private Long roleId; + /** + * 绑定项目id + */ + private Long projectId; + /** * 流程名称 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/SysRoleWorkVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/SysRoleWorkVo.java index 2007189e..00c80606 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/SysRoleWorkVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/SysRoleWorkVo.java @@ -36,6 +36,12 @@ public class SysRoleWorkVo implements Serializable { @ExcelProperty(value = "绑定角色ID") private Long roleId; + /** + * 绑定项目id + */ + @ExcelProperty(value = "绑定项目ID") + private Long projectId; + /** * 角色名称 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/mapper/SysRoleWorkMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/mapper/SysRoleWorkMapper.java index b32939d2..fa4e4a5f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/mapper/SysRoleWorkMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/mapper/SysRoleWorkMapper.java @@ -1,8 +1,12 @@ package org.dromara.bigscreen.mapper; +import org.apache.ibatis.annotations.Select; import org.dromara.bigscreen.domain.SysRoleWork; import org.dromara.bigscreen.domain.vo.SysRoleWorkVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysUserRole; + +import java.util.List; /** * 角色流程对应Mapper接口 @@ -12,4 +16,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface SysRoleWorkMapper extends BaseMapperPlus { + /** + * 根据登录人id获取对应角色 + */ + @Select("select * from sys_user_role where user_id = #{userId} and project_id = #{projectId}") + List getRoleList(Long userId,Long 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 f064987a..525407ba 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 @@ -15,6 +15,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.system.domain.SysUserRole; import org.dromara.system.domain.vo.SysRoleVo; import org.dromara.system.service.impl.SysRoleServiceImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -86,7 +87,7 @@ public class SysRoleWorkServiceImpl extends ServiceImpl buildQueryWrapper(SysRoleWorkBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByDesc(SysRoleWork::getId); + lqw.orderByDesc(SysRoleWork::getCreateTime); lqw.eq(bo.getRoleId() != null, SysRoleWork::getRoleId, bo.getRoleId()); lqw.eq(StringUtils.isNotBlank(bo.getLcmc()), SysRoleWork::getLcmc, bo.getLcmc()); lqw.eq(StringUtils.isNotBlank(bo.getLcms()), SysRoleWork::getLcms, bo.getLcms()); @@ -102,9 +103,11 @@ public class SysRoleWorkServiceImpl extends ServiceImpl lqw = buildQueryWrapper(bo); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(SysRoleWork::getRoleId, bo.getRoleId()); - if (baseMapper.selectCount(lqw) > 0) { + lqw.eq(SysRoleWork::getProjectId, bo.getProjectId()); + List workVos = list(lqw); + if (!workVos.isEmpty()) { throw new RuntimeException("此角色已绑定流程"); } @@ -166,20 +169,37 @@ public class SysRoleWorkServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); -// lqw.eq(SysRoleWork::getRoleId, roleId); - SysRoleWorkBo sysRoleWorkBo = new SysRoleWorkBo(); - sysRoleWorkBo.setRoleId(roleId); - List list = queryList(sysRoleWorkBo); - if (list.size() >1){ - throw new RuntimeException("此角色绑定了多条流程！"); + public SysRoleWork getRoleWork(Long projectId){ + Long userId = LoginHelper.getUserId(); + + List roleList = baseMapper.getRoleList(userId,projectId); + + if (roleList == null || roleList.isEmpty()){ + return null; } - if (list != null && !list.isEmpty()){ - setValue( list); + + for (SysUserRole userRole : roleList) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(SysRoleWork::getRoleId, userRole.getRoleId()); + lqw.eq(SysRoleWork::getProjectId,projectId); + SysRoleWork one = getOne(lqw); + if (one != null){ + return one; + } } - return list.getFirst(); + return null; + +// SysRoleWorkBo sysRoleWorkBo = new SysRoleWorkBo(); +// sysRoleWorkBo.setRoleId(roleList.getFirst().getRoleId()); +// List list = queryList(sysRoleWorkBo); +// +// if (list.size() >1){ +// throw new RuntimeException("此角色绑定了多条流程！"); +// } +// if (!list.isEmpty()){ +// setValue( list); +// } +// return list.getFirst(); } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/domain/XzdBxBxsq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/domain/XzdBxBxsq.java index 72506597..d73682c6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/domain/XzdBxBxsq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/domain/XzdBxBxsq.java @@ -65,6 +65,21 @@ public class XzdBxBxsq extends BaseEntity { */ private Long xm; + /** + * 开户银行 + */ + private String khyh; + + /** + * 开户银行账号 + */ + private String khyhzh; + + /** + * 开户行户名 + */ + private String khhhm; + /** * 记账组织 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/domain/bo/XzdBxBxsqBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/domain/bo/XzdBxBxsqBo.java index 01540724..d1aba8cc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/domain/bo/XzdBxBxsqBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/domain/bo/XzdBxBxsqBo.java @@ -57,6 +57,21 @@ public class XzdBxBxsqBo extends BaseEntity { */ private Long bm; + /** + * 开户银行 + */ + private String khyh; + + /** + * 开户银行账号 + */ + private String khyhzh; + + /** + * 开户行户名 + */ + private String khhhm; + /** * 项目 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/domain/vo/XzdBxBxsqVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/domain/vo/XzdBxBxsqVo.java index a6e55357..0f86b182 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/domain/vo/XzdBxBxsqVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/domain/vo/XzdBxBxsqVo.java @@ -96,6 +96,21 @@ public class XzdBxBxsqVo implements Serializable { */ private String xmmc; + /** + * 开户银行 + */ + private String khyh; + + /** + * 开户银行账号 + */ + private String khyhzh; + + /** + * 开户行户名 + */ + private String khhhm; + /** * 记账组织 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdBusinessSeal.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdBusinessSeal.java index 0863d1ae..0014f680 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdBusinessSeal.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdBusinessSeal.java @@ -1,9 +1,10 @@ package org.dromara.xzd.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; @@ -27,6 +28,11 @@ public class XzdBusinessSeal extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 印章编号 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java index 6d3ed288..a86b29d5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java @@ -112,7 +112,7 @@ public class XzdContractDetails extends BaseEntity { /** * 预算分类 */ - private Long budgetClassification; + private String budgetClassification; /** * 收票单位 @@ -243,4 +243,24 @@ public class XzdContractDetails extends BaseEntity { */ private String htwb; + /** + * 付款额是否不能超合同额 + */ + private Long isPaymentNotExceedContract; + + /** + * 付款额不能超合同额支付比例数 + */ + private BigDecimal paymentNotExceedRatio; + + /** + * 预结算/结算额不能超合同额 + */ + private Long isPreSettlementNotExceedContract; + + /** + * 预结算/结算额不能超合同额比例 + */ + private BigDecimal preSettlementNotExceedRatio; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdBusinessSealBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdBusinessSealBo.java index 38a82af2..ed8402aa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdBusinessSealBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdBusinessSealBo.java @@ -1,10 +1,10 @@ package org.dromara.xzd.domain.bo; -import org.dromara.xzd.domain.XzdBusinessSeal; -import org.dromara.common.mybatis.core.domain.BaseEntity; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.domain.XzdBusinessSeal; /** * 印章帮助业务对象 xzd_business_seal @@ -22,6 +22,11 @@ public class XzdBusinessSealBo extends BaseEntity { */ private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 印章编号 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java index bd6b4737..0312bc79 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java @@ -122,7 +122,7 @@ public class XzdContractDetailsBo extends BaseEntity { /** * 预算分类 */ - private Long budgetClassification; + private String budgetClassification; /** * 收票单位 @@ -286,4 +286,24 @@ public class XzdContractDetailsBo extends BaseEntity { */ private String htwb; + /** + * 付款额是否不能超合同额 + */ + private Long isPaymentNotExceedContract; + + /** + * 付款额不能超合同额支付比例数 + */ + private BigDecimal paymentNotExceedRatio; + + /** + * 预结算/结算额不能超合同额 + */ + private Long isPreSettlementNotExceedContract; + + /** + * 预结算/结算额不能超合同额比例 + */ + private BigDecimal preSettlementNotExceedRatio; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdBusinessSealVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdBusinessSealVo.java index 0897de4b..97b3a85c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdBusinessSealVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdBusinessSealVo.java @@ -1,10 +1,10 @@ package org.dromara.xzd.domain.vo; -import org.dromara.xzd.domain.XzdBusinessSeal; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.xzd.domain.XzdBusinessSeal; import java.io.Serial; import java.io.Serializable; @@ -30,6 +30,11 @@ public class XzdBusinessSealVo implements Serializable { @ExcelProperty(value = "主键ID") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 印章编号 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java index b6c8b8b2..c065d3f3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java @@ -168,7 +168,7 @@ public class XzdContractDetailsVo implements Serializable { * 预算分类 */ @ExcelProperty(value = "预算分类") - private Long budgetClassification; + private String budgetClassification; /** * 预算分类对象 @@ -383,4 +383,24 @@ public class XzdContractDetailsVo implements Serializable { */ private String htwb; + /** + * 付款额是否不能超合同额 + */ + private Long isPaymentNotExceedContract; + + /** + * 付款额不能超合同额支付比例数 + */ + private BigDecimal paymentNotExceedRatio; + + /** + * 预结算/结算额不能超合同额 + */ + private Long isPreSettlementNotExceedContract; + + /** + * 预结算/结算额不能超合同额比例 + */ + private BigDecimal preSettlementNotExceedRatio; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractDetailsMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractDetailsMapper.java index 9769a820..22997f3c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractDetailsMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractDetailsMapper.java @@ -2,11 +2,9 @@ package org.dromara.xzd.mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.xzd.domain.XzdContractDetails; -import org.dromara.xzd.domain.bo.XzdContractDetailsBo; +import org.dromara.xzd.domain.vo.XzdContractChangeVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; -import java.util.List; - /** * 承包合同信息Mapper接口 * @@ -15,6 +13,6 @@ import java.util.List; */ public interface XzdContractDetailsMapper extends BaseMapperPlus { - List search(XzdContractDetailsBo bo); + XzdContractChangeVo getChangeList(Long contractCodeId); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdBusinessSealServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdBusinessSealServiceImpl.java index c560d49d..a48a5cb0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdBusinessSealServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdBusinessSealServiceImpl.java @@ -1,24 +1,30 @@ package org.dromara.xzd.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; +import lombok.extern.slf4j.Slf4j; +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.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.xzd.domain.XzdBusinessSeal; import org.dromara.xzd.domain.bo.XzdBusinessSealBo; import org.dromara.xzd.domain.vo.XzdBusinessSealVo; -import org.dromara.xzd.domain.XzdBusinessSeal; import org.dromara.xzd.mapper.XzdBusinessSealMapper; import org.dromara.xzd.service.IXzdBusinessSealService; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 印章帮助Service业务层处理 @@ -28,6 +34,7 @@ import java.util.Collection; */ @RequiredArgsConstructor @Service +@Slf4j public class XzdBusinessSealServiceImpl extends ServiceImpl implements IXzdBusinessSealService { private final XzdBusinessSealMapper baseMapper; @@ -129,4 +136,52 @@ public class XzdBusinessSealServiceImpl extends ServiceImpl 0; } + + /** + * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等) + * 正常使用只需#processEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processEvent 参数 + */ + @EventListener(condition = "#processEvent.flowCode.endsWith('XzdBusinessSeal')") + @Transactional + public void processPlansHandler(ProcessEvent processEvent) { + log.info("印章信息审核任务执行了{}", processEvent.toString()); + String id = processEvent.getBusinessId(); + XzdBusinessSeal byId = this.getById(Long.valueOf(id)); + byId.setShzt(processEvent.getStatus()); + boolean b = this.updateById(byId); + if (!b) { + log.error("印章信息审核任务更新状态失败"); + } + } + + /** + * 执行任务创建监听 + * 示例：也可通过 @EventListener(condition = "#processTaskEvent.flowCode=='leave1'")进行判断 + * 在方法中判断流程节点key + * if ("xxx".equals(processTaskEvent.getNodeCode())) { + * //执行业务逻辑 + * } + * + * @param processTaskEvent 参数 + */ + @org.springframework.context.event.EventListener(condition = "#processTaskEvent.flowCode.endsWith('XzdBusinessSeal')") + public void processTaskPlansHandlerEquipmentList(ProcessTaskEvent processTaskEvent) { + log.info("印章信息审核任务创建了{}", processTaskEvent.toString()); + } + + /** + * 监听删除流程事件 + * 正常使用只需#processDeleteEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processDeleteEvent 参数 + */ + @EventListener(condition = "#processDeleteEvent.flowCode.endsWith('XzdBusinessSeal')") + public void processDeletePlansHandlerEquipmentList(ProcessDeleteEvent processDeleteEvent) { + log.info("印章信息计划删除流程事件{}", processDeleteEvent.toString()); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java index c46d4369..82fa78eb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java @@ -121,6 +121,7 @@ public class XzdContractChangeServiceImpl extends ServiceImpl oldFileId = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); - List nowFileId = Arrays.stream(bo.getFileId().split(",")).map(Long::valueOf).toList(); - for (Long fileId : oldFileId) { - if (!nowFileId.contains(fileId)) { - sysOssService.deleteWithValidByIds(List.of(fileId), false); - } - } - } - }else { - if (old.getFileId()!= null && !old.getFileId().isEmpty()){ - List deleteIds = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); - sysOssService.deleteWithValidByIds(deleteIds, false); - } - } +// if (bo.getFileId() != null && !bo.getFileId().isEmpty()){ +// if (old.getFileId() != null) { +// List oldFileId = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); +// List nowFileId = Arrays.stream(bo.getFileId().split(",")).map(Long::valueOf).toList(); +// for (Long fileId : oldFileId) { +// if (!nowFileId.contains(fileId)) { +// sysOssService.deleteWithValidByIds(List.of(fileId), false); +// } +// } +// } +// }else { +// if (old.getFileId()!= null && !old.getFileId().isEmpty()){ +// List deleteIds = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); +// sysOssService.deleteWithValidByIds(deleteIds, false); +// } +// } return b; } 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 36a62a18..72f94ead 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 @@ -23,6 +23,7 @@ import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService; import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.bo.XzdContractDetailsBo; +import org.dromara.xzd.domain.vo.XzdContractChangeVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdProjectTypeVo; import org.dromara.xzd.domain.vo.XzdSupplierInfoVo; @@ -79,8 +80,6 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl byid = iXzdCorrespondentList.getCustomerByid(info.getPartyAUnit()); -// if (byid != null) { -// if (byid.getData().getXzdCustomerinformation() != null) { -// info.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); -// } -// } -// } + //乙方单位(供应商信息列表) if (info.getPartyBUnit() != null) { //供应商开户银行 @@ -498,22 +489,7 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl byid2 = iXzdCorrespondentList.getCustomerByid(info.getTicketReceivingUnit()); -// if (byid2 != null) { -// if (byid2.getData().getXzdCustomerinformation() != null) { -// info.setTicketReceivingUnitName(byid2.getData().getXzdCustomerinformation().getUnitName()); -// } -// } -// } + //印章名称 if (info.getSealName() != null) { List xzdBusinessInfos = new ArrayList<>(); @@ -575,20 +551,11 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl lambdaQueryWrapper5 = new LambdaQueryWrapper<>(); -// lambdaQueryWrapper5.eq(XzdContractChange::getContractCodeId, info.getId()); -// lambdaQueryWrapper5.orderByDesc(XzdContractChange::getCreateTime); -// List list5 = xzdContractChangeService.list(lambdaQueryWrapper5); -// if (list5 != null && !list5.isEmpty()){ -// info.setContractAmount(list5.getFirst().getPostChangeTotalCost()); -// } + XzdContractChangeVo changeVo = getBaseMapper().getChangeList(info.getId()); + if (changeVo != null){ + info.setContractAmount(changeVo.getPostChangeTotalCost()); + } } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/XzdSkyfkFbhtfk.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/XzdSkyfkFbhtfk.java index 606f2505..761219ab 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/XzdSkyfkFbhtfk.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/XzdSkyfkFbhtfk.java @@ -136,20 +136,20 @@ public class XzdSkyfkFbhtfk extends BaseEntity { */ private String tjzq; - /** - * 项目类型id - */ - private Long xmlxId; +// /** +// * 项目类型id +// */ +// private Long xmlxId; - /** - * 项目类型 - */ - private String xmlx; - - /** - * 项目大类 - */ - private String xmdl; +// /** +// * 项目类型 +// */ +// private String xmlx; +// +// /** +// * 项目大类 +// */ +// private String xmdl; /** * 税率 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/bo/XzdSkyfkFbhtfkBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/bo/XzdSkyfkFbhtfkBo.java index 35eb38be..b0d9396e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/bo/XzdSkyfkFbhtfkBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/bo/XzdSkyfkFbhtfkBo.java @@ -149,20 +149,20 @@ public class XzdSkyfkFbhtfkBo extends BaseEntity { */ private String tjzq; - /** - * 项目类型id - */ - private Long xmlxId; +// /** +// * 项目类型id +// */ +// private Long xmlxId; - /** - * 项目类型 - */ - private String xmlx; - - /** - * 项目大类 - */ - private String xmdl; +// /** +// * 项目类型 +// */ +// private String xmlx; +// +// /** +// * 项目大类 +// */ +// private String xmdl; /** * 税率 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java index ae6f32d1..ea43edc6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java @@ -171,11 +171,11 @@ public class XzdSkyfkFbhtfkVo implements Serializable { @ExcelProperty(value = "统计周期") private String tjzq; - /** - * 项目类型id - */ - @ExcelProperty(value = "项目类型id") - private Long xmlxId; +// /** +// * 项目类型id +// */ +// @ExcelProperty(value = "项目类型id") +// private Long xmlxId; /** * 项目类型 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java index c36846d2..c180664d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java @@ -31,7 +31,6 @@ import org.dromara.xzd.paymentsReceipts.service.impl.XzdSfkFapiaoServiceImpl; import org.dromara.xzd.paymentsReceipts.service.impl.XzdSfkFukuanServiceImpl; import org.dromara.xzd.service.impl.XzdProjectServiceImpl; import org.dromara.xzd.service.impl.XzdProjectTypeServiceImpl; -import org.dromara.xzd.service.impl.XzdSupplierInfoServiceImpl; import org.dromara.xzd.service.impl.XzdSupplierOpenBankServiceImpl; import org.dromara.xzd.skyfk.fbhtfk.domain.XzdSkyfkFbhtfk; import org.dromara.xzd.skyfk.fbhtfk.domain.bo.XzdSkyfkFbhtfkBo; @@ -70,8 +69,8 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl - + select * from xzd_contract_change where contract_code_id = #{contractCodeId} order by create_time desc limit 1 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml index b2cb8425..792ea3e2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml @@ -33,6 +33,7 @@ profile.country as gj, profile.province as sheng, profile.city as cs, + user2.nick_name as managerResponsibleName, user3.nick_name as lrr, project.create_time as createTime, project.project_amount as projectAmount, @@ -45,6 +46,7 @@ FROM xzd_project as project LEFT JOIN xzd_project_profile as profile ON project.id = profile.xzd_project_id + LEFT JOIN sys_user as user2 ON project.manager_responsible = user2.user_id LEFT JOIN sys_user as user3 ON project.create_by = user3.user_id LEFT JOIN sys_dept as dept ON project.management_organization = dept.dept_id LEFT JOIN xzd_project_type as type ON project.project_type = type.id