From 9221cb50a3f7b4640f0660aedcd46536fcb4f5f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Tue, 11 Nov 2025 17:10:33 +0800
Subject: [PATCH] =?UTF-8?q?11-11-=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysRoleWorkController.java     |  9 +++++++
 .../service/impl/SysRoleWorkServiceImpl.java  | 22 +++++++++++++++++
 .../impl/XzdContractChangeServiceImpl.java    |  4 ++--
 .../impl/XzdContractDetailsServiceImpl.java   |  2 +-
 .../XzdContractTerminationServiceImpl.java    |  2 +-
 .../controller/XzdSkyfkFbhtfkController.java  |  5 ++++
 .../skyfk/fbhtfk/domain/XzdSkyfkFbhtfk.java   | 10 ++++++++
 .../fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java    | 11 +++++++++
 .../impl/XzdSkyfkFbhtfkServiceImpl.java       | 24 +++++++++----------
 9 files changed, 73 insertions(+), 16 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 4cef8661..d49dfbd8 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
@@ -19,6 +19,7 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.vo.SysRoleVo;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -105,6 +106,14 @@ public class SysRoleWorkController extends BaseController {
         return toAjax(sysRoleWorkService.deleteWithValidByIds(List.of(ids), true));
     }
 
+    /**
+     * 获取当前用户角色列表
+     */
+    @GetMapping("/getRoleList/{projectId}")
+    public R<List<SysRoleVo>> getRoleList(@PathVariable("projectId") Long projectId) {
+        return R.ok(sysRoleWorkService.getRoleList(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 525407ba..7f3a6e8e 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
@@ -166,6 +166,28 @@ public class SysRoleWorkServiceImpl extends ServiceImpl<SysRoleWorkMapper, SysRo
         }
     }
 
+    public List<SysRoleVo> getRoleList(Long projectId){
+        Long userId = LoginHelper.getUserId();
+        List<SysUserRole> list = baseMapper.getRoleList(userId,projectId);
+        List<SysRoleVo> roleList = new ArrayList<>();
+        for (SysUserRole sysUserRole : list) {
+
+            LambdaQueryWrapper<SysRoleWork> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(SysRoleWork::getRoleId, sysUserRole.getRoleId());
+            lqw.eq(SysRoleWork::getProjectId,projectId);
+            SysRoleWork one = getOne(lqw);
+
+            if (one != null){
+                SysRoleVo sysRoleVo = roleService.selectRoleById(sysUserRole.getRoleId());
+                if (sysRoleVo != null){
+                    roleList.add(sysRoleVo);
+                }
+            }
+
+        }
+        return roleList;
+    }
+
     /**
      * 根据当前登录人获取角色流程对应
      */
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 82fa78eb..d332af51 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
@@ -173,10 +173,10 @@ public class XzdContractChangeServiceImpl extends ServiceImpl<XzdContractChangeM
 
         XzdContractDetails byId = xzdContractDetailsService.getById(bo.getContractCodeId());
         if (byId != null){
-            if (byId.getHtzt().equals("已终止")){
+            if (byId.getHtzt().equals("终止")){
                 throw new RuntimeException("该合同已被终止");
             }else {
-                byId.setHtzt("已变更");
+                byId.setHtzt("变更");
                 xzdContractDetailsService.updateById(byId);
             }
         }
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 72f94ead..b3184ef5 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
@@ -251,7 +251,7 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
 
         XzdContractDetailsVo old = queryById(update.getId());
 
-        if (bo.getHtzt().equals("已终止")){
+        if (bo.getHtzt().equals("终止")){
             throw new RuntimeException("该合同已被终止!");
         }
 
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java
index d032a9cf..8cbb5b58 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java
@@ -135,7 +135,7 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
         }
         XzdContractDetails detailsVo = xzdContractDetailsService.getById(bo.getContractNumber());
         if (detailsVo != null){
-            detailsVo.setHtzt("已终止");
+            detailsVo.setHtzt("终止");
             xzdContractDetailsService.updateById(detailsVo);
         }
         return flag;
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java
index 9d395503..5d73bdab 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java
@@ -103,4 +103,9 @@ public class XzdSkyfkFbhtfkController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(xzdSkyfkFbhtfkService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    /**
+     * 根据合同id获取分包付款累计开票金额
+     */
+
 }
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 761219ab..f4ce43db 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
@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
@@ -271,5 +272,14 @@ public class XzdSkyfkFbhtfk extends BaseEntity {
      */
     private String fileId;
 
+    /**
+     * 本次开票金额
+     */
+    private BigDecimal bckpje;
+
+    /**
+     * 累计开票金额
+     */
+    private BigDecimal ljkpje;
 
 }
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 ea43edc6..beafeb71 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
@@ -13,6 +13,7 @@ import org.dromara.xzd.skyfk.fbhtfk.domain.XzdSkyfkFbhtfk;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
 
@@ -343,4 +344,14 @@ public class XzdSkyfkFbhtfkVo implements Serializable {
      */
     List<XzdSfkFukuanVo> fkxx;
 
+    /**
+     * 本次开票金额
+     */
+    private BigDecimal bckpje;
+
+    /**
+     * 累计开票金额
+     */
+    private BigDecimal ljkpje;
+
 }
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 c180664d..07a295d1 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
@@ -42,6 +42,7 @@ import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -376,18 +377,6 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
                     vo.setSkdwYh(xzdSupplierOpenBankVo.getOpenBank());
                 }
             }
-            //项目类型
-//            if (vo.getXmlxId() != null){
-//                XzdProjectType projectTypeVo = xzdProjectTypeService.getBaseMapper().selectById(vo.getXmlxId());
-//                if (projectTypeVo != null){
-//                    vo.setXmlx(projectTypeVo.getTypeName());
-//                }
-//                //项目大类
-//                XzdProjectTypeVo bigType = xzdProjectTypeService.getBigType(projectTypeVo.getId());
-//                if (bigType != null){
-//                    vo.setXmdl(bigType.getTypeName());
-//                }
-//            }
             //付款信息
             XzdSfkFukuanBo bo = new XzdSfkFukuanBo();
             bo.setMainDocumentId(vo.getId());
@@ -405,6 +394,17 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
         }
     }
 
+    /**
+     * 格局分包合同id获取分包合同付款累计开票金额
+     */
+    public BigDecimal getLJKPJE(Long contractId) {
+        XzdSubcontract info = xzdSubcontract.getBaseMapper().selectById(contractId);
+        if (info == null){
+            return new BigDecimal("0");
+        }
+        return null;
+    }
+
     /**
      * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)
      * 正常使用只需#processEvent.flowCode=='leave1'