WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

59978 法规意见收集流程，评估结果添加、查询、导出，增加条款内容字段。

Browse Source
This commit is contained in:
wangzhijiang
2022-09-27 14:09:43 +08:00
parent 657d509858
commit ae30f93f8a
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_third_record.sql
+4
View File
@@ -1163,3 +1163,7 @@ MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_gener
-- 月报填写表 新增一级目录字段2022-09-25 未同步生产环境 -- 月报填写表 新增一级目录字段2022-09-25 未同步生产环境
ALTER TABLE `laws_weilai`.`laws_monthly_report_write` ALTER TABLE `laws_weilai`.`laws_monthly_report_write`
ADD COLUMN `memories_chapter_one` varchar(255) NULL COMMENT '章节目录对应的一级标题' AFTER `source_en`; ADD COLUMN `memories_chapter_one` varchar(255) NULL COMMENT '章节目录对应的一级标题' AFTER `source_en`;
-- 法规意见收集-评估结果表 增加字段 条款内容 2022-09-27 未同步生产环境
ALTER TABLE `laws_weilai`.`laws_opinion_assessment_result`
ADD COLUMN `clause_content` varchar(600) NULL COMMENT '条款内容' AFTER `acti_proc_inst_id`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java
+5
View File
@@ -98,4 +98,9 @@ public class LawsOpinionAssessmentResultEO implements Serializable {
@ApiModelProperty(value = "流程实例id") @ApiModelProperty(value = "流程实例id")
private String actiProcInstId; private String actiProcInstId;
/**条款内容*/
@Excel(name = "条款内容", width = 15)
@ApiModelProperty(value = "条款内容")
private String clauseContent;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
+9 -8
View File
@@ -184,11 +184,11 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
String title = ""; String title = "";
String fileName = ""; String fileName = "";
if(StringUtils.equals(cut, CutEnum.CN.getValue())){ if(StringUtils.equals(cut, CutEnum.CN.getValue())){
title = "相关章节,问题/建议,理由,附件,评估人,提出时间"; title = "相关章节,问题/建议,理由,条款内容,附件,评估人,提出时间";
fileName = "评估结果 " + ".xlsx"; fileName = "评估结果" + ".xls";
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
title = "Related section,IssueOrSuggest,Reason,Accessory,Evaluator,Submit Date"; title = "Related section,IssueOrSuggest,Reason,Item Content,Accessory,Evaluator,Submit Date";
fileName = "Evaluation results " + ".xlsx"; fileName = "Evaluation results" + ".xls";
} }
OutputStream os = null; OutputStream os = null;
@@ -212,7 +212,7 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
//创建表头 //创建表头
String[] titleArr = title.split(","); String[] titleArr = title.split(",");
for (int i=0; i<=5; i++){ for (int i=0; i<=6; i++){
sheet.setColumnWidth(i,4000); sheet.setColumnWidth(i,4000);
Cell cell = firstRow.createCell(i); Cell cell = firstRow.createCell(i);
cell.setCellStyle(titleCellStyle); cell.setCellStyle(titleCellStyle);
@@ -226,10 +226,11 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
dataRow.createCell(0).setCellValue(exportData.get(dataIndex).getRelatedSection()); dataRow.createCell(0).setCellValue(exportData.get(dataIndex).getRelatedSection());
dataRow.createCell(1).setCellValue(exportData.get(dataIndex).getIssueOrSuggest()); dataRow.createCell(1).setCellValue(exportData.get(dataIndex).getIssueOrSuggest());
dataRow.createCell(2).setCellValue(exportData.get(dataIndex).getReason()); dataRow.createCell(2).setCellValue(exportData.get(dataIndex).getReason());
dataRow.createCell(3).setCellValue(exportData.get(dataIndex).getAccessoryFileName()); dataRow.createCell(3).setCellValue(exportData.get(dataIndex).getClauseContent());
dataRow.createCell(4).setCellValue(exportData.get(dataIndex).getCreateBy()); dataRow.createCell(4).setCellValue(exportData.get(dataIndex).getAccessoryFileName());
dataRow.createCell(5).setCellValue(exportData.get(dataIndex).getCreateBy());
String submitTimeStr = disposeDate(exportData.get(dataIndex).getSubmitTime()); String submitTimeStr = disposeDate(exportData.get(dataIndex).getSubmitTime());
dataRow.createCell(5).setCellValue(submitTimeStr); dataRow.createCell(6).setCellValue(submitTimeStr);
} }
} }