新中大综合服务合同优化

xinnengyuan/ruoyi-admin/src/main/resources/application.yml

@@ -304,7 +304,8 @@ xss:
     - /system/notice
     - /warm-flow/save-xml
     - /project/project
-    - /xzd/**
+    - /comprehensive/csContractChange
+    - /comprehensive/csContractInformation
 
 # 全局线程池相关配置
 # 如使用JDK21请直接使用虚拟线程 不要开启此配置

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java

@@ -1252,159 +1252,159 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
 //        projectVos.add(create("台湾省", "台北", 25.0330, 121.5654, 1));
 
         // 1号项目
-        projectVos.add(create("贵州省", "都匀市沙包堡匀东农业光伏电站项目", 26.2556, 107.5139, 1));
+        projectVos.add(create("贵州省", "都匀市沙包堡匀东农业光伏电站项目", 26.2556, 107.5139, 1,"118.0452MWp"));
 
 // 2号项目
-        projectVos.add(create("贵州省", "长顺县朝核农业光伏电站", 26.1833, 106.4522, 1));
+        projectVos.add(create("贵州省", "长顺县朝核农业光伏电站", 26.1833, 106.4522, 1,"99.84MW"));
 
 // 3号项目
-        projectVos.add(create("重庆市", "重庆无水港绿色低碳能源项目", 29.533155, 106.504962, 1));
+        projectVos.add(create("重庆市", "重庆无水港绿色低碳能源项目", 29.533155, 106.504962, 1,"2.598MW"));
 
 // 4号项目
-        projectVos.add(create("贵州省", "兴义市捧乍猪场坪农业光伏电站项目", 25.1467, 104.8925, 1));
+        projectVos.add(create("贵州省", "兴义市捧乍猪场坪农业光伏电站项目", 25.1467, 104.8925, 1,"100MW"));
 
 // 5号项目
-        projectVos.add(create("贵州省", "华能盘州市羊场高光村、松林农业光伏发电项目", 25.7833, 104.6583, 1));
+        projectVos.add(create("贵州省", "华能盘州市羊场高光村、松林农业光伏发电项目", 25.7833, 104.6583, 1,"200MW"));
 
 // 6号项目
-        projectVos.add(create("贵州省", "大唐(六盘水)新能源有限公司水城区化乐农业光伏电站项目", 26.5167, 104.8289, 1));
+        projectVos.add(create("贵州省", "大唐(六盘水)新能源有限公司水城区化乐农业光伏电站项目", 26.5167, 104.8289, 1,"99.84MW"));
 
 // 7号项目
-        projectVos.add(create("广西壮族自治区", "河池市宜州区北牙瑶族乡100MWp农光互补光伏发电项目", 24.6833, 108.6958, 1));
+        projectVos.add(create("广西壮族自治区", "河池市宜州区北牙瑶族乡100MWp农光互补光伏发电项目", 24.6833, 108.6958, 1,"101.34MWp"));
 
 // 8号项目
-        projectVos.add(create("四川省", "凉山木里茶布朗光伏发电项目220kV升压站设计施工总承包项目", 27.9167, 100.3250, 1));
+        projectVos.add(create("四川省", "凉山木里茶布朗光伏发电项目220kV升压站设计施工总承包项目", 27.9167, 100.3250, 1,"220kV"));
 
 // 9号项目
-        projectVos.add(create("内蒙古自治区", "土默特右旗英能光伏电力开发有限公司100兆瓦光伏基地项目", 40.5333, 110.5489, 1));
+        projectVos.add(create("内蒙古自治区", "土默特右旗英能光伏电力开发有限公司100兆瓦光伏基地项目", 40.5333, 110.5489, 1,"100MWp"));
 
 // 10号项目
-        projectVos.add(create("云南省", "云南沾益农业光伏项目", 25.5000, 103.8194, 1));
+        projectVos.add(create("云南省", "云南沾益农业光伏项目", 25.5000, 103.8194, 1,"350MWp"));
 
 // 11号项目
-        projectVos.add(create("贵州省", "威宁县盐仓老鸦营30MW农业光伏电站项目", 26.8833, 104.2250, 1));
+        projectVos.add(create("贵州省", "威宁县盐仓老鸦营30MW农业光伏电站项目", 26.8833, 104.2250, 1,"30MW"));
 
 // 12号项目
-        projectVos.add(create("云南省", "大黑土光伏电站总承包工程项目", 25.0406, 102.7142, 1));
+        projectVos.add(create("云南省", "大黑土光伏电站总承包工程项目", 25.0406, 102.7142, 1,"272.97MW"));
 
 // 13号项目
-        projectVos.add(create("贵州省", "晴隆县碧痕新坪村风光火储一体化农业光伏电站", 25.5333, 105.1250, 1));
+        projectVos.add(create("贵州省", "晴隆县碧痕新坪村风光火储一体化农业光伏电站", 25.5333, 105.1250, 1,"/"));
 
 // 15号项目
-        projectVos.add(create("河北省", "怀安县风光储一体化项目", 40.6667, 114.5417, 1));
+        projectVos.add(create("河北省", "怀安县风光储一体化项目", 40.6667, 114.5417, 1,"200MW"));
 
 // 16号项目
-        projectVos.add(create("云南省", "保山市隆阳区黑岩洼光伏发电项目", 25.1250, 99.1667, 1));
+        projectVos.add(create("云南省", "保山市隆阳区黑岩洼光伏发电项目", 25.1250, 99.1667, 1,"100MW"));
 
 // 17号项目
-        projectVos.add(create("云南省", "白玉光伏发电项目", 25.1250, 99.1667, 1));
+        projectVos.add(create("云南省", "白玉光伏发电项目", 25.1250, 99.1667, 1,"340MW"));
 
 // 20号项目
-        projectVos.add(create("云南省", "云南省沾益区菱角农业光伏发电项目", 25.6000, 103.6833, 1));
+        projectVos.add(create("云南省", "云南省沾益区菱角农业光伏发电项目", 25.6000, 103.6833, 1,"350MWp"));
 
 // 21号项目
-        projectVos.add(create("云南省", "云南省文山州砚山县平远光伏发电项目", 23.7500, 104.3333, 1));
+        projectVos.add(create("云南省", "云南省文山州砚山县平远光伏发电项目", 23.7500, 104.3333, 1,"120MW"));
 
 // 22号项目
-        projectVos.add(create("贵州省", "兴仁市大山能投农业光伏电站项目", 25.4000, 105.1833, 1));
+        projectVos.add(create("贵州省", "兴仁市大山能投农业光伏电站项目", 25.4000, 105.1833, 1,"100MW"));
 
 // 23号项目
-        projectVos.add(create("贵州省", "兴仁市潘家庄能投农业光伏电站项目", 25.5333, 104.9833, 1));
+        projectVos.add(create("贵州省", "兴仁市潘家庄能投农业光伏电站项目", 25.5333, 104.9833, 1,"100MW"));
 
 // 47号项目
-        projectVos.add(create("重庆市", "丰都许明寺镇100MW农牧光互补复合项目", 29.9333, 107.7500, 1));
+        projectVos.add(create("重庆市", "丰都许明寺镇100MW农牧光互补复合项目", 29.9333, 107.7500, 1,"100MW"));
 
 // 48号项目
-        projectVos.add(create("云南省", "文山市茂克光伏电站项目", 23.3667, 104.2000, 1));
+        projectVos.add(create("云南省", "文山市茂克光伏电站项目", 23.3667, 104.2000, 1,"90.2MW"));
 
 // 50号项目
-        projectVos.add(create("云南省", "文山市清水井光伏电站项目", 23.4500, 104.3333, 1));
+        projectVos.add(create("云南省", "文山市清水井光伏电站项目", 23.4500, 104.3333, 1,"120.25MW"));
 
 // 52号项目（原序号1）
-        projectVos.add(create("广西壮族自治区", "新铝电力新山站屋顶分布式光伏发电项目EPC总承包", 22.8241, 108.3178, 1));
+        projectVos.add(create("广西壮族自治区", "新铝电力新山站屋顶分布式光伏发电项目EPC总承包", 22.8241, 108.3178, 1,"0.3MWp"));
 
 // 53号项目（原序号2）
-        projectVos.add(create("江西省", "江西省高速公路服务区分布式光伏项目EPC", 28.6764, 115.8922, 1));
+        projectVos.add(create("江西省", "江西省高速公路服务区分布式光伏项目EPC", 28.6764, 115.8922, 1,"120.12MWp"));
 
 // 54号项目（原序号3）
-        projectVos.add(create("河南省", "龙佰集团股份有限公司7MWp分布式光伏发电项目EPC总承包", 34.7573, 113.6145, 1));
+        projectVos.add(create("河南省", "龙佰集团股份有限公司7MWp分布式光伏发电项目EPC总承包", 34.7573, 113.6145, 1,"8.4MWp"));
 
 // 55号项目（原序号4）
-        projectVos.add(create("吉林省", "吉林热电检修安装工程有限公司吉林省南湖宾馆光储充一体化项目EPC总承包", 43.8868, 125.3245, 1));
+        projectVos.add(create("吉林省", "吉林热电检修安装工程有限公司吉林省南湖宾馆光储充一体化项目EPC总承包", 43.8868, 125.3245, 1,"400kW"));
 
 // 56号项目（原序号5）
-        projectVos.add(create("吉林省", "集安市瀚能风电场相关装备有限公司益盛汉参集团分布式光伏发电项目EPC", 41.1333, 126.1650, 1));
+        projectVos.add(create("吉林省", "集安市瀚能风电场相关装备有限公司益盛汉参集团分布式光伏发电项目EPC", 41.1333, 126.1650, 1,"3.50784MW"));
 
 // 57号项目（原序号6）
-        projectVos.add(create("重庆市", "重庆潼南综合智慧零碳电厂耀辉环保单元项目", 30.1550, 106.2289, 1));
+        projectVos.add(create("重庆市", "重庆潼南综合智慧零碳电厂耀辉环保单元项目", 30.1550, 106.2289, 1,"2.9MW"));
 
 // 58号项目（原序号7）
-        projectVos.add(create("重庆市", "汇智能源公司重庆永川综合智慧零碳电厂", 29.4167, 105.7833, 1));
+        projectVos.add(create("重庆市", "汇智能源公司重庆永川综合智慧零碳电厂", 29.4167, 105.7833, 1,"2MW"));
 
 // 59号项目（原序号8）
-        projectVos.add(create("广西壮族自治区", "德保县乡村振兴光伏发电项目（第二批）EPC 总承包", 23.7167, 106.6833, 1));
+        projectVos.add(create("广西壮族自治区", "德保县乡村振兴光伏发电项目（第二批）EPC 总承包", 23.7167, 106.6833, 1,"44.775MW"));
 
 // 60号项目（原序号9）
-        projectVos.add(create("重庆市", "汇智能源公司重庆永川综合智慧零碳电厂升科精锻单元项目工程EPC总承包工程（一期）", 29.4167, 105.7833, 1));
+        projectVos.add(create("重庆市", "汇智能源公司重庆永川综合智慧零碳电厂升科精锻单元项目工程EPC总承包工程（一期）", 29.4167, 105.7833, 1,"/"));
 
 // 62号项目（原序号11）
-        projectVos.add(create("贵州省", "新铝电力莲塘、马隘变电站屋顶分布式光伏发电项目EPC工程总承包项目", 23.7833, 106.9500, 1));
+        projectVos.add(create("贵州省", "新铝电力莲塘、马隘变电站屋顶分布式光伏发电项目EPC工程总承包项目", 23.7833, 106.9500, 1,"0.788MW"));
 
 // 63号项目（原序号12）
-        projectVos.add(create("广西壮族自治区", "广西德保县乡村振兴光伏发电项目（第三批）EPC总承包", 23.7167, 106.6833, 1));
+        projectVos.add(create("广西壮族自治区", "广西德保县乡村振兴光伏发电项目（第三批）EPC总承包", 23.7167, 106.6833, 1,"191MW(直流侧装机容量243.9007MWp)"));
 
 // 64号项目（原序号13）
-        projectVos.add(create("内蒙古自治区", "内蒙古自治区蒙西户用分布式200MW光伏发电项目EPC总承包四期", 40.6667, 109.8333, 1));
+        projectVos.add(create("内蒙古自治区", "内蒙古自治区蒙西户用分布式200MW光伏发电项目EPC总承包四期", 40.6667, 109.8333, 1,"200MW"));
 
 // 65号项目（原序号14）
-        projectVos.add(create("广东省", "惠来县50MWp居民屋顶分布式光伏项目", 23.0333, 116.2833, 1));
+        projectVos.add(create("广东省", "惠来县50MWp居民屋顶分布式光伏项目", 23.0333, 116.2833, 1,"50MWp"));
 
 // 66号项目（原序号15）
-        projectVos.add(create("广西壮族自治区", "田东县乡村振兴分布式光伏发电项目（二期）EPC总承包", 23.6167, 106.9167, 1));
+        projectVos.add(create("广西壮族自治区", "田东县乡村振兴分布式光伏发电项目（二期）EPC总承包", 23.6167, 106.9167, 1,"92MW"));
 
 // 67号项目（原序号16）
-        projectVos.add(create("广西壮族自治区", "田东县乡村振兴分布式光伏发电项目（一期）EPC总承包", 23.6167, 106.9167, 1));
+        projectVos.add(create("广西壮族自治区", "田东县乡村振兴分布式光伏发电项目（一期）EPC总承包", 23.6167, 106.9167, 1,"203MW"));
 
 // 68号项目（原序号17）
-        projectVos.add(create("重庆市", "华能重庆华通电脑有限公司屋顶分布式光伏EPC项目合同", 29.533155, 106.504962, 1));
+        projectVos.add(create("重庆市", "华能重庆华通电脑有限公司屋顶分布式光伏EPC项目合同", 29.533155, 106.504962, 1,"10.2245MWp"));
 
 // 69号项目（原序号18）
-        projectVos.add(create("广东省", "大埔峡能白罗20MW、长兴20MW、洋门10MW、群丰10MW农光互补光伏发电项目", 24.3667, 116.7000, 1));
+        projectVos.add(create("广东省", "大埔峡能白罗20MW、长兴20MW、洋门10MW、群丰10MW农光互补光伏发电项目", 24.3667, 116.7000, 1,"60MWp"));
 
 // 70号项目（原序号19）
-        projectVos.add(create("广东省", "化州区域分布式光伏项目", 21.7000, 110.6333, 1));
+        projectVos.add(create("广东省", "化州区域分布式光伏项目", 21.7000, 110.6333, 1,"15MWp"));
 
 // 71号项目（原序号20）
-        projectVos.add(create("河北省", "兴隆县10MW分布式光伏项目", 40.4167, 117.4833, 1));
+        projectVos.add(create("河北省", "兴隆县10MW分布式光伏项目", 40.4167, 117.4833, 1,"5.99MW"));
 
 // 75号项目（原序号24）
-        projectVos.add(create("重庆市", "石柱发电公司厂区分布式光伏施工项目", 29.9333, 108.1333, 1));
+        projectVos.add(create("重庆市", "石柱发电公司厂区分布式光伏施工项目", 29.9333, 108.1333, 1,"0.9MW"));
 
 // 76号项目（原序号25）
-        projectVos.add(create("陕西省", "靖边燃气发电厂3.0MW光伏发电工程", 37.6167, 108.7833, 1));
+        projectVos.add(create("陕西省", "靖边燃气发电厂3.0MW光伏发电工程", 37.6167, 108.7833, 1,"3MWp"));
 
 // 77号项目（原序号26）
-        projectVos.add(create("河北省", "河北兴隆 10MW分布式光伏项目", 40.4167, 117.4833, 1));
+        projectVos.add(create("河北省", "河北兴隆 10MW分布式光伏项目", 40.4167, 117.4833, 1,"4MW"));
 
 // 79号项目（原序号28）
-        projectVos.add(create("广东省", "茂名分公司化工区物资仓库屋顶光伏发电合同能源管理项目", 21.6833, 110.8667, 1));
+        projectVos.add(create("广东省", "茂名分公司化工区物资仓库屋顶光伏发电合同能源管理项目", 21.6833, 110.8667, 1,"1.855MWp"));
 
 // 88号项目（原序号37）
-        projectVos.add(create("河北省", "怀安县风光储一体化项目", 40.6667, 114.5417, 1));
+        projectVos.add(create("河北省", "怀安县风光储一体化项目", 40.6667, 114.5417, 1,"200MW"));
 
 // 91号项目（原序号2）
-        projectVos.add(create("辽宁省", "鑫泰新能源大石桥市200MW风电场新建工程项目", 40.6333, 122.5333, 2));
+        projectVos.add(create("辽宁省", "鑫泰新能源大石桥市200MW风电场新建工程项目", 40.6333, 122.5333, 2,"200MW"));
 
 // 92号项目（原序号3）
-        projectVos.add(create("辽宁省", "大石桥市冠程新能源550MW风电场工程项目", 40.6333, 122.5333, 2));
+        projectVos.add(create("辽宁省", "大石桥市冠程新能源550MW风电场工程项目", 40.6333, 122.5333, 2,"550MW"));
 
 // 96号项目（原序号7）
-        projectVos.add(create("四川省", "阿坝公司运检大楼“风光油储型”微电网试点项目", 31.9500, 102.2167, 2));
+        projectVos.add(create("四川省", "阿坝公司运检大楼“风光油储型”微电网试点项目", 31.9500, 102.2167, 2,"0.6MW"));
 
         // 老挝 - 万象
-        projectVos.add(create("老挝", "巴塞", 15.110507, 105.817291, 1));
+        projectVos.add(create("老挝", "巴塞", 15.110507, 105.817291, 1,"1000MW"));
         // 老挝 - 琅勃拉邦
-        projectVos.add(create("老挝", "波利坎塞", 18.39639, 103.65583, 1));
+        projectVos.add(create("老挝", "波利坎塞", 18.39639, 103.65583, 1,"50.1MW"));
         Map<String, Map<String, Map<String, String>>> map = new HashMap<>();
         for (SysDictDataVo projectType : projectTypes) {
             Map<String, Map<String, String>> map1 = new HashMap<>();
@@ -1539,7 +1539,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
      * @param projectType 项目类型
      * @return 项目信息
      */
