Skip to content

张雷 / skboot-zhongye

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

kangwei: 水厂运营考核专题:吨水药费详情接口（药剂目标完成情况）

1 个父辈 b1748fcf
内嵌 并排
正在显示 4 个修改的文件 包含 88 行增加 和 34 行删除
sk-base-common/src/main/java/com/skua/common/constant/ReportConstant.java
......@@ -26,7 +26,7 @@ public interface ReportConstant {
//药剂字段
public static final String fieldYj = "PAMZ,PAMF,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ," +
"YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
public static final String fieldYj_2 = "PACYT,PACGT,NaClO,SCLPAMF,PAMRJ,PFS,FHTY,RYXNJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
//水量字段
public static final String fieldClsl = "CSL,JSL";
public static final String field_CSL= "CSL";
......
sk-base-common/src/main/java/com/skua/common/report/ReportViewUtil.java
......@@ -319,8 +319,8 @@ public class ReportViewUtil {
public static ReportItemVO getSumValueByTBHB(String reportId, String fields, String departIds , String startTime , String endTime){
ReportItemVO reportItemVO = null;
String dataViewName3a24_value = ReportViewUtil.buildViewLike(reportId,fields, departIds, startTime,endTime);
String dataViewName3a24_valueHB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getHbDate(startTime),DateUtils.getHbDate(startTime));
String dataViewName3a24_valueTB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getTbDate(startTime),DateUtils.getTbDate(startTime));
String dataViewName3a24_valueHB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getHbDate(startTime),DateUtils.getHbDate(endTime));
String dataViewName3a24_valueTB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getTbDate(startTime),DateUtils.getTbDate(endTime));
String fieldsSql = "";
if(StringUtils.isNotEmpty(fields)) {
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryOperateCenterServiceImpl.java
......@@ -3,6 +3,8 @@ package com.skua.modules.dataAnalysis.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.skua.common.constant.ReportConstant;
import com.skua.common.report.ReportViewUtil;
import com.skua.common.report.vo.ReportItemVO;
import com.skua.core.context.SpringContextUtils;
import com.skua.core.util.ConvertUtils;
import com.skua.core.util.DoubleOperaUtils;
import com.skua.modules.dataAnalysis.mapper.FactoryOperateCenterMapper;
......@@ -11,9 +13,11 @@ import com.skua.modules.dataAnalysis.vo.*;
import com.skua.modules.report.entity.ReportTargetConfig;
import com.skua.modules.report.mapper.ReportTargetConfigMapper;
import com.skua.tool.util.DateUtils;
import com.skua.tool.util.JSUtils;
import io.swagger.annotations.ApiModelProperty;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.DecimalFormat;
......@@ -222,8 +226,10 @@ public class FactoryOperateCenterServiceImpl implements IFactoryOperateCenterSer
//吨水药费：详情
public List<YJMonthDataVO> dsyfDetail(String departId, String month){
String tbMonth = DateUtils.getTbMonth(month);
String hbMonth = DateUtils.getHbMonth(month);
//String tbMonth = DateUtils.getTbMonth(month);
// String hbMonth = DateUtils.getHbMonth(month);
String startTime = month+"-01" ;
String endTime = month+"-31";
String year = month.substring(0,4);
LambdaQueryWrapper<ReportTargetConfig> queryWrapper = new LambdaQueryWrapper<ReportTargetConfig>();
queryWrapper.eq(ReportTargetConfig::getDepartId,departId);
......@@ -234,57 +240,83 @@ public class FactoryOperateCenterServiceImpl implements IFactoryOperateCenterSer
target = yearTargetList.get(0);
}
if(target == null ) target = new ReportTargetConfig();
String field3a24 = ReportConstant.fieldDl+","+ ReportConstant.fieldYj;
String dataViewName3a24Month = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, month);
String dataViewName3a24MonthTb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, tbMonth);
String dataViewName3a24MonthHb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, hbMonth);
List<YJMonthDataVO> monthDataVOList = new ArrayList<>();
String dataViewName2119Month = ReportViewUtil.buildViewLike(ReportConstant.view2119, ReportConstant.fieldClsl, departId, month);
/* String dataViewName2119Month = ReportViewUtil.buildViewLike(ReportConstant.view2119, ReportConstant.fieldClsl, departId, month);
String dataViewName2119MonthTb = ReportViewUtil.buildViewLike(ReportConstant.view2119, ReportConstant.fieldClsl, departId, tbMonth);
String dataViewName2119MonthHb = ReportViewUtil.buildViewLike(ReportConstant.view2119,ReportConstant.fieldClsl, departId, hbMonth);
Map<String,Object> monthMap = factoryOperateCenterMapper.getSdyData(dataViewName2119Month, dataViewName3a24Month, departId, month);
String dataViewName2119MonthHb = ReportViewUtil.buildViewLike(ReportConstant.view2119,ReportConstant.fieldClsl, departId, hbMonth);*/
/* Map<String,Object> monthMap = factoryOperateCenterMapper.getSdyData(dataViewName2119Month, dataViewName3a24Month, departId, month);
Map<String,Object> monthHbMap = factoryOperateCenterMapper.getSdyData(dataViewName2119MonthHb, dataViewName3a24MonthHb, departId, hbMonth);
Map<String,Object> monthTbMap = factoryOperateCenterMapper.getSdyData(dataViewName2119MonthTb, dataViewName3a24MonthTb, departId, tbMonth);
Map<String,Object> monthTbMap = factoryOperateCenterMapper.getSdyData(dataViewName2119MonthTb, dataViewName3a24MonthTb, departId, tbMonth);*/
//ReportItemVO csl_repotItem = ReportViewUtil.getSumValueByTBHB(ReportConstant.view2119, ReportConstant.fieldClsl, departId, startTime, endTime);//出水量
String dataViewName3a24Month = ReportViewUtil.buildViewLike(ReportConstant.view3a24,ReportConstant.fieldYj_2, departId, startTime, endTime);
String dataViewName3a24MonthHb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,ReportConstant.fieldYj_2, departId, DateUtils.getHbDate(startTime),DateUtils.getHbDate(endTime));
String dataViewName3a24MonthTb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,ReportConstant.fieldYj_2, departId, DateUtils.getTbDate(startTime),DateUtils.getTbDate(endTime));
String fieldSql = "";// "select sum(IFNULL(aaa.,0) ) from " + dataViewName3a24Month +" aaa";
String[] field3a24List = ReportConstant.fieldYj_2.split(",");
for(String field : field3a24List){
if(fieldSql.length() > 0 ) fieldSql+=",";
fieldSql += " sum(IFNULL(aaa."+field+",0) ) "+field;
}
monthDataVOList.add( new YJMonthDataVO("PAC(液)","PACYT" ,ConvertUtils.getString(target.getTargetPacyt(),"0"),ConvertUtils.getString(monthMap.get("PACYT"),"0"),
JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
Map<String,Object> monthMap = masterDB.queryForMap("select "+ fieldSql+ " from " + dataViewName3a24Month +" aaa " );
Map<String,Object> monthHbMap = masterDB.queryForMap("select "+ fieldSql+ " from " + dataViewName3a24MonthHb +" aaa " );
Map<String,Object> monthTbMap = masterDB.queryForMap("select "+ fieldSql+ " from " + dataViewName3a24MonthTb +" aaa " );
monthDataVOList.add( new YJMonthDataVO("PAC(液)","PACYT" ,"KG",ConvertUtils.getString(target.getTargetPacyt(),"0"),ConvertUtils.getString(monthMap.get("PACYT"),"0"),
ConvertUtils.getString(monthHbMap.get("PACYT"),"0") ,ConvertUtils.getString(monthTbMap.get("PACYT") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("PAC(固)","PACGT" ,ConvertUtils.getString(target.getTargetPacgt(),"0"),ConvertUtils.getString(monthMap.get("PACGT"),"0"),
monthDataVOList.add( new YJMonthDataVO("PAC(固)","PACGT" ,"KG",ConvertUtils.getString(target.getTargetPacgt(),"0"),ConvertUtils.getString(monthMap.get("PACGT"),"0"),
ConvertUtils.getString(monthHbMap.get("PACGT"),"0") ,ConvertUtils.getString(monthTbMap.get("PACGT") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("NaClO","NACLO" ,ConvertUtils.getString(target.getTargetNaclo(),"0"),ConvertUtils.getString(monthMap.get("NACLO"),"0"),
monthDataVOList.add( new YJMonthDataVO("NaClO","NACLO" ,"KG",ConvertUtils.getString(target.getTargetNaclo(),"0"),ConvertUtils.getString(monthMap.get("NACLO"),"0"),
ConvertUtils.getString(monthHbMap.get("NACLO"),"0") ,ConvertUtils.getString(monthTbMap.get("NACLO") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("水处理PAM(-)","SCLPAMF" ,ConvertUtils.getString(target.getTargetSclpamf(),"0"),ConvertUtils.getString(monthMap.get("SCLPAMF"),"0"),
monthDataVOList.add( new YJMonthDataVO("水处理PAM(-)","SCLPAMF" ,"KG",ConvertUtils.getString(target.getTargetSclpamf(),"0"),ConvertUtils.getString(monthMap.get("SCLPAMF"),"0"),
ConvertUtils.getString(monthHbMap.get("SCLPAMF"),"0") ,ConvertUtils.getString(monthTbMap.get("SCLPAMF") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("污脱PAM乳剂","PAMRJ" ,ConvertUtils.getString(target.getTargetPamrj(),"0"),ConvertUtils.getString(monthMap.get("PAMRJ"),"0"),
monthDataVOList.add( new YJMonthDataVO("污脱PAM乳剂","PAMRJ","KG" ,ConvertUtils.getString(target.getTargetPamrj(),"0"),ConvertUtils.getString(monthMap.get("PAMRJ"),"0"),
ConvertUtils.getString(monthHbMap.get("PAMRJ"),"0") ,ConvertUtils.getString(monthTbMap.get("PAMRJ") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("PFS","PFS" ,ConvertUtils.getString(target.getTargetPfs(),"0"),ConvertUtils.getString(monthMap.get("PFS"),"0"),
monthDataVOList.add( new YJMonthDataVO("PFS","PFS" ,"KG",ConvertUtils.getString(target.getTargetPfs(),"0"),ConvertUtils.getString(monthMap.get("PFS"),"0"),
ConvertUtils.getString(monthHbMap.get("PFS"),"0") ,ConvertUtils.getString(monthTbMap.get("PFS") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("复合铁盐","FHTY" ,ConvertUtils.getString(target.getTargetFhty(),"0"),ConvertUtils.getString(monthMap.get("FHTY"),"0"),
monthDataVOList.add( new YJMonthDataVO("复合铁盐","FHTY","KG" ,ConvertUtils.getString(target.getTargetFhty(),"0"),ConvertUtils.getString(monthMap.get("FHTY"),"0"),
ConvertUtils.getString(monthHbMap.get("FHTY"),"0") ,ConvertUtils.getString(monthTbMap.get("FHTY") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("乳液絮凝剂","RYXNJ" ,ConvertUtils.getString(target.getTargetRyxnj(),"0"),ConvertUtils.getString(monthMap.get("RYXNJ"),"0"),
monthDataVOList.add( new YJMonthDataVO("乳液絮凝剂","RYXNJ" ,"KG",ConvertUtils.getString(target.getTargetRyxnj(),"0"),ConvertUtils.getString(monthMap.get("RYXNJ"),"0"),
ConvertUtils.getString(monthHbMap.get("RYXNJ"),"0") ,ConvertUtils.getString(monthTbMap.get("RYXNJ") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("益维磷","YWL" ,ConvertUtils.getString(target.getTargetYwl(),"0"),ConvertUtils.getString(monthMap.get("YWL"),"0"),
monthDataVOList.add( new YJMonthDataVO("益维磷","YWL" ,"KG",ConvertUtils.getString(target.getTargetYwl(),"0"),ConvertUtils.getString(monthMap.get("YWL"),"0"),
ConvertUtils.getString(monthHbMap.get("YWL"),"0") ,ConvertUtils.getString(monthTbMap.get("YWL") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("高效除磷剂","GXCLJ" ,ConvertUtils.getString(target.getTargetGxclj(),"0"),ConvertUtils.getString(monthMap.get("GXCLJ"),"0"),
monthDataVOList.add( new YJMonthDataVO("高效除磷剂","GXCLJ" ,"KG",ConvertUtils.getString(target.getTargetGxclj(),"0"),ConvertUtils.getString(monthMap.get("GXCLJ"),"0"),
ConvertUtils.getString(monthHbMap.get("GXCLJ"),"0") ,ConvertUtils.getString(monthTbMap.get("GXCLJ") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("CH3COONA","CH3COONA" ,ConvertUtils.getString(target.getTargetCh3coona(),"0"),ConvertUtils.getString(monthMap.get("CH3COONA"),"0"),
monthDataVOList.add( new YJMonthDataVO("CH3COONA","CH3COONA" ,"KG",ConvertUtils.getString(target.getTargetCh3coona(),"0"),ConvertUtils.getString(monthMap.get("CH3COONA"),"0"),
ConvertUtils.getString(monthHbMap.get("CH3COONA"),"0") ,ConvertUtils.getString(monthTbMap.get("CH3COONA") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("活性炭","HXT" ,ConvertUtils.getString(target.getTargetHxt(),"0"),ConvertUtils.getString(monthMap.get("HXT"),"0"),
monthDataVOList.add( new YJMonthDataVO("活性炭","HXT" ,"KG",ConvertUtils.getString(target.getTargetHxt(),"0"),ConvertUtils.getString(monthMap.get("HXT"),"0"),
ConvertUtils.getString(monthHbMap.get("HXT"),"0") ,ConvertUtils.getString(monthTbMap.get("HXT") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("FeCl3","FECL3" ,ConvertUtils.getString(target.getTargetFecl3(),"0"),ConvertUtils.getString(monthMap.get("FECL3"),"0"),
monthDataVOList.add( new YJMonthDataVO("FeCl3","FECL3" ,"KG",ConvertUtils.getString(target.getTargetFecl3(),"0"),ConvertUtils.getString(monthMap.get("FECL3"),"0"),
ConvertUtils.getString(monthHbMap.get("FECL3"),"0") ,ConvertUtils.getString(monthTbMap.get("FECL3") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("石灰","SH" ,ConvertUtils.getString(target.getTargetSh(),"0"),ConvertUtils.getString(monthMap.get("SH"),"0"),
monthDataVOList.add( new YJMonthDataVO("石灰","SH" ,"KG",ConvertUtils.getString(target.getTargetSh(),"0"),ConvertUtils.getString(monthMap.get("SH"),"0"),
ConvertUtils.getString(monthHbMap.get("SH"),"0") ,ConvertUtils.getString(monthTbMap.get("SH") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("CH3COOH","CH3COOH" ,ConvertUtils.getString(target.getTargetCh3cooh(),"0"),ConvertUtils.getString(monthMap.get("CH3COOH"),"0"),
monthDataVOList.add( new YJMonthDataVO("CH3COOH","CH3COOH" ,"KG",ConvertUtils.getString(target.getTargetCh3cooh(),"0"),ConvertUtils.getString(monthMap.get("CH3COOH"),"0"),
ConvertUtils.getString(monthHbMap.get("CH3COOH"),"0") ,ConvertUtils.getString(monthTbMap.get("CH3COOH") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("FeSO4固","FESO4G" ,ConvertUtils.getString(target.getTargetFeso4g(),"0"),ConvertUtils.getString(monthMap.get("FESO4G"),"0"),
monthDataVOList.add( new YJMonthDataVO("FeSO4固","FESO4G" ,"KG",ConvertUtils.getString(target.getTargetFeso4g(),"0"),ConvertUtils.getString(monthMap.get("FESO4G"),"0"),
ConvertUtils.getString(monthHbMap.get("FESO4G"),"0") ,ConvertUtils.getString(monthTbMap.get("FESO4G") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("FeSO4液","FESO4Y" ,ConvertUtils.getString(target.getTargetFeso4y(),"0"),ConvertUtils.getString(monthMap.get("FESO4Y"),"0"),
monthDataVOList.add( new YJMonthDataVO("FeSO4液","FESO4Y" ,"KG",ConvertUtils.getString(target.getTargetFeso4y(),"0"),ConvertUtils.getString(monthMap.get("FESO4Y"),"0"),
ConvertUtils.getString(monthHbMap.get("FESO4Y"),"0") ,ConvertUtils.getString(monthTbMap.get("FESO4Y") ,"0") ) );
monthDataVOList.add( new YJMonthDataVO("H2O2","H2O2" ,ConvertUtils.getString(target.getTargetH2o2(),"0"),ConvertUtils.getString(monthMap.get("H2O2"),"0"),
monthDataVOList.add( new YJMonthDataVO("H2O2","H2O2","KG" ,ConvertUtils.getString(target.getTargetH2o2(),"0"),ConvertUtils.getString(monthMap.get("H2O2"),"0"),
ConvertUtils.getString(monthHbMap.get("H2O2"),"0") ,ConvertUtils.getString(monthTbMap.get("H2O2") ,"0") ) );
/*
Map<String,String> nameMap = new HashMap<>();
nameMap.put("PACYT","PAC(液)");nameMap.put("PACGT","PAC(固)");nameMap.put("NaClO","NaClO"); nameMap.put("SCLPAMF","水处理PAM(-)");
nameMap.put("PAMRJ","污脱PAM乳剂"); nameMap.put("PFS","PFS");nameMap.put("FHTY","复合铁盐"); nameMap.put("RYXNJ","乳液絮凝剂");
nameMap.put("CH3COONA","CH3COONA");nameMap.put("HXT","活性炭");nameMap.put("FECL3","FECL3"); nameMap.put("SH","石灰");
nameMap.put("CH3COOH","CH3COOH"); nameMap.put("FESO4G","FeSO4固"); nameMap.put("FESO4Y","FeSO4液"); nameMap.put("H2O2","H2O2");
ReportItemVO reportItemVO = null;
Map<String, Integer> map = new HashMap<>();
for (Map.Entry<String, Integer> entry : map.entrySet()) {
//System.out.println("Key: " + entry.getKey() + ", Value: " + entry.getValue());
monthDataVOList.add( new YJMonthDataVO(entry.getValue() , entry.getKey(),ConvertUtils.getString(target.getTargetPacyt(),"0") ,reportItemVO.getValue(),reportItemVO.getValueHb(),reportItemVO.getValueTb() ));
}*/
return monthDataVOList;
}
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/YJMonthDataVO.java
......@@ -26,6 +26,17 @@ public class YJMonthDataVO {
@ApiModelProperty(value = "同比")
private String valueTB;//同比
@ApiModelProperty(value = "环比-比例")
private String valueHB_bl;//环比
@ApiModelProperty(value = "同比-比例")
private String valueTB_bl;//同比
@ApiModelProperty(value = "单位")
private String unit;
public String getMonthTarge() {
monthTarge = JSUtils.divide(yearTarge,12);
return monthTarge;
......@@ -34,12 +45,23 @@ public class YJMonthDataVO {
public YJMonthDataVO(){
}
public YJMonthDataVO(String yjName, String yjCode, String yearTarge, String value, String valueHB, String valueTB) {
public YJMonthDataVO(String yjName, String yjCode, String unit, String yearTarge, String value, String valueHB, String valueTB) {
this.yjName = yjName;
this.yjCode = yjCode;
this.unit = unit;
this.yearTarge = yearTarge;
this.value = value;
this.valueHB = valueHB;
this.valueTB = valueTB;
}
public String getValueHB_bl() {
String expression = "( "+this.value +"-" +this.valueHB+")*100/"+this.valueHB;
return JSUtils.executeExpression(expression ,"0.0");
}
public String getValueTB_bl() {
String expression = "( "+this.value +"-" +this.valueTB+")*100/"+this.valueTB;
return JSUtils.executeExpression(expression ,"0.0");
}
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!