Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.模板字段*添加红色标识

Browse Source 
2.预警单,反馈单导出接口增加
3.修改技术监督月报统计逻辑
This commit is contained in:
wr
2023-09-11 15:48:56 +08:00
parent 979f1daa06
commit fb6a469e68
17 changed files with 270 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvAlarm.java
View File

@@ -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;
}

31
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvAlarmBack.java
View File

@@ -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")

6
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvProblemVO.java
View File

@@ -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)

24
pqs-process/process-api/src/main/java/com/njcn/process/utils/ExcelStyleUtil.java
View File

@@ -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;
}
}