fix项目成本材料预算、外协预算，配置文件

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -138,9 +138,9 @@ spring:
           url: jdbc:mysql://152.136.206.27:3306/kezhikeshiceshi?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: itdm-boot
           password: itdm-boot@2023
+          driver-class-name: com.mysql.cj.jdbc.Driver
 #          username: root
 #          password: 302201
-          driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
           #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -134,10 +134,12 @@ spring:
           username: root
           password: Xinxi513513
           driver-class-name: com.mysql.cj.jdbc.Driver
+#          password: Xinxi513513
         slave:  # 第二个数据源
           url: jdbc:mysql://127.0.0.1:3306/look?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: Xinxi513513
+          driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
           #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai

module_kzks/src/main/java/org/jeecg/modules/projectCost/mapper/xml/ProjectCostMapper.xml

@@ -8,7 +8,7 @@
                c.one_income,c.one_cost,c.one_profit,c.lre,c.lrl,c.EstimationCoat,c.contractfpe,c.TaskMoney,c.zcb,
                c.clf ,c.zyf,c.swf,c.wxf,c.rldlf,c.gdzczj,c.gzjlwf,c.glf,IFNULL(c.zjcb,m.value) AS zjcb,c.lbsy ,
                c.workhour,c.zrbm,c.jycsid,c.jycs ,c.hxzxid,c. hxzxname ,c.tasktype,c.AuditPrice,c.iflag,c.Brief,
-               c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.BusinessMan,c.sjgs,c.scgs,c.status,c.proportion,c.clys,c.wxys,
+               c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.BusinessMan,c.sjgs,c.scgs,c.status,c.proportion,
                ys.clys, ys.wxys, 2 as ji
         from kzks_project_cost c
         left join mes_info_installationcost m on  m.taskno = #{taskno}
@@ -22,11 +22,11 @@
                c.one_income,c.one_cost,c.one_profit,c.lre,c.lrl,c.EstimationCoat,c.contractfpe,c.TaskMoney,c.zcb,
                c.clf ,c.zyf,c.swf,c.wxf,c.rldlf,c.gdzczj,c.gzjlwf,c.glf,IFNULL(c.zjcb,m.value) AS zjcb,c.lbsy ,
                c.workhour,c.zrbm,c.jycsid,c.jycs ,c.hxzxid,c. hxzxname ,c.tasktype,c.AuditPrice,c.iflag,c.Brief,
-               c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.BusinessMan,c.sjgs,c.scgs,c.status,c.proportion,c.clys,c.wxys,
+               c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.BusinessMan,c.sjgs,c.scgs,c.status,c.proportion,
                ys.clys, ys.wxys, 2 as ji
         from kzks_project_cost c
-                 left join mes_info_installationcost m on m.taskno = #{taskno}
-                 left join kzks_project_cost_ys ys on ys.taskno = #{taskno}
+                 left join mes_info_installationcost m on m.taskno = c.taskno
+                 left join kzks_project_cost_ys ys on ys.taskno = c.taskno
         where c.reftaskno = #{taskno} order by taskno ,status
     </select>