Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
920c8e75 由 康伟
选项

kangwei ：修改采购合同bug

1 个父辈 055fa066
内嵌 并排
正在显示 5 个修改的文件 包含 30 行增加 和 23 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/controller/PurchaseContractController.java
...@@ -87,8 +87,10 @@ public class PurchaseContractController { ...@@ -87,8 +87,10 @@ public class PurchaseContractController {
87 Result<List<ERPPurchaseContract>> result = new Result<List<ERPPurchaseContract>>(); 87 Result<List<ERPPurchaseContract>> result = new Result<List<ERPPurchaseContract>>();
88 QueryWrapper<ERPPurchaseContract> queryWrapper = new QueryWrapper<ERPPurchaseContract> (); // QueryGenerator.initQueryWrapper(ERPPurchaseContract, req.getParameterMap()); 88 QueryWrapper<ERPPurchaseContract> queryWrapper = new QueryWrapper<ERPPurchaseContract> (); // QueryGenerator.initQueryWrapper(ERPPurchaseContract, req.getParameterMap());
89 /* queryWrapper.like("departs", BaseContextHandler.getRealDepartId());*/ 89 /* queryWrapper.like("departs", BaseContextHandler.getRealDepartId());*/
90 queryWrapper.orderByDesc("create_time"); 90
91 // 需要添加条件判断 91 // 需要添加条件判断
92 queryWrapper.like("departs",BaseContextHandler.getRealDepartId());
93 queryWrapper.orderByDesc("create_time");
92 List<ERPPurchaseContract> purchaseContractList = purchaseContractService.list( queryWrapper); 94 List<ERPPurchaseContract> purchaseContractList = purchaseContractService.list( queryWrapper);
93 95
94 /*Set<ERPPurchaseContract> dataList = new HashSet<>(); 96 /*Set<ERPPurchaseContract> dataList = new HashSet<>();
......
sk-module-datafill/src/main/java/com/skua/modules/report/vo/JnhbLargeScreenVO.java
...@@ -53,15 +53,15 @@ public class JnhbLargeScreenVO { ...@@ -53,15 +53,15 @@ public class JnhbLargeScreenVO {
53 53
54 public void setHeadStatisticsValue(){ 54 public void setHeadStatisticsValue(){
55 // wssjcll, wsfhl, dh, qy, xinshui, zhnyxhl, eyhtpfl, dsdh 55 // wssjcll, wsfhl, dh, qy, xinshui, zhnyxhl, eyhtpfl, dsdh
56 ////水处理量,系统负荷率,电耗,汽油,新水,综合能耗,C02,吨水 56 ////污水处理量,系统负荷率,电耗,汽油,新水,综合能耗,C02,吨水
57 this.getHeadStatisticsList().add( getResultNumberVO( "wssjcll", this.getLargeScreenExpressionVO().getHead_wssjcll_expression() , this.getLargeScreenExpressionVO().getHead_wssjcll_expression_hb() , this.getLargeScreenExpressionVO().getHead_wssjcll_expression_tb()) );//污水处理量 57 this.getHeadStatisticsList().add( getResultNumberVO( "污水处理量","wssjcll","万吨", this.getLargeScreenExpressionVO().getHead_wssjcll_expression() , this.getLargeScreenExpressionVO().getHead_wssjcll_expression_hb() , this.getLargeScreenExpressionVO().getHead_wssjcll_expression_tb()) );//污水处理量
58 this.getHeadStatisticsList().add( getResultNumberVO( "wsfhl",this.getLargeScreenExpressionVO().getHead_wsfhl_expression() , this.getLargeScreenExpressionVO().getHead_wsfhl_expression_hb() , this.getLargeScreenExpressionVO().getHead_wsfhl_expression_tb()) );//系统负荷率 58 this.getHeadStatisticsList().add( getResultNumberVO( "系统负荷率","wsfhl", "%",this.getLargeScreenExpressionVO().getHead_wsfhl_expression() , this.getLargeScreenExpressionVO().getHead_wsfhl_expression_hb() , this.getLargeScreenExpressionVO().getHead_wsfhl_expression_tb()) );//系统负荷率
59 this.getHeadStatisticsList().add( getResultNumberVO( "dh",this.getLargeScreenExpressionVO().getHead_dh_expression() , this.getLargeScreenExpressionVO().getHead_dh_expression_hb() , this.getLargeScreenExpressionVO().getHead_dh_expression_tb()) );//电耗 59 this.getHeadStatisticsList().add( getResultNumberVO( "电耗","dh","万千瓦时",this.getLargeScreenExpressionVO().getHead_dh_expression() , this.getLargeScreenExpressionVO().getHead_dh_expression_hb() , this.getLargeScreenExpressionVO().getHead_dh_expression_tb()) );//电耗
60 this.getHeadStatisticsList().add( getResultNumberVO( "qy",this.getLargeScreenExpressionVO().getHead_qy_expression() , this.getLargeScreenExpressionVO().getHead_qy_expression_hb() , this.getLargeScreenExpressionVO().getHead_qy_expression_tb()) );//汽油 60 this.getHeadStatisticsList().add( getResultNumberVO( "汽油","qy","吨",this.getLargeScreenExpressionVO().getHead_qy_expression() , this.getLargeScreenExpressionVO().getHead_qy_expression_hb() , this.getLargeScreenExpressionVO().getHead_qy_expression_tb()) );//汽油
61 this.getHeadStatisticsList().add( getResultNumberVO( "xinshui",this.getLargeScreenExpressionVO().getHead_xssyl_expression() , this.getLargeScreenExpressionVO().getHead_xssyl_expression_hb() , this.getLargeScreenExpressionVO().getHead_xssyl_expression_tb()) );//薪水 61 this.getHeadStatisticsList().add( getResultNumberVO( "新水使用量","xinshui", "吨" ,this.getLargeScreenExpressionVO().getHead_xssyl_expression() , this.getLargeScreenExpressionVO().getHead_xssyl_expression_hb() , this.getLargeScreenExpressionVO().getHead_xssyl_expression_tb()) );//薪水
62 this.getHeadStatisticsList().add( getResultNumberVO( "zhnyxhl",this.getLargeScreenExpressionVO().getHead_zhnyxhl_expression() , this.getLargeScreenExpressionVO().getHead_zhnyxhl_expression_hb() , this.getLargeScreenExpressionVO().getHead_zhnyxhl_expression_tb()) );//综合能耗 62 this.getHeadStatisticsList().add( getResultNumberVO( "综合能耗消费量","zhnyxhl","吨标准煤",this.getLargeScreenExpressionVO().getHead_zhnyxhl_expression() , this.getLargeScreenExpressionVO().getHead_zhnyxhl_expression_hb() , this.getLargeScreenExpressionVO().getHead_zhnyxhl_expression_tb()) );//综合能耗
63 this.getHeadStatisticsList().add( getResultNumberVO( "eyhtpfl",this.getLargeScreenExpressionVO().getHead_eyhtpfl_expression() , this.getLargeScreenExpressionVO().getHead_eyhtpfl_expression_hb() , this.getLargeScreenExpressionVO().getHead_eyhtpfl_expression_tb()) );//C02 63 this.getHeadStatisticsList().add( getResultNumberVO( "二氧化碳排放量","eyhtpfl","吨CO2当量",this.getLargeScreenExpressionVO().getHead_eyhtpfl_expression() , this.getLargeScreenExpressionVO().getHead_eyhtpfl_expression_hb() , this.getLargeScreenExpressionVO().getHead_eyhtpfl_expression_tb()) );//C02
64 this.getHeadStatisticsList().add( getResultNumberVO( "dsdh",this.getLargeScreenExpressionVO().getHead_dsdh_expression() , this.getLargeScreenExpressionVO().getHead_dsdh_expression_hb() , this.getLargeScreenExpressionVO().getHead_dsdh_expression_tb()) );//吨水电耗 64 this.getHeadStatisticsList().add( getResultNumberVO( "吨水电耗","dsdh","千瓦时/吨",this.getLargeScreenExpressionVO().getHead_dsdh_expression() , this.getLargeScreenExpressionVO().getHead_dsdh_expression_hb() , this.getLargeScreenExpressionVO().getHead_dsdh_expression_tb()) );//吨水电耗
65 } 65 }
66 66
67 67
...@@ -69,17 +69,18 @@ public class JnhbLargeScreenVO { ...@@ -69,17 +69,18 @@ public class JnhbLargeScreenVO {
69 * 设置：消减统计记录 69 * 设置：消减统计记录
70 */ 70 */
71 public void setReduceStatistics(){ 71 public void setReduceStatistics(){
72 this.getReduceStatisticsList().add( getResultNumberVO( "cod",this.getLargeScreenExpressionVO().getReduce_statistics_cod() , this.getLargeScreenExpressionVO().getReduce_statistics_cod_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_cod_tb()) );//吨水电耗 72 this.getReduceStatisticsList().add( getResultNumberVO( "cod","cod","",this.getLargeScreenExpressionVO().getReduce_statistics_cod() , this.getLargeScreenExpressionVO().getReduce_statistics_cod_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_cod_tb()) );//吨水电耗
73 this.getReduceStatisticsList().add( getResultNumberVO( "NH3-N",this.getLargeScreenExpressionVO().getReduce_statistics_nh3n() , this.getLargeScreenExpressionVO().getReduce_statistics_nh3n_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_nh3n_tb()) );//吨水电耗 73 this.getReduceStatisticsList().add( getResultNumberVO( "NH3-N","NH3-N","",this.getLargeScreenExpressionVO().getReduce_statistics_nh3n() , this.getLargeScreenExpressionVO().getReduce_statistics_nh3n_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_nh3n_tb()) );//吨水电耗
74 this.getReduceStatisticsList().add( getResultNumberVO( "TP",this.getLargeScreenExpressionVO().getReduce_statistics_tp() , this.getLargeScreenExpressionVO().getReduce_statistics_tp_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_tp_tb()) );//吨水电耗 74 this.getReduceStatisticsList().add( getResultNumberVO( "TP","TP","",this.getLargeScreenExpressionVO().getReduce_statistics_tp() , this.getLargeScreenExpressionVO().getReduce_statistics_tp_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_tp_tb()) );//吨水电耗
75 this.getReduceStatisticsList().add( getResultNumberVO( "TN",this.getLargeScreenExpressionVO().getReduce_statistics_tn() , this.getLargeScreenExpressionVO().getReduce_statistics_tn_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_tn_tb()) );//吨水电耗 75 this.getReduceStatisticsList().add( getResultNumberVO( "TN","TN","",this.getLargeScreenExpressionVO().getReduce_statistics_tn() , this.getLargeScreenExpressionVO().getReduce_statistics_tn_hb() , this.getLargeScreenExpressionVO().getReduce_statistics_tn_tb()) );//吨水电耗
76 } 76 }
77 77
78 78
79 79
80 private ResultNumberVO getResultNumberVO(String name , String valueExpression ,String valueHbExpression,String valueTbExpression){ 80 private ResultNumberVO getResultNumberVO(String name ,String code ,String unit ,String valueExpression ,String valueHbExpression,String valueTbExpression){
81 ResultNumberVO head_wssjcll = new ResultNumberVO();//污水处理量 81 ResultNumberVO head_wssjcll = new ResultNumberVO();//污水处理量
82 //head_wssjcll.setName( name); 82 head_wssjcll.setName( name);
83 head_wssjcll.setUnit( unit );
83 head_wssjcll.setValue( JSUtils.executeExpression(valueExpression , "0") ); 84 head_wssjcll.setValue( JSUtils.executeExpression(valueExpression , "0") );
84 head_wssjcll.setValueHb( JSUtils.executeExpression( valueHbExpression , "0") ); 85 head_wssjcll.setValueHb( JSUtils.executeExpression( valueHbExpression , "0") );
85 head_wssjcll.setValueTb(JSUtils.executeExpression( valueTbExpression , "0") ); 86 head_wssjcll.setValueTb(JSUtils.executeExpression( valueTbExpression , "0") );
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/PowerConsumptionAnalysisController.java
...@@ -26,8 +26,8 @@ public class PowerConsumptionAnalysisController { ...@@ -26,8 +26,8 @@ public class PowerConsumptionAnalysisController {
26 private IPowerConsumptionAnalysisService powerConsumptionAnalysisService; 26 private IPowerConsumptionAnalysisService powerConsumptionAnalysisService;
27 27
28 28
29 @AutoLog(value = "数据展示") 29 @AutoLog(value = "数据展示(电耗分析)")
30 @ApiOperation(value = "数据展示", notes = "数据展示") 30 @ApiOperation(value = "数据展示(电耗分析)", notes = "数据展示(电耗分析)")
31 @RequestMapping(value = "/data/display", method = RequestMethod.GET) 31 @RequestMapping(value = "/data/display", method = RequestMethod.GET)
32 public Result<Map<String, Object>> dataDisplay(AnysisParamsVO anysisParamsVO) { 32 public Result<Map<String, Object>> dataDisplay(AnysisParamsVO anysisParamsVO) {
33 Result<Map<String, Object>> result = new Result<>(); 33 Result<Map<String, Object>> result = new Result<>();
...@@ -37,7 +37,7 @@ public class PowerConsumptionAnalysisController { ...@@ -37,7 +37,7 @@ public class PowerConsumptionAnalysisController {
37 return result; 37 return result;
38 } 38 }
39 39
40 @AutoLog(value = "电耗趋势") 40 @AutoLog(value = "总电耗趋势")
41 @ApiOperation(value = "电耗趋势", notes = "电耗趋势") 41 @ApiOperation(value = "电耗趋势", notes = "电耗趋势")
42 @RequestMapping(value = "/power/consumption/trend", method = RequestMethod.GET) 42 @RequestMapping(value = "/power/consumption/trend", method = RequestMethod.GET)
43 public Result<Map<String, Object>> powerConsumptionTrend(AnysisParamsVO anysisParamsVO) { 43 public Result<Map<String, Object>> powerConsumptionTrend(AnysisParamsVO anysisParamsVO) {
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/ComprehensiveSupervisionMapper.xml
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 <select id="selectDhByMonths" resultType="com.skua.modules.equipment.dto.AlarmDto"> 29 <select id="selectDhByMonths" resultType="com.skua.modules.equipment.dto.AlarmDto">
30 select sum(item_value) as v,DATE_FORMAT(data_time, '%Y-%m') as time from f_report_itemv a 30 select sum(item_value) as v,DATE_FORMAT(data_time, '%Y-%m') as time from f_report_itemv a
31 left join f_report_item b on b.id=a.reit_id 31 left join f_report_item b on b.id=a.reit_id
32 where b.item_code='dhkwh64bc' 32 where b.item_code='DLHJ'
33 and a.depart_id = #{factoryId} 33 and a.depart_id = #{factoryId}
34 <if test="list!=null and list.size>0"> 34 <if test="list!=null and list.size>0">
35 and DATE_FORMAT(data_time, '%Y-%m') in 35 and DATE_FORMAT(data_time, '%Y-%m') in
...@@ -42,14 +42,15 @@ ...@@ -42,14 +42,15 @@
42 <select id="selectAllDh" resultType="com.skua.modules.equipment.dto.AlarmDto"> 42 <select id="selectAllDh" resultType="com.skua.modules.equipment.dto.AlarmDto">
43 select sum(item_value) as v, DATE_FORMAT(data_time, '%Y-%m') as time from f_report_itemv a 43 select sum(item_value) as v, DATE_FORMAT(data_time, '%Y-%m') as time from f_report_itemv a
44 left join f_report_item b on b.id=a.reit_id 44 left join f_report_item b on b.id=a.reit_id
45 where b.item_code = 'dhkwh64bc' 45 where b.item_code = 'DLHJ'
46 and a.depart_id = #{factoryId} 46 and a.depart_id = #{factoryId}
47 group by DATE_FORMAT(data_time, '%Y-%m') 47 group by DATE_FORMAT(data_time, '%Y-%m')
48 </select> 48 </select>
49 <!-- dhkwh64bc-->
49 <select id="selectDhByStartAndEnd" resultType="com.skua.modules.equipment.dto.AlarmDto"> 50 <select id="selectDhByStartAndEnd" resultType="com.skua.modules.equipment.dto.AlarmDto">
50 select sum(item_value) as v,DATE_FORMAT(data_time, '%Y-%m') as time from f_report_itemv a 51 select sum(item_value) as v,DATE_FORMAT(data_time, '%Y-%m') as time from f_report_itemv a
51 left join f_report_item b on b.id=a.reit_id 52 left join f_report_item b on b.id=a.reit_id
52 where b.item_code='dhkwh64bc' 53 where b.item_code='DLHJ'
53 and a.depart_id = #{factoryId} 54 and a.depart_id = #{factoryId}
54 <if test="startTime!=null"> 55 <if test="startTime!=null">
55 and DATE_FORMAT(data_time, '%Y-%m')>=#{startTime} 56 and DATE_FORMAT(data_time, '%Y-%m')>=#{startTime}
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
62 <select id="selectDhByYear" resultType="com.skua.modules.equipment.dto.AlarmDto"> 63 <select id="selectDhByYear" resultType="com.skua.modules.equipment.dto.AlarmDto">
63 select sum(item_value) as v from f_report_itemv a 64 select sum(item_value) as v from f_report_itemv a
64 left join f_report_item b on b.id=a.reit_id 65 left join f_report_item b on b.id=a.reit_id
65 where b.item_code='dhkwh64bc' and SUBSTRING(data_time,1,4)='2022' 66 where b.item_code='DLHJ' and SUBSTRING(data_time,1,4)='2022'
66 </select> 67 </select>
67 <select id="selectDataIdsByMonth" resultType="java.lang.String"> 68 <select id="selectDataIdsByMonth" resultType="java.lang.String">
68 SELECT DISTINCT data_id FROM `f_report_itemv` where SUBSTRING(data_time,1,7)=#{month} 69 SELECT DISTINCT data_id FROM `f_report_itemv` where SUBSTRING(data_time,1,7)=#{month}
......
sk-module-system/src/main/java/com/skua/config/mybatis/MybatisInterceptor.java
...@@ -125,6 +125,8 @@ public class MybatisInterceptor implements Interceptor { ...@@ -125,6 +125,8 @@ public class MybatisInterceptor implements Interceptor {
125 if(anonymous != null ){ 125 if(anonymous != null ){
126 return invocation.proceed(); 126 return invocation.proceed();
127 } 127 }
128
129 System.out.println("sqlId = "+sqlId);
128 //这些方法不涉及权限 130 //这些方法不涉及权限
129 if ("com.skua.modules.system.mapper.SysDepartMapper.getDepartTreeByJt".equalsIgnoreCase(sqlId) 131 if ("com.skua.modules.system.mapper.SysDepartMapper.getDepartTreeByJt".equalsIgnoreCase(sqlId)
130 || "com.skua.modules.system.mapper.SysDepartMapper.getDepartTree".equalsIgnoreCase(sqlId) 132 || "com.skua.modules.system.mapper.SysDepartMapper.getDepartTree".equalsIgnoreCase(sqlId)
...@@ -146,6 +148,7 @@ public class MybatisInterceptor implements Interceptor { ...@@ -146,6 +148,7 @@ public class MybatisInterceptor implements Interceptor {
146 || "com.skua.modules.erp.mapper.PurchasePlanItemMapper.queryListByPlanId".equals(sqlId) //采购计划 148 || "com.skua.modules.erp.mapper.PurchasePlanItemMapper.queryListByPlanId".equals(sqlId) //采购计划
147 || "com.skua.modules.erp.mapper.PurchaseMaterialMapper.queryListByContractId".equals(sqlId) //采购合同 149 || "com.skua.modules.erp.mapper.PurchaseMaterialMapper.queryListByContractId".equals(sqlId) //采购合同
148 || "com.skua.modules.erp.mapper.DistributMaterialMapper.queryListByContractId".equals(sqlId) //采购-分销合同 150 || "com.skua.modules.erp.mapper.DistributMaterialMapper.queryListByContractId".equals(sqlId) //采购-分销合同
151 || "com.skua.modules.erp.mapper.ERPPurchaseContractMapper.selectList".equals(sqlId) //采购合同
149 ) { 152 ) {
150 log.debug("************************------sqlId------**************************" + sqlId); 153 log.debug("************************------sqlId------**************************" + sqlId);
151 return invocation.proceed(); 154 return invocation.proceed();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!