提交代码

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

@@ -49,9 +49,12 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://192.168.10.15:63306/sj_zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-          username: root
-          password: sooka1a2b3c4d%...
+#          url: jdbc:mysql://192.168.10.15:63306/sj_zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+#          username: root
+#          password: sooka1a2b3c4d%...
+          url: jdbc:mysql://121.36.97.146:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          username: zdsz
+          password: ZDSZ1a2b3c4d%...
         # 从库数据源
 #        slave:
 #          lazy: true

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZMaterialStatisticsMapper.xml

@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum( a.reality_size ) reality_size
         FROM
         z_material_statistics a
-        LEFT JOIN sys_dict_data dd ON a.engin_classification = dd.dict_value
+        LEFT JOIN sys_dict_data dd ON a.engin_classification = dd.dict_value AND dd.dict_type = a.engin_type
         LEFT JOIN z_engin_material_quality mq ON mq.id = a.reality_quality
         LEFT JOIN z_engin_specifications s ON s.id = a.reality_specifications
         LEFT JOIN z_engineering_materials_resets mr ON (mr.material_quality = a.reality_quality