1.模板字段*添加红色标识
2.预警单,反馈单导出接口增加 3.修改技术监督月报统计逻辑
This commit is contained in:
wr
@@ -1,5 +1,6 @@
|
||||
package com.njcn.process.pojo.po;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
@@ -38,14 +39,17 @@ public class SupvAlarm {
|
||||
|
||||
@ApiModelProperty("单据类别")
|
||||
@TableField("bill_Type")
|
||||
@Excel(name = "*单据类别",width = 15)
|
||||
private String billType;
|
||||
|
||||
@ApiModelProperty("单据编号")
|
||||
@TableField("bill_No")
|
||||
@Excel(name = "*单据编号",width = 30)
|
||||
private String billNo;
|
||||
|
||||
@ApiModelProperty("单据名称")
|
||||
@TableField("bill_Name")
|
||||
@Excel(name = "*单据名称",width = 20)
|
||||
private String billName;
|
||||
|
||||
@ApiModelProperty("编制单位id,取ISC平台上的组织id （sys_dept）")
|
||||
@@ -54,10 +58,12 @@ public class SupvAlarm {
|
||||
|
||||
@ApiModelProperty("编制单位名称,取ISC平台上的组织名称")
|
||||
@TableField("creater_Org_Name")
|
||||
@Excel(name = "*编制单位名称",width = 20)
|
||||
private String createrOrgName;
|
||||
|
||||
@ApiModelProperty("所属专业,见3.11（字典）")
|
||||
@TableField("speciality_Type")
|
||||
@Excel(name = "*所属专业",width = 15)
|
||||
private String specialityType;
|
||||
|
||||
@ApiModelProperty("责任单位id,取ISC平台上的组织id")
|
||||
@@ -66,15 +72,16 @@ public class SupvAlarm {
|
||||
|
||||
@ApiModelProperty("责任单位名称,取ISC平台上的组织名称")
|
||||
@TableField("org_Name")
|
||||
@Excel(name = "*责任单位名称",width = 20)
|
||||
private String orgName;
|
||||
|
||||
@ApiModelProperty("接收人id,取ISC平台上的人员id")
|
||||
@TableField("receive_UserId")
|
||||
|
||||
private String receiveUserId;
|
||||
|
||||
@ApiModelProperty("接收人名称,取ISC平台上的人员名称")
|
||||
@TableField("receive_User_Name")
|
||||
@Excel(name = "接收人名称",width = 15)
|
||||
private String receiveUserName;
|
||||
|
||||
@ApiModelProperty("编制时间 yyyy-MM-dd HH:mm:ss")
|
||||
@@ -82,12 +89,19 @@ public class SupvAlarm {
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
||||
private LocalDateTime createrTime;
|
||||
|
||||
@ApiModelProperty("编制时间 yyyy-MM-dd HH:mm:ss")
|
||||
@TableField(exist = false)
|
||||
@Excel(name = "*编制时间",width = 20)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
||||
private String time;
|
||||
|
||||
@ApiModelProperty("主管部门id,取ISC平台上的组织id")
|
||||
@TableField("manager_Dept_Id")
|
||||
private String managerDeptId;
|
||||
|
||||
@ApiModelProperty("主管部门名称,取ISC平台上的组织名称")
|
||||
@TableField("manager_Dept_Name")
|
||||
@Excel(name = "*主管部门名称",width = 15)
|
||||
private String managerDeptName;
|
||||
|
||||
@ApiModelProperty("主送单位id,取ISC平台上的组织id")
|
||||
@@ -96,6 +110,7 @@ public class SupvAlarm {
|
||||
|
||||
@ApiModelProperty("主送单位名称,取ISC平台上的组织名称")
|
||||
@TableField("main_Sender_Name")
|
||||
@Excel(name = "主送单位名称",width = 15)
|
||||
private String mainSenderName;
|
||||
|
||||
@ApiModelProperty("抄送单位id,取ISC平台上的组织id")
|
||||
@@ -104,22 +119,27 @@ public class SupvAlarm {
|
||||
|
||||
@ApiModelProperty("抄送单位名称,取ISC平台上的组织名称")
|
||||
@TableField("copy_Sender_Name")
|
||||
@Excel(name = "抄送单位名称",width = 20)
|
||||
private String copySenderName;
|
||||
|
||||
@ApiModelProperty("依据标准")
|
||||
@TableField("tech_Supv_Basis")
|
||||
@Excel(name = "*依据标准",width = 60)
|
||||
private String techSupvBasis;
|
||||
|
||||
@ApiModelProperty("问题描述")
|
||||
@TableField("problem_Desc")
|
||||
@Excel(name = "*问题描述",width = 60)
|
||||
private String problemDesc;
|
||||
|
||||
@ApiModelProperty("处理建议")
|
||||
@TableField("deal_Advise")
|
||||
@Excel(name = "*处理建议",width = 60)
|
||||
private String dealAdvise;
|
||||
|
||||
@ApiModelProperty("0.以上送 1.未上送 2.取消上送 3.待重新上送")
|
||||
@TableField("is_upload_head")
|
||||
private Integer isUploadHead;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.njcn.process.pojo.po;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
@@ -27,13 +28,27 @@ public class SupvAlarmBack {
|
||||
@TableId("alarm_Back_Id")
|
||||
private String alarmBackId;
|
||||
|
||||
@ApiModelProperty("单据编号")
|
||||
@Excel(name = "单据编号",width = 30)
|
||||
@TableField(exist = false)
|
||||
private String billNo;
|
||||
|
||||
@ApiModelProperty("单据名称")
|
||||
@TableField(exist = false)
|
||||
@Excel(name = "单据名称",width = 30)
|
||||
private String billName;
|
||||
|
||||
@ApiModelProperty("项目执行单位id")
|
||||
@TableField("execute_Org_Id")
|
||||
private String executeOrgId;
|
||||
|
||||
@ApiModelProperty("项目执行单位名称")
|
||||
@TableField("execute_Org_Name")
|
||||
@Excel(name = "项目执行单位名称",width = 30)
|
||||
private String executeOrgName;
|
||||
|
||||
@TableField("treatment_Measures")
|
||||
@Excel(name = "*采取措施",width = 60)
|
||||
private String treatmentMeasures;
|
||||
|
||||
@ApiModelProperty("填报人id,取ISC平台上的人员id")
|
||||
@@ -42,6 +57,7 @@ public class SupvAlarmBack {
|
||||
|
||||
@ApiModelProperty("填报人名称,取ISC平台上的人员名称")
|
||||
@TableField("fill_User_Name")
|
||||
@Excel(name = "*填报人名称",width = 30)
|
||||
private String fillUserName;
|
||||
|
||||
@ApiModelProperty("完成时间 yyyy-MM-dd HH:mm:ss")
|
||||
@@ -49,25 +65,22 @@ public class SupvAlarmBack {
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
||||
private LocalDateTime completeTime;
|
||||
|
||||
@ApiModelProperty("完成时间")
|
||||
@Excel(name = "*完成时间",width = 30)
|
||||
@TableField(exist = false)
|
||||
private String time;
|
||||
|
||||
@ApiModelProperty("告预警单id,关联告预警单表")
|
||||
@TableField("work_Alarm_Id")
|
||||
private String workAlarmId;
|
||||
|
||||
@ApiModelProperty("单据编号")
|
||||
@TableField(exist = false)
|
||||
private String billNo;
|
||||
|
||||
@ApiModelProperty("单据名称")
|
||||
@TableField(exist = false)
|
||||
private String billName;
|
||||
|
||||
|
||||
@ApiModelProperty("反馈单位id,取ISC平台上的组织id")
|
||||
@TableField("feedback_Org_Id")
|
||||
private String feedbackOrgId;
|
||||
|
||||
@ApiModelProperty("反馈单位名称,取ISC平台上的组织名称")
|
||||
@TableField("feedback_Org_Name")
|
||||
@Excel(name = "反馈单位名称",width = 30)
|
||||
private String feedbackOrgName;
|
||||
|
||||
@TableField("province_Id")
|
||||
|
||||
@@ -29,10 +29,10 @@ public class SupvProblemVO {
|
||||
@Excel(name = "计划名称",width = 40)
|
||||
private String workPlanName;
|
||||
|
||||
@Excel(name = "责任单位编号",width = 15)
|
||||
@Excel(name = "责任单位编号",width = 20)
|
||||
private String dutyOrgId;
|
||||
|
||||
@Excel(name = "责任单位名称",width = 15)
|
||||
@Excel(name = "责任单位名称",width = 20)
|
||||
private String dutyOrgName;
|
||||
|
||||
@Excel(name = "监测点类型",width = 15)
|
||||
@@ -44,7 +44,7 @@ public class SupvProblemVO {
|
||||
@Excel(name = "计划整改时间",width = 15)
|
||||
private String planRectificationTime;
|
||||
|
||||
@Excel(name = "整改情况",width = 15,replace = {"已整改_01","未整改_02"})
|
||||
@Excel(name = "整改情况",width = 15,replace = {"已整改_02","未整改_01"})
|
||||
private String rectificationStatus;
|
||||
|
||||
@Excel(name = "整改时间",width = 15)
|
||||
|
||||
@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelForEachParams;
|
||||
import cn.afterturn.easypoi.excel.export.styler.IExcelExportStyler;
|
||||
import org.apache.poi.hssf.util.HSSFColor;
|
||||
import org.apache.poi.ss.usermodel.*;
|
||||
import org.apache.poi.xssf.usermodel.XSSFRichTextString;
|
||||
|
||||
/**
|
||||
* pqs
|
||||
@@ -35,7 +36,7 @@ public class ExcelStyleUtil implements IExcelExportStyler {
|
||||
private void init(Workbook workbook) {
|
||||
this.styles = initStyles(workbook);
|
||||
this.titleStyle = initTitleStyle(workbook);
|
||||
this.headerStyle = initTitleStyle(workbook);
|
||||
this.headerStyle = initHeaderStyle(workbook);
|
||||
}
|
||||
|
||||
|
||||
@@ -131,28 +132,11 @@ public class ExcelStyleUtil implements IExcelExportStyler {
|
||||
}
|
||||
font.setFontName("Courier New");
|
||||
style.setFont(font);
|
||||
// 设置底边框
|
||||
style.setBorderBottom(BorderStyle.THIN);
|
||||
// 设置左边框
|
||||
style.setBorderLeft(BorderStyle.THIN);
|
||||
// 设置右边框;
|
||||
style.setBorderRight(BorderStyle.THIN);
|
||||
// 设置顶边框;
|
||||
style.setBorderTop(BorderStyle.THIN);
|
||||
// 设置底边颜色
|
||||
style.setBottomBorderColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex());
|
||||
// 设置左边框颜色;
|
||||
style.setLeftBorderColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex());
|
||||
// 设置右边框颜色;
|
||||
style.setRightBorderColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex());
|
||||
// 设置顶边框颜色;
|
||||
style.setTopBorderColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex());
|
||||
// 设置自动换行;
|
||||
style.setWrapText(false);
|
||||
|
||||
|
||||
// 设置垂直对齐的样式为居中对齐;
|
||||
style.setVerticalAlignment(VerticalAlignment.CENTER);
|
||||
return style;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -68,6 +68,12 @@ public class SupvAlarmBackController extends BaseController {
|
||||
Boolean b = supvAlarmBackService.delAlarmBack(planIds);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
|
||||
}
|
||||
@PostMapping("/downAlarmBack")
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
|
||||
@ApiOperation("导出预告警单反馈数据信息")
|
||||
public void downAlarm(){
|
||||
supvAlarmBackService.downAlarmBack();
|
||||
}
|
||||
|
||||
@PostMapping("pageAlarmBack")
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
|
||||
@@ -69,6 +69,13 @@ public class SupvAlarmController extends BaseController {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
|
||||
}
|
||||
|
||||
@PostMapping("/downAlarm")
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
|
||||
@ApiOperation("导出预告警单信息")
|
||||
public void downAlarm(){
|
||||
supvAlarmService.downAlarm();
|
||||
}
|
||||
|
||||
@PostMapping("pageAlarm")
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@ApiOperation("分页查询预告警单")
|
||||
|
||||
@@ -21,4 +21,5 @@ public interface SupvAlarmBackMapper extends BaseMapper<SupvAlarmBack> {
|
||||
|
||||
|
||||
Page<SupvAlarmBack> pageAlarmBack(Page objectPage,@Param("ids") List<String> ids,@Param("param") SupvAlarmBackParam param);
|
||||
List<SupvAlarmBack> selectAlarmBack();
|
||||
}
|
||||
|
||||
@@ -21,12 +21,15 @@ import java.util.List;
|
||||
*/
|
||||
public interface SupvReportMMapper extends MppBaseMapper<SupvReportM> {
|
||||
|
||||
//月报计划统计(按照实施结束时间统计)
|
||||
List<ProcessPublicDTO> statisticPlanReport(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("objType")String objType,@Param("effectStatus")List<String> effectStatus);
|
||||
//本年计划统计(按照计划时间统计)
|
||||
List<ProcessPublicDTO> statisticPlanReportYear(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("objType")String objType,@Param("effectStatus")List<String> effectStatus);
|
||||
|
||||
//问题数据
|
||||
//问题数据(问题发现时间统计)
|
||||
List<ProcessPublicDTO> statisticQueReport(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("rectificationStatus")String rectificationStatus,@Param("objType")String objType);
|
||||
|
||||
//问题整改数量
|
||||
//问题整改数量(问题整改时间统计)
|
||||
List<ProcessPublicDTO> statisticQueReportRectify(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("rectificationStatus")String rectificationStatus,@Param("objType")String objType);
|
||||
|
||||
|
||||
|
||||
@@ -19,4 +19,14 @@
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
<select id="selectAlarmBack" resultType="com.njcn.process.pojo.po.SupvAlarmBack">
|
||||
select
|
||||
sab.*,
|
||||
sab.complete_Time as time,
|
||||
sa.bill_No,
|
||||
sa.bill_Name
|
||||
from
|
||||
supv_alarm sa
|
||||
INNER JOIN supv_alarm_back sab on sab.work_Alarm_Id = sa.Alarm_Id
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
where
|
||||
supv_Type = #{statisticType}
|
||||
<if test="startTime!=null and endTime!=null">
|
||||
and plan_Supv_Date between #{startTime} and #{endTime}
|
||||
and effect_End_Time between #{startTime} and #{endTime}
|
||||
</if>
|
||||
<if test="objType !=null and objType!=''">
|
||||
and obj_type = #{objType}
|
||||
@@ -57,4 +57,22 @@
|
||||
</if>
|
||||
group by a.duty_Org_Id
|
||||
</select>
|
||||
<select id="statisticPlanReportYear" resultType="com.njcn.process.pojo.dto.ProcessPublicDTO">
|
||||
select count(1) value,supv_Org_Id id from supv_plan
|
||||
where
|
||||
supv_Type = #{statisticType}
|
||||
<if test="startTime!=null and endTime!=null">
|
||||
and plan_Supv_Date between #{startTime} and #{endTime}
|
||||
</if>
|
||||
<if test="objType !=null and objType!=''">
|
||||
and obj_type = #{objType}
|
||||
</if>
|
||||
<if test="effectStatus !=null">
|
||||
and effect_Status in
|
||||
<foreach collection="effectStatus" item="item" open="(" close=")" separator=",">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
group by supv_Org_Id
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -25,4 +25,6 @@ public interface ISupvAlarmBackService extends IService<SupvAlarmBack> {
|
||||
boolean delAlarmBack(List<String> planIds);
|
||||
|
||||
Page<SupvAlarmBack> pageAlarmBack(SupvAlarmBackParam param);
|
||||
|
||||
void downAlarmBack();
|
||||
}
|
||||
|
||||
@@ -24,4 +24,6 @@ public interface ISupvAlarmService extends IService<SupvAlarm> {
|
||||
boolean delAlarm(List<String> planIds);
|
||||
|
||||
Page<SupvAlarm> pageAlarm(SupvAlarmParam param);
|
||||
|
||||
void downAlarm();
|
||||
}
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
package com.njcn.process.service.impl;
|
||||
|
||||
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.poi.excel.ExcelUtil;
|
||||
import com.njcn.process.mapper.SupvAlarmBackMapper;
|
||||
import com.njcn.process.pojo.param.SupvAlarmBackParam;
|
||||
import com.njcn.process.pojo.po.SupvAlarm;
|
||||
import com.njcn.process.pojo.po.SupvAlarmBack;
|
||||
import com.njcn.process.service.ISupvAlarmBackService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.njcn.system.api.DicDataFeignClient;
|
||||
import com.njcn.user.api.DeptFeignClient;
|
||||
import com.njcn.user.pojo.po.Dept;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -79,4 +80,11 @@ public class SupvAlarmBackServiceImpl extends ServiceImpl<SupvAlarmBackMapper, S
|
||||
);
|
||||
return page;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void downAlarmBack() {
|
||||
List<SupvAlarmBack> list = this.baseMapper.selectAlarmBack();
|
||||
ExportParams exportParams = new ExportParams("预告警单反馈数据模板（带*字段均是必填,请严格按照模板标准填入数据）", "预告警单反馈数据信息");
|
||||
ExcelUtil.exportExcel(exportParams,"预告警单反馈数据信息.xlsx",SupvAlarmBack.class, list);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,23 +1,33 @@
|
||||
package com.njcn.process.service.impl;
|
||||
|
||||
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.date.DatePattern;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.poi.excel.ExcelUtil;
|
||||
import com.njcn.process.mapper.SupvAlarmMapper;
|
||||
import com.njcn.process.pojo.param.SupvAlarmParam;
|
||||
import com.njcn.process.pojo.po.SupvAlarm;
|
||||
import com.njcn.process.pojo.po.SupvPlanHis;
|
||||
import com.njcn.process.service.ISupvAlarmService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.njcn.system.api.DicDataFeignClient;
|
||||
import com.njcn.system.enums.DicDataTypeEnum;
|
||||
import com.njcn.system.pojo.po.DictData;
|
||||
import com.njcn.user.api.DeptFeignClient;
|
||||
import com.njcn.user.pojo.po.Dept;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -32,6 +42,7 @@ import java.util.List;
|
||||
public class SupvAlarmServiceImpl extends ServiceImpl<SupvAlarmMapper, SupvAlarm> implements ISupvAlarmService {
|
||||
|
||||
private final DeptFeignClient deptFeignClient;
|
||||
private final DicDataFeignClient dicDataFeignClient;
|
||||
|
||||
@Value("${gw.code}")
|
||||
private String code;
|
||||
@@ -79,4 +90,32 @@ public class SupvAlarmServiceImpl extends ServiceImpl<SupvAlarmMapper, SupvAlarm
|
||||
);
|
||||
return page;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void downAlarm() {
|
||||
//单据类型
|
||||
List<DictData> billList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.BILL_TYPE.getCode()).getData();
|
||||
Map<String, DictData> mapBill = billList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
|
||||
|
||||
//所属专业
|
||||
List<DictData> specialityList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SPECIALITY_TYPE.getCode()).getData();
|
||||
Map<String, DictData> mapSpeciality = specialityList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
|
||||
|
||||
List<SupvAlarm> list = this.list();
|
||||
if(CollUtil.isNotEmpty(list)){
|
||||
for (SupvAlarm supvAlarm : list) {
|
||||
supvAlarm.setTime(supvAlarm.getCreaterTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
|
||||
if (mapBill.containsKey(supvAlarm.getBillType())) {
|
||||
supvAlarm.setBillType(mapBill.get(supvAlarm.getBillType()).getName());
|
||||
}
|
||||
|
||||
if (mapSpeciality.containsKey(supvAlarm.getSpecialityType())) {
|
||||
supvAlarm.setSpecialityType(mapSpeciality.get(supvAlarm.getSpecialityType()).getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
ExportParams exportParams = new ExportParams("预告警单模板（带*字段均是必填,请严格按照模板标准填入数据）", "预告警单信息");
|
||||
ExcelUtil.exportExcel(exportParams,"预告警单信息.xlsx",SupvAlarm.class, list);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -145,6 +145,10 @@ public class SupvProblemServiceImpl extends ServiceImpl<SupvProblemMapper, SupvP
|
||||
List<DictData> problemTypeList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SUPV_PROBLEM_TYPE.getCode()).getData();
|
||||
Map<String, DictData> mapProblemType = problemTypeList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
|
||||
|
||||
//问题类型
|
||||
List<DictData> problemLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.problem_level_type.getCode().trim()).getData();
|
||||
Map<String, DictData> mapProblemLeve = problemLevelList.stream().collect(Collectors.toMap(DictData::getValue, Function.identity()));
|
||||
|
||||
for (SupvProblemVO supvProblem : supvProblemVOS) {
|
||||
Dept dept = deptFeignClient.getDeptByCode(supvProblem.getDutyOrgId()).getData();
|
||||
supvProblem.setDutyOrgName(dept.getName());
|
||||
@@ -155,6 +159,9 @@ public class SupvProblemServiceImpl extends ServiceImpl<SupvProblemMapper, SupvP
|
||||
if (mapProblemType.containsKey(supvProblem.getProblemType())) {
|
||||
supvProblem.setProblemType(mapProblemType.get(supvProblem.getProblemType()).getName());
|
||||
}
|
||||
if (mapProblemLeve.containsKey(supvProblem.getProblemLevel())) {
|
||||
supvProblem.setProblemLevel(mapProblemLeve.get(supvProblem.getProblemLevel()).getName());
|
||||
}
|
||||
}
|
||||
|
||||
ExcelUtil.exportExcel("实施问题信息.xlsx",SupvProblemVO.class,supvProblemVOS);
|
||||
|
||||
@@ -79,9 +79,11 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
|
||||
//年度最后一天
|
||||
LocalDateTime endYearDay = timeId.with(TemporalAdjusters.lastDayOfYear()).atTime(23,59,59);
|
||||
|
||||
//当前统计时间(当月最后一天)
|
||||
LocalDateTime endTime = timeId.with(TemporalAdjusters.lastDayOfMonth()).atTime(23,59,59);
|
||||
|
||||
//当前统计时间
|
||||
LocalDateTime endTime = timeId.atTime(23,59,59);
|
||||
//统计时间的上一个月
|
||||
LocalDateTime lastEndTime = endTime.minusMonths(1L).with(TemporalAdjusters.lastDayOfMonth());
|
||||
|
||||
List<DictData> dictDataUhv = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SUPV_TYPE.getCode()).getData();
|
||||
Map<String,DictData> mapStatistic = dictDataUhv.stream().collect(Collectors.toMap(DictData::getCode, Function.identity()));
|
||||
@@ -93,17 +95,27 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
|
||||
Map<String,PvTerminalTreeVO> mapCode = deptList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getCode, Function.identity()));
|
||||
Map<String,PvTerminalTreeVO> mapList = deptList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, Function.identity()));
|
||||
|
||||
List<ProcessPublicDTO> processPublicDTOListM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null,Stream.of("02","03","04").collect(Collectors.toList()));
|
||||
List<ProcessPublicDTO> processPublicDTOListY = this.baseMapper.statisticPlanReport(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null,null);
|
||||
List<ProcessPublicDTO> processPublicDTOListAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null, Stream.of("02","03","04").collect(Collectors.toList()));
|
||||
//特高压换流站月报监督数量
|
||||
List<ProcessPublicDTO> processPublicDTOListM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null,null);
|
||||
List<ProcessPublicDTO> processPublicDTOListY = this.baseMapper.statisticPlanReportYear(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null,null);
|
||||
List<ProcessPublicDTO> processPublicDTOListAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null, null);
|
||||
|
||||
//新能源场站(在运站)月报监督数量
|
||||
List<ProcessPublicDTO> processPublicDTOListNewM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01",null);
|
||||
List<ProcessPublicDTO> processPublicDTOListNewY = this.baseMapper.statisticPlanReportYear(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01",null);
|
||||
List<ProcessPublicDTO> processPublicDTOListNewAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01",null);
|
||||
|
||||
//新能源场站(改扩建)月报监督新数量
|
||||
List<ProcessPublicDTO> processPublicDTOListNewZM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02",null);
|
||||
List<ProcessPublicDTO> processPublicDTOListNewZY = this.baseMapper.statisticPlanReportYear(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02",null);
|
||||
List<ProcessPublicDTO> processPublicDTOListNewZAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02",null);
|
||||
|
||||
//敏感用户月报监督数量
|
||||
List<ProcessPublicDTO> processPublicDTOMingGanM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
|
||||
List<ProcessPublicDTO> processPublicDTOMingGanY = this.baseMapper.statisticPlanReportYear(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
|
||||
List<ProcessPublicDTO> processPublicDTOMingGanAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
|
||||
|
||||
List<ProcessPublicDTO> processPublicDTOListNewM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01",Stream.of("02","03","04").collect(Collectors.toList()));
|
||||
List<ProcessPublicDTO> processPublicDTOListNewY = this.baseMapper.statisticPlanReport(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01",null);
|
||||
List<ProcessPublicDTO> processPublicDTOListNewAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01",Stream.of("02","03","04").collect(Collectors.toList()));
|
||||
|
||||
List<ProcessPublicDTO> processPublicDTOListNewZM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02",Stream.of("02","03","04").collect(Collectors.toList()));
|
||||
List<ProcessPublicDTO> processPublicDTOListNewZY = this.baseMapper.statisticPlanReport(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02",null);
|
||||
List<ProcessPublicDTO> processPublicDTOListNewZAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02",Stream.of("02","03","04").collect(Collectors.toList()));
|
||||
|
||||
|
||||
//换流站问题总数量
|
||||
@@ -111,49 +123,43 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
|
||||
List<ProcessPublicDTO> processPublicDTOQesAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null,null);
|
||||
|
||||
//换流站问题已整改数量
|
||||
List<ProcessPublicDTO> processPublicDTOQesYesM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),"01",null);
|
||||
List<ProcessPublicDTO> processPublicDTOQesYesAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),"01",null);
|
||||
List<ProcessPublicDTO> processPublicDTOQesYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),"01",null);
|
||||
List<ProcessPublicDTO> processPublicDTOQesYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),"01",null);
|
||||
|
||||
//新能源问题总数量
|
||||
//新能源(在运站)问题总数量
|
||||
List<ProcessPublicDTO> processPublicDTOQesNewM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),null,"01");
|
||||
List<ProcessPublicDTO> processPublicDTOQesNewAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),null,"01");
|
||||
|
||||
//新能源问题已整改数量
|
||||
List<ProcessPublicDTO> processPublicDTOQesNewYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01","01");
|
||||
List<ProcessPublicDTO> processPublicDTOQesNewYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01","01");
|
||||
//新能源(在运站)问题已整改数量
|
||||
List<ProcessPublicDTO> processPublicDTOQesNewYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02","01");
|
||||
List<ProcessPublicDTO> processPublicDTOQesNewYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02","01");
|
||||
|
||||
//新能源改扩建问题数量
|
||||
//新能源(改扩建)问题数量
|
||||
List<ProcessPublicDTO> processPublicDTOQesNewGaiM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),null,"02");
|
||||
List<ProcessPublicDTO> processPublicDTOQesNewGaiAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),null,"02");
|
||||
|
||||
//新能源改扩建整改问题数量
|
||||
List<ProcessPublicDTO> processPublicDTOQesNewGaiYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01","02");
|
||||
List<ProcessPublicDTO> processPublicDTOQesNewGaiYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01","02");
|
||||
|
||||
|
||||
//敏感用户
|
||||
List<ProcessPublicDTO> processPublicDTOMingGanM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,Stream.of("02","03","04").collect(Collectors.toList()));
|
||||
List<ProcessPublicDTO> processPublicDTOMingGanY = this.baseMapper.statisticPlanReport(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
|
||||
List<ProcessPublicDTO> processPublicDTOMingGanAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,Stream.of("02","03","04").collect(Collectors.toList()));
|
||||
//新能源(改扩建)整改问题数量
|
||||
List<ProcessPublicDTO> processPublicDTOQesNewGaiYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02","02");
|
||||
List<ProcessPublicDTO> processPublicDTOQesNewGaiYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02","02");
|
||||
|
||||
//敏感用户问题总数量
|
||||
List<ProcessPublicDTO> processPublicDTOQesMingGanM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
|
||||
List<ProcessPublicDTO> processPublicDTOQesMingGanAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
|
||||
|
||||
//敏感用户问题已整改数量
|
||||
List<ProcessPublicDTO> processPublicDTOQesMingGanYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"01",null);
|
||||
List<ProcessPublicDTO> processPublicDTOQesMingGanYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"01",null);
|
||||
List<ProcessPublicDTO> processPublicDTOQesMingGanYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"02",null);
|
||||
List<ProcessPublicDTO> processPublicDTOQesMingGanYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"02",null);
|
||||
|
||||
//电压
|
||||
List<ProcessPublicDTO> processPublicDTODianYaListM = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,null);
|
||||
List<ProcessPublicDTO> processPublicDTODianYaListAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,Stream.of("02","03","04").collect(Collectors.toList()));
|
||||
//供电电压本月前统计
|
||||
List<ProcessPublicDTO> processPublicDTODianYaListM = this.baseMapper.statisticPlanReport(firstYearDay,lastEndTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,null);
|
||||
List<ProcessPublicDTO> processPublicDTODianYaListAll = this.baseMapper.statisticPlanReport(firstYearDay,lastEndTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,null);
|
||||
|
||||
//本月问题数量和累计问题数量
|
||||
//供电电压问题数量
|
||||
List<ProcessPublicDTO> processPublicDTODianYaGanM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,null);
|
||||
List<ProcessPublicDTO> processPublicDTODianYaGanAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,null);
|
||||
//整改
|
||||
List<ProcessPublicDTO> processPublicDTODianYaGanYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),"01",null);
|
||||
List<ProcessPublicDTO> processPublicDTODianYaGanYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),"01",null);
|
||||
//供电电压已整改问题
|
||||
List<ProcessPublicDTO> processPublicDTODianYaGanYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),"02",null);
|
||||
List<ProcessPublicDTO> processPublicDTODianYaGanYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),"02",null);
|
||||
|
||||
|
||||
List<SupvReportM> supvReportMBatch = new ArrayList<>();
|
||||
|
||||
Reference in New Issue
Block a user