Skip to content

张雷 / skboot-zhongye

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

Merge remote-tracking branch 'origin/master'

2 个父辈 a1a800b9 529473f1
内嵌 并排
正在显示 13 个修改的文件 包含 380 行增加 和 251 行删除
sk-base-common/src/main/java/com/skua/modules/common/mapper/CommonSqlMapper.java
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.common.vo.DepartVO;
import com.skua.tool.annotation.Anonymous;
import org.apache.ibatis.annotations.Param;
......@@ -59,4 +60,6 @@ public interface CommonSqlMapper {
String getChildDeparts(@Param(value="departId") String departId);
String getChildDepartByUserId(@Param(value="userId") String userId);
List<DepartVO> getChildDepartList(@Param(value="departId") String departId);
}
......
sk-base-common/src/main/java/com/skua/modules/common/mapper/xml/CommonSqlMapper.xml
......@@ -121,4 +121,28 @@
from sys_user_depart
where user_id = #{userId}
</select>
<select id="getChildDepartList" resultType="com.skua.modules.common.vo.DepartVO">
SELECT
id as depart_id,
depart_name
FROM
sys_depart
WHERE
depart_type = '1'
AND (
parent_id IN
<foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
'${item}'
</foreach>
OR id IN
<foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
'${item}'
</foreach>
OR parent_id IN ( SELECT id FROM sys_depart WHERE parent_id IN
<foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
'${item}'
</foreach>
))
</select>
</mapper>
......
sk-base-common/src/main/java/com/skua/modules/common/service/ICommonSqlService.java
......@@ -3,6 +3,8 @@ package com.skua.modules.common.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.common.vo.DepartVO;
import java.util.List;
import java.util.Map;
......@@ -47,4 +49,6 @@ public interface ICommonSqlService {
String getChildDepartId( String departId);
String getChildFactorys(String departId);
List<DepartVO> getChildDepartList(String departId);
}
......
sk-base-common/src/main/java/com/skua/modules/common/service/impl/CommonSqlServiceImpl.java
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.common.mapper.CommonSqlMapper;
import com.skua.modules.common.service.ICommonSqlService;
import com.skua.modules.common.vo.DepartVO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
......@@ -96,4 +97,10 @@ public class CommonSqlServiceImpl implements ICommonSqlService {
return commonSqlMapper.getChildFactorys(departId);
}
@Override
public List<DepartVO> getChildDepartList(String departId) {
List<DepartVO> list = commonSqlMapper.getChildDepartList(departId);
return list;
}
}
......
sk-base-common/src/main/java/com/skua/modules/common/vo/DepartVO.java 0 → 100644
package com.skua.modules.common.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class DepartVO {
@ApiModelProperty(value = "机构编码")
private String departId;
@ApiModelProperty(value = "机构名称")
private String departName;
}
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingSendController.java
......@@ -115,24 +115,26 @@ public class AjhMeetingSendController {
LocalDateTime nowTime = LocalDateTime.now();
List<AjhMeetingSend> list = ajhMeetingSendService.list();
List<AjhMeetingSend> newList = new ArrayList<>();
for (AjhMeetingSend ajhMeetingSend : list) {
if(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStartTime())&&
ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetEndTime())){
String start = ajhMeetingSend.getMeetStartTime();
String end = ajhMeetingSend.getMeetEndTime();
LocalDateTime startTime = LocalDateTime.parse(start, formatter);
LocalDateTime endTime = LocalDateTime.parse(end, formatter);
if (nowTime.isBefore(startTime)) {
ajhMeetingSend.setMeetStatus(0);
} else if (nowTime.isAfter(endTime)) {
ajhMeetingSend.setMeetStatus(2);
} else {
ajhMeetingSend.setMeetStatus(1);
if(list.size() > 0){
for (AjhMeetingSend ajhMeetingSend : list) {
if(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStartTime())&&
ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetEndTime())){
String start = ajhMeetingSend.getMeetStartTime();
String end = ajhMeetingSend.getMeetEndTime();
LocalDateTime startTime = LocalDateTime.parse(start, formatter);
LocalDateTime endTime = LocalDateTime.parse(end, formatter);
if (nowTime.isBefore(startTime)) {
ajhMeetingSend.setMeetStatus(0);
} else if (nowTime.isAfter(endTime)) {
ajhMeetingSend.setMeetStatus(2);
} else {
ajhMeetingSend.setMeetStatus(1);
}
newList.add(ajhMeetingSend);
}
newList.add(ajhMeetingSend);
}
ajhMeetingSendService.updateBatchById(newList);
}
ajhMeetingSendService.updateBatchById(newList);
}
@AutoLog(value = "会议记录-数量统计")
......
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhMeetingSend.java
......@@ -94,7 +94,7 @@ public class AjhMeetingSend {
@Dict(dicCode = "accept_flag")
private String acceptFlag;
/**发布状态（0未发布，1已发布，2已撤销）*/
@Excel(name = "发布状态（0未发布，1已发布，2已撤销）", width = 15 ,dicCode = "meet_status" ,orderNum = "10")
@Excel(name = "发布状态", width = 15 ,dicCode = "meet_status" ,orderNum = "10")
@ApiModelProperty(value = "发布状态（0未发布，1已发布，2已撤销）")
@Dict(dicCode = "meet_status")
private String sendStatus;
......
sk-module-datafill/src/main/java/com/skua/modules/custom/handle/impl/YyrbReportHandle.java
......@@ -6,6 +6,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.skua.common.constant.ReportConstant;
import com.skua.modules.common.service.ICommonSqlService;
import com.skua.modules.common.vo.DepartVO;
import com.skua.modules.dataAnalysis.service.IFactoryCenterService;
import com.skua.tool.util.DateUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
......@@ -20,6 +25,8 @@ import com.skua.modules.custom.handle.ICustomHandle;
import com.skua.modules.custom.service.IFCustomReportDatasetService;
import com.skua.modules.custom.vo.FCustomReportDatasetVO;
import javax.annotation.Resource;
/**
* <pre>
* 运营日报自定义逻辑
......@@ -31,155 +38,105 @@ import com.skua.modules.custom.vo.FCustomReportDatasetVO;
public class YyrbReportHandle implements ICustomHandle{
@Autowired
private IFCustomReportDatasetService fCustomReportDatasetService;
@Autowired
private ICommonSqlService commonSqlService;
@Override
public Map<String, List<Map<String, ValueEntity>>> buildDataMap(String reportId, String startTime, String endTime,
String departId,String indexCode) {
//主库数据源
JdbcTemplate masterDB = (JdbcTemplate)SpringContextUtils.getBean("master");
Map<String,List<Map<String,ValueEntity>>> dataMap = new HashMap<String,List<Map<String,ValueEntity>>>();
//获取数据集
List<FCustomReportDatasetVO> dataSetList = fCustomReportDatasetService.getDataset(reportId);
for(FCustomReportDatasetVO fv : dataSetList) {
String dataSetId = fv.getDatasetId();
//获取填报数据及报表数据项信息，组装报表所需数据机构
List<Map<String,ValueEntity>> list = new ArrayList<Map<String,ValueEntity>>();
//根据数据集id获取数据项及填报数据
List<FCustomReportDatasetVO> dataFieldList = fCustomReportDatasetService.getDataField(dataSetId);
Map<String,String> dataFieldDict = new HashMap<String,String>();
for(FCustomReportDatasetVO dataField : dataFieldList) {
dataFieldDict.put(dataField.getDatasetId(), dataField.getDatasetName());
}
//添加厂站、时间字段
dataFieldDict.put("depart_name", "厂站名称");
dataFieldDict.put("time", "时间");
dataFieldDict.put("paramTime", "参数时间");
//获取填报数据
//String dataViewName = "view_"+dataSetId.substring(0,4);
String dataViewName = ReportViewUtil.buildView(dataSetId,"", departId, startTime, endTime);
//结果集
List<Map<String, Object>> valueMapList = fCustomReportDatasetService.queryReportValue(dataViewName,startTime,endTime,departId);
for(Map<String,Object> valueMap : valueMapList) {
Map<String,ValueEntity> handleMap = new HashMap<String,ValueEntity>();
//添加时间参数
ValueEntity startTimeValueEntity = new ValueEntity();
startTimeValueEntity.setValue(startTime);
handleMap.put("参数时间", startTimeValueEntity);
Set<String> keySet = valueMap.keySet();
for(String key : keySet) {
if(!StringUtils.isEmpty(dataFieldDict.get(key))) {
ValueEntity valueEntity = new ValueEntity();
valueEntity.setValue(ConvertUtils.getString(valueMap.get(key)));
handleMap.put(dataFieldDict.get(key),valueEntity);
}
}
list.add(handleMap);
}
dataMap.put(fv.getDatasetName(), list);
String departId,String indexCode) {
String departIds = "";
List<DepartVO> departList = commonSqlService.getChildDepartList(departId);
for (DepartVO departVO : departList) {
departIds = departVO.getDepartId() + "," + departIds;
}
List<Map<String,ValueEntity>> bzList = new ArrayList<Map<String,ValueEntity>>();
Map<String,ValueEntity> bzMap = new HashMap<String,ValueEntity>();
bzList.add(bzMap);
dataMap.put("水质标准", bzList);
//添加进出水标准及污泥含水率
//获取污泥含水率
List<Map<String, Object>> moistureRateList = masterDB.queryForList("select moisture_rate from sys_factory_info where depart_id='"+departId+"'");
Map<String,Object> moistureRateMap = new HashMap<String,Object>();
if(moistureRateList!=null&&moistureRateList.size()>0) {
moistureRateMap = moistureRateList.get(0);
String[] departIdArray = departIds.split(",");
Map<String,List<Map<String,ValueEntity>>> resMap = new HashMap<String,List<Map<String,ValueEntity>>>();
Map<String,List<Map<String,ValueEntity>>> dataMap = new HashMap<String,List<Map<String,ValueEntity>>>();
//获取填报数据及报表数据项信息，组装报表所需数据机构
List<Map<String,ValueEntity>> list = new ArrayList<Map<String,ValueEntity>>();
//根据数据集id获取数据项及填报数据
List<FCustomReportDatasetVO> dataFieldList1 = fCustomReportDatasetService.getDataField(ReportConstant.view3a24);
Map<String,String> dataFieldDict = new HashMap<String,String>();
for(FCustomReportDatasetVO dataField : dataFieldList1) {
dataFieldDict.put(dataField.getDatasetId(), dataField.getDatasetName());
}
String wnhsl = ConvertUtils.getString(moistureRateMap.get("moisture_rate"), "-");
ValueEntity wnhslValueEntity = new ValueEntity();
wnhslValueEntity.setValue(wnhsl=="-"?"-":"≤"+wnhsl);
bzMap.put("污泥含水率", wnhslValueEntity);
//获取进水
Map<String,Object> inLevelMap = new HashMap<String,Object>();
List<Map<String, Object>> inLevelList = masterDB.queryForList("select index_code,upper from water_quality_in_level where depart_id='"+departId+"'");
if(inLevelList!=null&&inLevelList.size()>0) {
for(Map<String,Object> map :inLevelList) {
inLevelMap.put(String.valueOf(map.get("index_code")), map.get("upper"));
}
List<FCustomReportDatasetVO> dataFieldList2 = fCustomReportDatasetService.getDataField(ReportConstant.view2119);
for(FCustomReportDatasetVO dataField : dataFieldList2) {
dataFieldDict.put(dataField.getDatasetId(), dataField.getDatasetName());
}
String jscod = ConvertUtils.getString(inLevelMap.get("JSCOD"), "-");
ValueEntity jscodValueEntity = new ValueEntity();
jscodValueEntity.setValue(jscod=="-"?"-":"≤"+jscod);
bzMap.put("进水化学需氧量 CODcr", jscodValueEntity);
String jsbod = ConvertUtils.getString(inLevelMap.get("JSBOD"), "-");
ValueEntity jsbodValueEntity = new ValueEntity();
jsbodValueEntity.setValue(jsbod=="-"?"-":"≤"+jsbod);
bzMap.put("进水五日生化需氧量BOD5", jsbodValueEntity);
String jsss = ConvertUtils.getString(inLevelMap.get("JSSS"), "-");
ValueEntity jsssValueEntity = new ValueEntity();
jsssValueEntity.setValue(jsss=="-"?"-":"≤"+jsss);
bzMap.put("进水悬浮固体SS", jsssValueEntity);
String jsnh3n = ConvertUtils.getString(inLevelMap.get("JSNH3N"), "-");
ValueEntity jsnh3nValueEntity = new ValueEntity();
jsnh3nValueEntity.setValue(jsnh3n=="-"?"-":"≤"+jsnh3n);
bzMap.put("进水氨氮NH₃-N", jsnh3nValueEntity);
String jstn = ConvertUtils.getString(inLevelMap.get("JSTN"), "-");
ValueEntity jstnValueEntity = new ValueEntity();
jstnValueEntity.setValue(jstn=="-"?"-":"≤"+jstn);
bzMap.put("进水总氮TN", jstnValueEntity);
String jstp = ConvertUtils.getString(inLevelMap.get("JSTP"), "-");
ValueEntity jstpValueEntity = new ValueEntity();
jstpValueEntity.setValue(jstp=="-"?"-":"≤"+jstp);
bzMap.put("进水总磷TP", jstpValueEntity);
//获取出水
Map<String,Object> outLevelMap = new HashMap<String,Object>();
List<Map<String, Object>> outLevelList = masterDB.queryForList("select a.id,b.alarm_param_code as index_code,b.alarm_param_upper_limit as upper,alarm_param_lower_limit from alarm_level_standard_config a left join alarm_param_standard_config b\r\n" +
"on a.id=b.alarm_level_standard_id where a.alarm_standard_level_code=(select out_level from sys_factory_info where depart_id='"+departId+"')");
if(outLevelList!=null&&outLevelList.size()>0) {
for(Map<String,Object> map :outLevelList) {
outLevelMap.put(String.valueOf(map.get("index_code")), map.get("upper"));
//添加厂站、时间字段
dataFieldDict.put("depart_name", "机构名称");
dataFieldDict.put("time", "时间");
dataFieldDict.put("paramDepart", "参数机构");
dataFieldDict.put("depart_id", "机构编码");
//获取填报数据
String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,"", departIds, startTime, endTime);
String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"", departIds, startTime, endTime);
//结果集
List<Map<String, Object>> szMapList = fCustomReportDatasetService.querySzYyrbReport(dataViewName2119, startTime, endTime, departIds);
list = changeDataList(szMapList,list,startTime,dataFieldDict);
dataMap.put("水质水量报表", list);
List<Map<String, Object>> nhMapList = fCustomReportDatasetService.queryNhYyrbReport(dataViewName3a24, startTime, endTime, departIds);
list = changeDataList(nhMapList,list,startTime,dataFieldDict);
dataMap.put("能耗报表", list);
List<Map<String,ValueEntity>> dList = new ArrayList<>();
for (DepartVO departVO : departList) {
String departStr = departVO.getDepartId();
Map<String,ValueEntity> newDataMap = new HashMap<>();
ValueEntity codeEntity = new ValueEntity();
codeEntity.setValue(departStr);
newDataMap.put("机构编码", codeEntity);
ValueEntity nameEntity = new ValueEntity();
nameEntity.setValue(departVO.getDepartName());
newDataMap.put("机构名称", nameEntity);
for (Map.Entry<String, List<Map<String,ValueEntity>>> entry : dataMap.entrySet()) {
List<Map<String,ValueEntity>> dataList = entry.getValue();
for (Map<String,ValueEntity> dMap: dataList) {
if(departStr.equals(dMap.get("机构编码").getValue())){
newDataMap.putAll(dMap);
}
}
}
dList.add(newDataMap);
}
String cscod = ConvertUtils.getString(outLevelMap.get("CSCOD"), "-");
ValueEntity cscodValueEntity = new ValueEntity();
cscodValueEntity.setValue(cscod=="-"?"-":"≤"+cscod);
bzMap.put("出水化学需氧量 CODcr", cscodValueEntity);
String csbod = ConvertUtils.getString(outLevelMap.get("CSBOD"), "-");
ValueEntity csbodValueEntity = new ValueEntity();
csbodValueEntity.setValue(csbod=="-"?"-":"≤"+csbod);
bzMap.put("出水五日生化需氧量BOD5", csbodValueEntity);
String csss = ConvertUtils.getString(outLevelMap.get("CSSS"), "-");
ValueEntity csssValueEntity = new ValueEntity();
csssValueEntity.setValue(csss=="-"?"-":"≤"+csss);
bzMap.put("出水悬浮固体SS", csssValueEntity);
String csnh3n = ConvertUtils.getString(outLevelMap.get("CSNH3N"), "-");
ValueEntity csnh3nValueEntity = new ValueEntity();
csnh3nValueEntity.setValue(csnh3n=="-"?"-":"≤"+csnh3n);
bzMap.put("出水氨氮NH₃-N", csnh3nValueEntity);
String cstn = ConvertUtils.getString(outLevelMap.get("CSTN"), "-");
ValueEntity cstnValueEntity = new ValueEntity();
cstnValueEntity.setValue(cstn=="-"?"-":"≤"+cstn);
bzMap.put("出水总氮TN", cstnValueEntity);
String cstp = ConvertUtils.getString(outLevelMap.get("CSTP"), "-");
ValueEntity cstpValueEntity = new ValueEntity();
cstpValueEntity.setValue(cstp=="-"?"-":"≤"+cstp);
bzMap.put("出水总磷TP", cstpValueEntity);
return dataMap;
resMap.put("综合数据源", dList);
return resMap;
}
@Override
public String buildWaterQualityAlarmValue(String reportId, String departId, String json) {
return json;
}
/**
* 构造LIST
* @param szMapList
* @param list
* @param startTime
* @param dataFieldDict
* @return
*/
private List<Map<String, ValueEntity>> changeDataList(List<Map<String, Object>> szMapList, List<Map<String, ValueEntity>> list,
String startTime, Map<String, String> dataFieldDict) {
for(Map<String,Object> valueMap : szMapList) {
Map<String,ValueEntity> handleMap = new HashMap<String,ValueEntity>();
//添加时间参数
ValueEntity startTimeValueEntity = new ValueEntity();
startTimeValueEntity.setValue(startTime);
handleMap.put("参数机构", startTimeValueEntity);
Set<String> keySet = valueMap.keySet();
for(String key : keySet) {
if(!StringUtils.isEmpty(dataFieldDict.get(key))) {
ValueEntity valueEntity = new ValueEntity();
valueEntity.setValue(ConvertUtils.getString(valueMap.get(key)));
handleMap.put(dataFieldDict.get(key),valueEntity);
}
}
list.add(handleMap);
}
return list;
}
}
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/FCustomReportDatasetMapper.java
......@@ -136,4 +136,12 @@ public interface FCustomReportDatasetMapper extends BaseMapper<FCustomReportData
List<Map<String, Object>> queryNhYyybReport(@Param(value="dataViewName3a24") String dataViewName3a24,
@Param(value="startTime") String startTime, @Param(value="endTime") String endTime,
@Param(value="departId") String departId);
List<Map<String, Object>> querySzYyrbReport(@Param(value="dataViewName2119") String dataViewName2119,
@Param(value="startTime")String startTime, @Param(value="endTime")String endTime,
@Param(value="departId") String departId);
List<Map<String, Object>> queryNhYyrbReport(@Param(value="dataViewName3a24") String dataViewName3a24,
@Param(value="startTime") String startTime, @Param(value="endTime") String endTime,
@Param(value="departId") String departId);
}
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
......@@ -515,8 +515,8 @@
<select id="querySzYynbReport" resultType="java.util.HashMap">
SELECT
ROUND( SUM( v.JSL ), 2 ) AS `JSL`,
ROUND( SUM( v.CSL ), 2 ) AS `CSL`,
ROUND( SUM( v.JSL )/10000, 2 ) AS `JSL`,
ROUND( SUM( v.CSL )/10000, 2 ) AS `CSL`,
ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`,
ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`,
ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`,
......@@ -547,41 +547,41 @@
<select id="queryNhYynbReport" resultType="java.util.HashMap">
SELECT
SUM(v3.PFS) AS PFS,
SUM(v3.FHTY) AS FHTY,
SUM(v3.RYXNJ) AS RYXNJ,
SUM(v3.YWL) AS YWL,
SUM(v3.GXCLJ) AS GXCLJ,
SUM(v3.CH3COONA) AS CH3COONA,
SUM(v3.HXT) AS HXT,
SUM(v3.FECL3) AS FECL3,
SUM(v3.SH) AS SH,
SUM(v3.CH3COOH) AS CH3COOH,
SUM(v3.FESO4G) AS FESO4G,
SUM(v3.FESO4Y) AS FESO4Y,
SUM(v3.H2O2) AS H2O2,
SUM(v3.GFFDL) AS GFFDL,
SUM(v3.QY) AS QY,
SUM(v3.GFCZL) AS GFCZL,
SUM(v3.WNHSL) AS WNHSL,
SUM(v3.WFCSL) AS WFCSL,
SUM(v3.WFCZL) AS WFCZL,
SUM(v3.DLJZ) AS DLJZ,
SUM(v3.GFSYL) AS GFSYL,
SUM(v3.WNL) AS WNL,
SUM(v3.DLFZ) AS DLFZ,
SUM(v3.DLPZ) AS DLPZ,
SUM(v3.DLGZ) AS DLGZ,
SUM(v3.DLHJ) AS DLHJ,
SUM(v3.YSL) AS YSL,
SUM(v3.PAMZ) AS PAMZ,
SUM(v3.PAMF) AS PAMF,
SUM(v3.PAMRJ) AS PAMRJ,
SUM(v3.SCLPAMZ) AS SCLPAMZ,
SUM(v3.SCLPAMF) AS SCLPAMF,
SUM(v3.NACLO) AS NACLO,
SUM(v3.PACGT) AS PACGT,
SUM(v3.PACYT) AS PACYT,
ROUND(SUM(v3.PFS),2) AS PFS,
ROUND(SUM(v3.FHTY),2) AS FHTY,
ROUND(SUM(v3.RYXNJ),2) AS RYXNJ,
ROUND(SUM(v3.YWL),2) AS YWL,
ROUND(SUM(v3.GXCLJ),2) AS GXCLJ,
ROUND(SUM(v3.CH3COONA),2) AS CH3COONA,
ROUND(SUM(v3.HXT),2) AS HXT,
ROUND(SUM(v3.FECL3),2) AS FECL3,
ROUND(SUM(v3.SH),2) AS SH,
ROUND(SUM(v3.CH3COOH),2) AS CH3COOH,
ROUND(SUM(v3.FESO4G),2) AS FESO4G,
ROUND(SUM(v3.FESO4Y),2) AS FESO4Y,
ROUND(SUM(v3.H2O2),2) AS H2O2,
ROUND(SUM(v3.GFFDL),2) AS GFFDL,
ROUND(SUM(v3.QY),2) AS QY,
ROUND(SUM(v3.GFCZL),2) AS GFCZL,
ROUND(SUM(v3.WNHSL),2) AS WNHSL,
ROUND(SUM(v3.WFCSL),2) AS WFCSL,
ROUND(SUM(v3.WFCZL),2) AS WFCZL,
ROUND(SUM(v3.DLJZ),2) AS DLJZ,
ROUND(SUM(v3.GFSYL),2) AS GFSYL,
ROUND(SUM(v3.WNL),2) AS WNL,
ROUND(SUM(v3.DLFZ),2) AS DLFZ,
ROUND(SUM(v3.DLPZ),2) AS DLPZ,
ROUND(SUM(v3.DLGZ),2) AS DLGZ,
ROUND(SUM(v3.DLHJ)/10000,2) AS DLHJ,
ROUND(SUM(v3.YSL),2) AS YSL,
ROUND(SUM(v3.PAMZ),2) AS PAMZ,
ROUND(SUM(v3.PAMF),2) AS PAMF,
ROUND(SUM(v3.PAMRJ),2) AS PAMRJ,
ROUND(SUM(v3.SCLPAMZ),2) AS SCLPAMZ,
ROUND(SUM(v3.SCLPAMF),2) AS SCLPAMF,
ROUND(SUM(v3.NACLO),2) AS NACLO,
ROUND(SUM(v3.PACGT),2) AS PACGT,
ROUND(SUM(v3.PACYT),2) AS PACYT,
v3.BZ AS BZ,
v3.depart_id AS depart_id,
LEFT(v3.time,7) AS time
......@@ -598,23 +598,23 @@
<select id="querySzYyybReport" resultType="java.util.HashMap">
SELECT
ROUND( SUM( v.JSL ), 2 ) AS `JSL`,
ROUND( SUM( v.CSL ), 2 ) AS `CSL`,
ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`,
ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`,
ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`,
ROUND( AVG( v.CSCOD ), 2 ) AS `CSCOD`,
ROUND( AVG( v.CSTN ), 2 ) AS `CSTN`,
ROUND( AVG( v.JSZD ), 2 ) AS `JSZD`,
ROUND( AVG( v.JSZL ), 2 ) AS `JSZL`,
ROUND( AVG( v.CSZL ), 2 ) AS `CSZL`,
ROUND( AVG( v.JSAD ), 2 ) AS `JSAD`,
ROUND( AVG( v.CSAD ), 2 ) AS `CSAD`,
ROUND( AVG( v.JSSS ), 2 ) AS `JSSS`,
ROUND( AVG( v.CSSS ), 2 ) AS `CSSS`,
v.BZ,
v.depart_id,
v.time
ROUND( SUM( v.JSL )/10000, 2 ) AS `JSL`,
ROUND( SUM( v.CSL )/10000, 2 ) AS `CSL`,
ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`,
ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`,
ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`,
ROUND( AVG( v.CSCOD ), 2 ) AS `CSCOD`,
ROUND( AVG( v.CSTN ), 2 ) AS `CSTN`,
ROUND( AVG( v.JSZD ), 2 ) AS `JSZD`,
ROUND( AVG( v.JSZL ), 2 ) AS `JSZL`,
ROUND( AVG( v.CSZL ), 2 ) AS `CSZL`,
ROUND( AVG( v.JSAD ), 2 ) AS `JSAD`,
ROUND( AVG( v.CSAD ), 2 ) AS `CSAD`,
ROUND( AVG( v.JSSS ), 2 ) AS `JSSS`,
ROUND( AVG( v.CSSS ), 2 ) AS `CSSS`,
v.BZ,
v.depart_id,
v.time
FROM
${dataViewName2119} v
WHERE
......@@ -629,44 +629,44 @@
<select id="queryNhYyybReport" resultType="java.util.HashMap">
SELECT
SUM(v3.PFS) AS PFS,
SUM(v3.FHTY) AS FHTY,
SUM(v3.RYXNJ) AS RYXNJ,
SUM(v3.YWL) AS YWL,
SUM(v3.GXCLJ) AS GXCLJ,
SUM(v3.CH3COONA) AS CH3COONA,
SUM(v3.HXT) AS HXT,
SUM(v3.FECL3) AS FECL3,
SUM(v3.SH) AS SH,
SUM(v3.CH3COOH) AS CH3COOH,
SUM(v3.FESO4G) AS FESO4G,
SUM(v3.FESO4Y) AS FESO4Y,
SUM(v3.H2O2) AS H2O2,
SUM(v3.GFFDL) AS GFFDL,
SUM(v3.QY) AS QY,
SUM(v3.GFCZL) AS GFCZL,
SUM(v3.WNHSL) AS WNHSL,
SUM(v3.WFCSL) AS WFCSL,
SUM(v3.WFCZL) AS WFCZL,
SUM(v3.DLJZ) AS DLJZ,
SUM(v3.GFSYL) AS GFSYL,
SUM(v3.WNL) AS WNL,
SUM(v3.DLFZ) AS DLFZ,
SUM(v3.DLPZ) AS DLPZ,
SUM(v3.DLGZ) AS DLGZ,
SUM(v3.DLHJ) AS DLHJ,
SUM(v3.YSL) AS YSL,
SUM(v3.PAMZ) AS PAMZ,
SUM(v3.PAMF) AS PAMF,
SUM(v3.PAMRJ) AS PAMRJ,
SUM(v3.SCLPAMZ) AS SCLPAMZ,
SUM(v3.SCLPAMF) AS SCLPAMF,
SUM(v3.NACLO) AS NACLO,
SUM(v3.PACGT) AS PACGT,
SUM(v3.PACYT) AS PACYT,
v3.BZ AS BZ,
v3.depart_id AS depart_id,
v3.time
ROUND(SUM(v3.PFS),2) AS PFS,
ROUND(SUM(v3.FHTY),2) AS FHTY,
ROUND(SUM(v3.RYXNJ),2) AS RYXNJ,
ROUND(SUM(v3.YWL),2) AS YWL,
ROUND(SUM(v3.GXCLJ),2) AS GXCLJ,
ROUND(SUM(v3.CH3COONA),2) AS CH3COONA,
ROUND(SUM(v3.HXT),2) AS HXT,
ROUND(SUM(v3.FECL3),2) AS FECL3,
ROUND(SUM(v3.SH),2) AS SH,
ROUND(SUM(v3.CH3COOH),2) AS CH3COOH,
ROUND(SUM(v3.FESO4G),2) AS FESO4G,
ROUND(SUM(v3.FESO4Y),2) AS FESO4Y,
ROUND(SUM(v3.H2O2),2) AS H2O2,
ROUND(SUM(v3.GFFDL),2) AS GFFDL,
ROUND(SUM(v3.QY),2) AS QY,
ROUND(SUM(v3.GFCZL),2) AS GFCZL,
ROUND(SUM(v3.WNHSL),2) AS WNHSL,
ROUND(SUM(v3.WFCSL),2) AS WFCSL,
ROUND(SUM(v3.WFCZL),2) AS WFCZL,
ROUND(SUM(v3.DLJZ),2) AS DLJZ,
ROUND(SUM(v3.GFSYL),2) AS GFSYL,
ROUND(SUM(v3.WNL),2) AS WNL,
ROUND(SUM(v3.DLFZ),2) AS DLFZ,
ROUND(SUM(v3.DLPZ),2) AS DLPZ,
ROUND(SUM(v3.DLGZ),2) AS DLGZ,
ROUND(SUM(v3.DLHJ)/10000,2) AS DLHJ,
ROUND(SUM(v3.YSL),2) AS YSL,
ROUND(SUM(v3.PAMZ),2) AS PAMZ,
ROUND(SUM(v3.PAMF),2) AS PAMF,
ROUND(SUM(v3.PAMRJ),2) AS PAMRJ,
ROUND(SUM(v3.SCLPAMZ),2) AS SCLPAMZ,
ROUND(SUM(v3.SCLPAMF),2) AS SCLPAMF,
ROUND(SUM(v3.NACLO),2) AS NACLO,
ROUND(SUM(v3.PACGT),2) AS PACGT,
ROUND(SUM(v3.PACYT),2) AS PACYT,
v3.BZ AS BZ,
v3.depart_id AS depart_id,
v3.time
FROM ${dataViewName3a24} v3
WHERE
v3.depart_id IN
......@@ -677,4 +677,90 @@
AND v3.time &lt;= #{endTime}
GROUP BY v3.time
</select>
<select id="querySzYyrbReport" resultType="java.util.HashMap">
SELECT
ROUND( SUM( v.JSL )/10000, 2 ) AS `JSL`,
ROUND( SUM( v.CSL )/10000, 2 ) AS `CSL`,
ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`,
ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`,
ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`,
ROUND( AVG( v.CSCOD ), 2 ) AS `CSCOD`,
ROUND( AVG( v.CSTN ), 2 ) AS `CSTN`,
ROUND( AVG( v.JSZD ), 2 ) AS `JSZD`,
ROUND( AVG( v.JSZL ), 2 ) AS `JSZL`,
ROUND( AVG( v.CSZL ), 2 ) AS `CSZL`,
ROUND( AVG( v.JSAD ), 2 ) AS `JSAD`,
ROUND( AVG( v.CSAD ), 2 ) AS `CSAD`,
ROUND( AVG( v.JSSS ), 2 ) AS `JSSS`,
ROUND( AVG( v.CSSS ), 2 ) AS `CSSS`,
v.BZ,
v.depart_id,
d.depart_name as depart_name,
v.time
FROM
${dataViewName2119} v
LEFT JOIN sys_depart d ON v.depart_id = d.id
WHERE
v.depart_id IN
<foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
'${item}'
</foreach>
AND v.time &gt;= #{startTime}
AND v.time &lt;= #{endTime}
GROUP BY v.depart_id
</select>
<select id="queryNhYyrbReport" resultType="java.util.HashMap">
SELECT
ROUND(SUM(v3.PFS),2) AS PFS,
ROUND(SUM(v3.FHTY),2) AS FHTY,
ROUND(SUM(v3.RYXNJ),2) AS RYXNJ,
ROUND(SUM(v3.YWL),2) AS YWL,
ROUND(SUM(v3.GXCLJ),2) AS GXCLJ,
ROUND(SUM(v3.CH3COONA),2) AS CH3COONA,
ROUND(SUM(v3.HXT),2) AS HXT,
ROUND(SUM(v3.FECL3),2) AS FECL3,
ROUND(SUM(v3.SH),2) AS SH,
ROUND(SUM(v3.CH3COOH),2) AS CH3COOH,
ROUND(SUM(v3.FESO4G),2) AS FESO4G,
ROUND(SUM(v3.FESO4Y),2) AS FESO4Y,
ROUND(SUM(v3.H2O2),2) AS H2O2,
ROUND(SUM(v3.GFFDL),2) AS GFFDL,
ROUND(SUM(v3.QY),2) AS QY,
ROUND(SUM(v3.GFCZL),2) AS GFCZL,
ROUND(SUM(v3.WNHSL),2) AS WNHSL,
ROUND(SUM(v3.WFCSL),2) AS WFCSL,
ROUND(SUM(v3.WFCZL),2) AS WFCZL,
ROUND(SUM(v3.DLJZ),2) AS DLJZ,
ROUND(SUM(v3.GFSYL),2) AS GFSYL,
ROUND(SUM(v3.WNL),2) AS WNL,
ROUND(SUM(v3.DLFZ),2) AS DLFZ,
ROUND(SUM(v3.DLPZ),2) AS DLPZ,
ROUND(SUM(v3.DLGZ),2) AS DLGZ,
ROUND(SUM(v3.DLHJ)/10000,2) AS DLHJ,
ROUND(SUM(v3.YSL),2) AS YSL,
ROUND(SUM(v3.PAMZ),2) AS PAMZ,
ROUND(SUM(v3.PAMF),2) AS PAMF,
ROUND(SUM(v3.PAMRJ),2) AS PAMRJ,
ROUND(SUM(v3.SCLPAMZ),2) AS SCLPAMZ,
ROUND(SUM(v3.SCLPAMF),2) AS SCLPAMF,
ROUND(SUM(v3.NACLO),2) AS NACLO,
ROUND(SUM(v3.PACGT),2) AS PACGT,
ROUND(SUM(v3.PACYT),2) AS PACYT,
v3.BZ AS BZ,
v3.depart_id AS depart_id,
d.depart_name as depart_name,
v3.time
FROM ${dataViewName3a24} v3
LEFT JOIN sys_depart d ON v3.depart_id = d.id
WHERE
v3.depart_id IN
<foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
'${item}'
</foreach>
AND v3.time &gt;= #{startTime}
AND v3.time &lt;= #{endTime}
GROUP BY v3.depart_id
</select>
</mapper>
......
sk-module-datafill/src/main/java/com/skua/modules/custom/service/IFCustomReportDatasetService.java
......@@ -136,4 +136,8 @@ public interface IFCustomReportDatasetService extends IService<FCustomReportData
List<Map<String, Object>> querySzYyybReport(String dataViewName2119, String startTime, String endTime, String departId);
List<Map<String, Object>> queryNhYyybReport(String dataViewName3a24, String startTime, String endTime, String departId);
List<Map<String, Object>> querySzYyrbReport(String dataViewName2119, String startTime, String endTime, String departId);
List<Map<String, Object>> queryNhYyrbReport(String dataViewName3a24, String startTime, String endTime, String departId);
}
......
sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
......@@ -454,6 +454,18 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
return list;
}
@Override
public List<Map<String, Object>> querySzYyrbReport(String dataViewName2119, String startTime, String endTime, String departId) {
List<Map<String, Object>> list = mapper.querySzYyrbReport(dataViewName2119, startTime, endTime, departId);
return list;
}
@Override
public List<Map<String, Object>> queryNhYyrbReport(String dataViewName3a24, String startTime, String endTime, String departId) {
List<Map<String, Object>> list = mapper.queryNhYyrbReport(dataViewName3a24, startTime, endTime, departId);
return list;
}
/**转换为Map<部门编号,JnhbReportData> */
private Map<String,JnhbReportData> convertJnhbReportDataMap(List<JnhbReportData> dataList){// Map<部门编号,JnhbReportData>
Map<String,JnhbReportData> dataMap = new HashMap<>();
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
......@@ -728,10 +728,13 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
Map<String, Object> maptb = factoryCenterMapper.getDhData(startDateTb, endDateTb, statisticsParam.getDepartId(), dataView3a24tb, dataView2119tb);
if(maptb!=null){
zdhTb = Double.parseDouble(maptb.get("zdh").toString());
if(zdhTb > 0.0){
zdhTb = Double.parseDouble(df.format(100*(zdh - zdhTb)/zdhTb));
}
rjdhTb = Double.parseDouble(maptb.get("rjdh").toString());
zdhTb = Double.parseDouble(df.format(100*(zdh - zdhTb)/zdhTb));
rjdhTb = Double.parseDouble(df.format(100*(rjdh - rjdhTb)/rjdhTb));
if(rjdhTb > 0.0){
rjdhTb = Double.parseDouble(df.format(100*(rjdh - rjdhTb)/rjdhTb));
}
if(maptb.get("dsdh")!=null){
dsdhTb = Double.parseDouble(maptb.get("dsdh").toString());
dsdhTb = Double.parseDouble(df.format(100*(dsdh - dsdhTb)/dsdhTb));
......@@ -743,9 +746,13 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
Map<String, Object> maphb = factoryCenterMapper.getDhData(startDateHb, endDateHb, statisticsParam.getDepartId(), dataView3a24hb, dataView2119hb);
if(maphb!=null){
zdhHb = Double.parseDouble(maphb.get("zdh").toString());
if(zdhHb > 0.0){
zdhHb = Double.parseDouble(df.format(100*(zdh - zdhHb)/zdhHb));
}
rjdhHb = Double.parseDouble(maphb.get("rjdh").toString());
zdhHb = Double.parseDouble(df.format(100*(zdh - zdhHb)/zdhHb));
rjdhHb = Double.parseDouble(df.format(100*(rjdh - rjdhHb)/rjdhHb));
if(rjdhHb > 0.0){
rjdhHb = Double.parseDouble(df.format(100*(rjdh - rjdhHb)/rjdhHb));
}
if(maphb.get("dsdh")!=null){
dsdhHb = Double.parseDouble(maphb.get("dsdh").toString());
dsdhHb = Double.parseDouble(df.format(100*(dsdh - dsdhHb)/dsdhHb));
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!