-    private static BusProjectVo create(String province, String name, double lat, double lng, Integer projectType) {
+    private static BusProjectVo create(String province, String name, double lat, double lng, Integer projectType,String plan) {
         BusProjectVo vo = new BusProjectVo();
         vo.setId(IdWorker.getID());
         vo.setProvince(province);
@@ -1547,6 +1547,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
         vo.setLat(String.valueOf(lat));
         vo.setLng(String.valueOf(lng));
         vo.setProjectType(projectType.toString());
+        vo.setPlan(plan);
         return vo;
     }
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/XzdCsContractChange.java

@@ -192,6 +192,11 @@ public class XzdCsContractChange extends BaseEntity {
      */
     private BigDecimal contractCumulativeChangeAmount;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 单据引用
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/XzdCsContractInformation.java

@@ -227,6 +227,11 @@ public class XzdCsContractInformation extends BaseEntity {
      */
     private BigDecimal budgetNotExceedRatio;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 单据引用
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractChangeBo.java

@@ -205,6 +205,10 @@ public class XzdCsContractChangeBo extends BaseEntity {
      * 单据引用
      */
     private String documentReference;
+    /**
+     * 合同文本
+     */
+    private String contractText;
 
     /**
      * 文件id

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractInformationBo.java

@@ -245,6 +245,11 @@ public class XzdCsContractInformationBo extends BaseEntity {
      */
     private BigDecimal budgetNotExceedRatio;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 单据引用
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java

@@ -249,6 +249,11 @@ public class XzdCsContractChangeVo implements Serializable {
     @ExcelProperty(value = "合同累计变更金额")
     private BigDecimal contractCumulativeChangeAmount;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 单据引用
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractInformationVo.java

@@ -223,6 +223,7 @@ public class XzdCsContractInformationVo implements Serializable {
      */
     @ExcelProperty(value = "项目责任人")
     private Long projectOwner;
+    private String projectOwnerName;
 
     /**
      * WBS编码
@@ -298,6 +299,11 @@ public class XzdCsContractInformationVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "%=")
     private BigDecimal budgetNotExceedRatio;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 单据引用
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.system.domain.vo.SysDeptVo;
+import org.dromara.system.service.ISysDeptService;
 import org.dromara.system.service.ISysUserService;
 import org.dromara.system.service.impl.SysDeptServiceImpl;
 import org.dromara.system.service.impl.SysOssServiceImpl;
@@ -63,6 +64,8 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
     private SysOssServiceImpl sysOssService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
 
     @Autowired
@@ -348,7 +351,7 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
             }
         }
         //签约组织(客户信息列表)
-        String dtoR = iXzdCorrespondentList.queryNameById(item.getOrganization());
+        String dtoR = sysDeptService.selectDeptNameById(item.getOrganization());
         if (dtoR!=null){
             item.setOrganizationName(dtoR);
         }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractInformationServiceImpl.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.utils.BatchNumberGenerator;
 import org.dromara.system.domain.vo.SysDeptVo;
+import org.dromara.system.service.ISysUserService;
 import org.dromara.system.service.impl.SysDeptServiceImpl;
 import org.dromara.system.service.impl.SysOssServiceImpl;
 import org.dromara.xzd.comprehensive.domain.XzdCsContractSuspendZfkx;
@@ -77,6 +78,9 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
     @Autowired
     private IXzdHtglHtbgqdService xzdHtglHtbgqdService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 查询综合服务合同信息
      *
@@ -159,7 +163,7 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
         //签约组织(客户信息列表)
 
         if (item.getSignOrganization() != null){
-            String byid = iXzdCorrespondentList.queryNameById(item.getSignOrganization());
+            String byid = sysDeptService.selectDeptNameById(item.getSignOrganization());
             if (byid!=null){
                 item.setSignOrganizationName(byid);
             }
@@ -193,6 +197,13 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
                 item.setInvoiceReceiverName(byid);
             }
         }
+        //项目负责人
+        if (item.getProjectOwner() != null){
+            String s = sysUserService.queryNameById(item.getProjectOwner());
+            if (s!=null){
+                item.setProjectOwnerName(s);
+            }
+        }
     }
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/service/impl/XzdSfkCaigouFkServiceImpl.java

@@ -112,7 +112,7 @@ public class XzdSfkCaigouFkServiceImpl extends ServiceImpl<XzdSfkCaigouFkMapper,
         LambdaQueryWrapper<XzdSfkCaigouFk> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(XzdSfkCaigouFk::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdSfkCaigouFk::getDocCode, bo.getDocCode());
-        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdSfkCaigouFk::getTitle, bo.getTitle());
+        lqw.like(StringUtils.isNotBlank(bo.getTitle()), XzdSfkCaigouFk::getTitle, bo.getTitle());
         lqw.eq(bo.getDocDate() != null, XzdSfkCaigouFk::getDocDate, bo.getDocDate());
         lqw.eq(bo.getContractCode() != null, XzdSfkCaigouFk::getContractCode, bo.getContractCode());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdSfkCaigouFk::getContractName, bo.getContractName());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/service/impl/XzdSfkZonhefuwuFkServiceImpl.java

@@ -111,7 +111,7 @@ public class XzdSfkZonhefuwuFkServiceImpl extends ServiceImpl<XzdSfkZonhefuwuFkM
         LambdaQueryWrapper<XzdSfkZonhefuwuFk> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(XzdSfkZonhefuwuFk::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdSfkZonhefuwuFk::getDocCode, bo.getDocCode());
-        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdSfkZonhefuwuFk::getTitle, bo.getTitle());
+        lqw.like(StringUtils.isNotBlank(bo.getTitle()), XzdSfkZonhefuwuFk::getTitle, bo.getTitle());
         lqw.eq(bo.getDocDate() != null, XzdSfkZonhefuwuFk::getDocDate, bo.getDocDate());
         lqw.eq(bo.getContractCode() != null, XzdSfkZonhefuwuFk::getContractCode, bo.getContractCode());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdSfkZonhefuwuFk::getContractName, bo.getContractName());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJinduServiceImpl.java

@@ -123,7 +123,7 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl<XzdJsCgJinduMapper, Xzd
         LambdaQueryWrapper<XzdJsCgJindu> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(XzdJsCgJindu::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdJsCgJindu::getDocCode, bo.getDocCode());
-        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdJsCgJindu::getTitle, bo.getTitle());
+        lqw.like(StringUtils.isNotBlank(bo.getTitle()), XzdJsCgJindu::getTitle, bo.getTitle());
         lqw.eq(bo.getDocDate() != null, XzdJsCgJindu::getDocDate, bo.getDocDate());
         lqw.eq(bo.getContractCode() != null, XzdJsCgJindu::getContractCode, bo.getContractCode());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdJsCgJindu::getContractName, bo.getContractName());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonEditServiceImpl.java

@@ -115,7 +115,7 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl<XzdJsCgJungonEditM
         LambdaQueryWrapper<XzdJsCgJungonEdit> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(XzdJsCgJungonEdit::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdJsCgJungonEdit::getDocCode, bo.getDocCode());
-        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdJsCgJungonEdit::getTitle, bo.getTitle());
+        lqw.like(StringUtils.isNotBlank(bo.getTitle()), XzdJsCgJungonEdit::getTitle, bo.getTitle());
         lqw.eq(bo.getDocDate() != null, XzdJsCgJungonEdit::getDocDate, bo.getDocDate());
         lqw.eq(bo.getFinalAccountCode() != null, XzdJsCgJungonEdit::getFinalAccountCode, bo.getFinalAccountCode());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdJsCgJungonEdit::getContractName, bo.getContractName());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonServiceImpl.java

@@ -114,7 +114,7 @@ public class XzdJsCgJungonServiceImpl extends ServiceImpl<XzdJsCgJungonMapper, X
         LambdaQueryWrapper<XzdJsCgJungon> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(XzdJsCgJungon::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdJsCgJungon::getDocCode, bo.getDocCode());
-        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdJsCgJungon::getTitle, bo.getTitle());
+        lqw.like(StringUtils.isNotBlank(bo.getTitle()), XzdJsCgJungon::getTitle, bo.getTitle());
         lqw.eq(bo.getDocDate() != null, XzdJsCgJungon::getDocDate, bo.getDocDate());
         lqw.eq(bo.getContractCode() != null, XzdJsCgJungon::getContractCode, bo.getContractCode());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdJsCgJungon::getContractName, bo.getContractName());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsZhfwJinduServiceImpl.java

@@ -121,7 +121,7 @@ public class XzdJsZhfwJinduServiceImpl extends ServiceImpl<XzdJsZhfwJinduMapper,
         LambdaQueryWrapper<XzdJsZhfwJindu> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(XzdJsZhfwJindu::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdJsZhfwJindu::getDocCode, bo.getDocCode());
-        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdJsZhfwJindu::getTitle, bo.getTitle());
+        lqw.like(StringUtils.isNotBlank(bo.getTitle()), XzdJsZhfwJindu::getTitle, bo.getTitle());
         lqw.eq(bo.getDocDate() != null, XzdJsZhfwJindu::getDocDate, bo.getDocDate());
         lqw.eq(bo.getContractCode() != null, XzdJsZhfwJindu::getContractCode, bo.getContractCode());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdJsZhfwJindu::getContractName, bo.getContractName());