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

Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test

Browse Source
This commit is contained in:
高嵩
2022-10-27 15:22:04 +08:00
parent 8fd885a8fa 74c8efc643
commit 8d75dbe38d
6 changed files with 129 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+54 -50
View File
@@ -314,36 +314,38 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
row.createCell(1).setCellValue(itemLeft.getItemsNum()); row.createCell(1).setCellValue(itemLeft.getItemsNum());
row.createCell(2).setCellValue(itemLeft.getItemsName()); row.createCell(2).setCellValue(itemLeft.getItemsName());
String text = itemLeft.getItemsText(); String text = itemLeft.getItemsText();
log.info("-------------- 开始开始拆分左侧图片、文字、表格 :" + text + "-----------------"); if (StringUtils.isNotEmpty(text)){
String rowDataAndPath = getSplitContent(request, text); log.info("-------------- 开始开始拆分左侧图片、文字、表格 :" + text + "-----------------");
log.info("-------------- 左侧图片、文字、表格 拆分成功 :"+ rowDataAndPath +"-----------------"); String rowDataAndPath = getSplitContent(request, text);
leftSplit = rowDataAndPath.split("---"); log.info("-------------- 左侧图片、文字、表格 拆分成功 :"+ rowDataAndPath +"-----------------");
if (leftSplit.length > 1) { leftSplit = rowDataAndPath.split("---");
for (int j = 0; j < leftSplit.length; j++) { if (leftSplit.length > 1) {
if (ObjectUtils.isNotEmpty(leftSplit[j])) { for (int j = 0; j < leftSplit.length; j++) {
ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); if (ObjectUtils.isNotEmpty(leftSplit[j])) {
if (j > 0) { ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream();
Row row2 = sheet.getRow(j + i); if (j > 0) {
if (ObjectUtils.isEmpty(row2)) { Row row2 = sheet.getRow(j + i);
row2 = sheet.createRow(j + i); if (ObjectUtils.isEmpty(row2)) {
row2 = sheet.createRow(j + i);
}
log.info("-------------- 开始开始处理左侧图片、表格 -----------------");
handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, leftSplit[j], 3);
log.info("-------------- 左侧图片、表格 处理成功 -----------------");
} else {
log.info("-------------- 开始开始处理左侧图片、表格 -----------------");
handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, leftSplit[j], 3);
log.info("-------------- 左侧图片、表格 处理成功 -----------------");
} }
log.info("-------------- 开始开始处理左侧图片、表格 -----------------");
handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, leftSplit[j], 3);
log.info("-------------- 左侧图片、表格 处理成功 -----------------");
} else {
log.info("-------------- 开始开始处理左侧图片、表格 -----------------");
handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, leftSplit[j], 3);
log.info("-------------- 左侧图片、表格 处理成功 -----------------");
} }
} }
sarFileCompareExcelMergeCell.setLeftStart(i);
sarFileCompareExcelMergeCell.setLeftEnd(i + leftSplit.length - 1);
sarFileCompareExcelMergeCell.setRightStart(0);
sarFileCompareExcelMergeCell.setRightEnd(0);
mergeCells.add(sarFileCompareExcelMergeCell);
} else {
row.createCell(3).setCellValue(rowDataAndPath);
} }
sarFileCompareExcelMergeCell.setLeftStart(i);
sarFileCompareExcelMergeCell.setLeftEnd(i + leftSplit.length - 1);
sarFileCompareExcelMergeCell.setRightStart(0);
sarFileCompareExcelMergeCell.setRightEnd(0);
mergeCells.add(sarFileCompareExcelMergeCell);
} else {
row.createCell(3).setCellValue(rowDataAndPath);
} }
} }
} }
@@ -354,34 +356,36 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
row.createCell(5).setCellValue(itemRight.getItemsNum()); row.createCell(5).setCellValue(itemRight.getItemsNum());
row.createCell(6).setCellValue(itemRight.getItemsName()); row.createCell(6).setCellValue(itemRight.getItemsName());
String text = itemRight.getItemsText(); String text = itemRight.getItemsText();
log.info("-------------- 开始开始拆分右侧图片、文字、表格 :"+ text +" -----------------"); if (StringUtils.isNotEmpty(text)) {
String rowDataAndPath = getSplitContent(request, text); log.info("-------------- 开始开始拆分右侧图片、文字、表格 :"+ text +" -----------------");
log.info("-------------- 右侧图片、文字、表格 拆分成功 :"+ rowDataAndPath +" -----------------"); String rowDataAndPath = getSplitContent(request, text);
rightSplit = rowDataAndPath.split("---"); log.info("-------------- 右侧图片、文字、表格 拆分成功 :"+ rowDataAndPath +" -----------------");
if (rightSplit.length > 1) { rightSplit = rowDataAndPath.split("---");
for (int j = 0; j < rightSplit.length; j++) { if (rightSplit.length > 1) {
if (ObjectUtils.isNotEmpty(rightSplit[j])) { for (int j = 0; j < rightSplit.length; j++) {
ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); if (ObjectUtils.isNotEmpty(rightSplit[j])) {
if (j > 0) { ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream();
Row row2 = sheet.getRow(j + i); if (j > 0) {
if (ObjectUtils.isEmpty(row2)) { Row row2 = sheet.getRow(j + i);
row2 = sheet.createRow(j + i); if (ObjectUtils.isEmpty(row2)) {
row2 = sheet.createRow(j + i);
}
log.info("-------------- 开始处理右侧图片、表格 -----------------");
handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, rightSplit[j], 7);
log.info("-------------- 右侧图片、表格 处理成功 -----------------");
} else {
log.info("-------------- 开始处理右侧图片、表格 -----------------");
handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, rightSplit[j], 7);
log.info("-------------- 右侧图片、表格 处理成功 -----------------");
} }
log.info("-------------- 开始处理右侧图片、表格 -----------------");
handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, rightSplit[j], 7);
log.info("-------------- 右侧图片、表格 处理成功 -----------------");
} else {
log.info("-------------- 开始处理右侧图片、表格 -----------------");
handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, rightSplit[j], 7);
log.info("-------------- 右侧图片、表格 处理成功 -----------------");
} }
} }
sarFileCompareExcelMergeCell.setRightStart(i);
sarFileCompareExcelMergeCell.setRightEnd(i + rightSplit.length - 1);
mergeCells.add(sarFileCompareExcelMergeCell);
} else {
row.createCell(7).setCellValue(rowDataAndPath);
} }
sarFileCompareExcelMergeCell.setRightStart(i);
sarFileCompareExcelMergeCell.setRightEnd(i + rightSplit.length - 1);
mergeCells.add(sarFileCompareExcelMergeCell);
} else {
row.createCell(7).setCellValue(rowDataAndPath);
} }
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java
+1
View File
@@ -10,6 +10,7 @@ public enum DictCodeReportEnum {
APPLYCAR("适用车型","car_type"), APPLYCAR("适用车型","car_type"),
APPLYSCOPE("适用范围","fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2"), APPLYSCOPE("适用范围","fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2"),
STATE("状态","state"), STATE("状态","state"),
STATE_REPORT("状态","fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4"),
USEMETHOD("用法","yong4_fa3"); USEMETHOD("用法","yong4_fa3");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+37 -138
View File
@@ -296,14 +296,14 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<LawsMonthlyReportWriteEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); QueryWrapper<LawsMonthlyReportWriteEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap());
queryWrapper.orderByDesc("memories_chapter_one","memories_chapter","create_time"); queryWrapper.orderByDesc("memories_chapter_one","memories_chapter","create_time");
//新需求月报填写不设置去权限, 所有的人都可以查看--------------------------------------------------------------------------------------
//管理员查看全部数据,其余人只能查看自己的数据 //管理员查看全部数据,其余人只能查看自己的数据
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
List<String> rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); // List<String> rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername());
if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ // if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){
queryWrapper.in("create_by",currentUser.getUsername()); // queryWrapper.in("create_by",currentUser.getUsername());
} // }
// Page<LawsMonthlyReportWriteEO> page = new Page<LawsMonthlyReportWriteEO>(pageNo, pageSize); //-------------------------------------------------------------------------------------
// Page<LawsMonthlyReportWriteEO> pageInfo = this.page(page, queryWrapper);
//所有的月报 //所有的月报
@@ -439,119 +439,6 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
} }
return lawsMonthlyReportWriteEOS; return lawsMonthlyReportWriteEOS;
} }
// @Override
// public IPage<LawsMonthlyReportWriteEO> getPageInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEOTemp,
// Integer pageNo,
// Integer pageSize,
// HttpServletRequest req) {
// QueryWrapper<LawsMonthlyReportWriteEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap());
// queryWrapper.orderByDesc("memories_chapter_one","memories_chapter","create_time");
// //管理员查看全部数据,其余人只能查看自己的数据
// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// List<String> rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername());
// if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){
// queryWrapper.in("create_by",currentUser.getUsername());
// }
// Page<LawsMonthlyReportWriteEO> page = new Page<LawsMonthlyReportWriteEO>(pageNo, pageSize);
// Page<LawsMonthlyReportWriteEO> pageInfo = this.page(page, queryWrapper);
// //法规月报id
// List<String> lawsMonthlyReportIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList());
// List<String> userIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getLawsContact).collect(Collectors.toList());
// List<String> userIds = new ArrayList<>();
// for (String s : userIdList) {
// if(StringUtils.isNotBlank(s)){
// if(s.contains(",")){
// userIds.addAll(Arrays.asList(s.split(",")));
// }else{
// userIds.add(s);
// }
// }
// }
// List<JSONObject> jsonObjects = sysBaseApi.queryUsersByIds(StringUtils.join(userIds, ","));
// List<LoginUser> userList = new ArrayList<>();
// for (JSONObject jsonObject : jsonObjects) {
// LoginUser loginUser = JSONObject.parseObject(jsonObject.toJSONString(), LoginUser.class);
// userList.add(loginUser);
// }
//
// //获取章节目录
// List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list();
//
// //新征求意见清单模板
// List<NewOpinionTemplateEO> newOpinionTemplateEOList = new ArrayList<>();
// if(lawsMonthlyReportIdList.size() != 0){
// LambdaQueryWrapper<NewOpinionTemplateEO> wrapper = new LambdaQueryWrapper<>();
// wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList);
// newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper);
// }
//
//
// //新发布标准清单模板
// List<NewStandardTemplateEO> newStandardTemplateEOList = new ArrayList<>();
// if(lawsMonthlyReportIdList.size() != 0){
// LambdaQueryWrapper<NewStandardTemplateEO> qrapperTemp = new LambdaQueryWrapper<>();
// qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList);
// newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp);
// }
//
//
// for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) {
// //处理法规联系人
// lawsContact(userList, lawsMonthlyReportWriteEO,lawsMonthlyReportWriteEOTemp.getCut());
// //处理章节目录
// if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){
// List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream()
// .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapter().equals(e.getId())).collect(Collectors.toList());
// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
// lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn());
// }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
// lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn());
// }
// }
// //处理章节目录对应的一级目录
// if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapterOne())){
// List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream()
// .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapterOne().equals(e.getId())).collect(Collectors.toList());
// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
// lawsMonthlyReportWriteEO.setMemoriesChapterOneName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn());
// }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
// lawsMonthlyReportWriteEO.setMemoriesChapterOneName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn());
// }
// }
//
// if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
// //新征求意见清单模板
// List<NewOpinionTemplateEO> collect = newOpinionTemplateEOList.stream()
// .filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList());
// lawsMonthlyReportWriteEO.setNewOpinionTemplateEOList(collect);
//
// }else if(ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
// //新发布标准清单模板
// List<NewStandardTemplateEO> collect = newStandardTemplateEOList.stream()
// .filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList());
// lawsMonthlyReportWriteEO.setNewStandardTemplateEOList(collect);
// }
//
// //处理导出状态
// String exportState = lawsMonthlyReportWriteEO.getExportState();
// if(StringUtils.isNotBlank(exportState)){
// if(ExportStateEnum.NOT_EXPORT.getValue().equals(exportState)){
// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut())){
// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getName());
// }else{
// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getNameEn());
// }
// }else if(ExportStateEnum.HAS_BEEN_EXPORT.getValue().equals(exportState)){
// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut())){
// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getName());
// }else{
// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getNameEn());
// }
// }
// }
// }
// return pageInfo;
// }
private void lawsContact(List<LoginUser> userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO,String cut) { private void lawsContact(List<LoginUser> userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO,String cut) {
String lawsContact = lawsMonthlyReportWriteEO.getLawsContact(); String lawsContact = lawsMonthlyReportWriteEO.getLawsContact();
@@ -588,12 +475,14 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getIds())){ if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getIds())){
wrapper.in(LawsMonthlyReportWriteEO::getId,Arrays.asList(lawsMonthlyReportWriteEO.getIds().split(","))); wrapper.in(LawsMonthlyReportWriteEO::getId,Arrays.asList(lawsMonthlyReportWriteEO.getIds().split(",")));
} }
//新需求月报填写不设置权限----------------------------------------------------------------------------------------
//管理员查看全部数据,其余人只能查看自己的数据 //管理员查看全部数据,其余人只能查看自己的数据
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
List<String> rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); // List<String> rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername());
if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ // if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){
wrapper.in(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername()); // wrapper.in(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername());
} // }
//----------------------------------------------------------------------------------------
List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS = this.list(wrapper); List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS = this.list(wrapper);
if(lawsMonthlyReportWriteEOS.size() == 0){ if(lawsMonthlyReportWriteEOS.size() == 0){
@@ -722,10 +611,11 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
/** /**
*创建word文件 *
* @param path * @param path
* @param lawsMonthlyReportWriteEOS 列表数据 * @param lawsMonthlyReportWriteEOS 所有月报
* @param lawsMonthlyReportTitleTemplateEOS 章节目录 * @param lawsMonthlyReportTitleTemplateEOS 二级目录(没有排序)
* @param loginUserList
*/ */
private void createWord(String path, private void createWord(String path,
List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS, List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS,
@@ -874,7 +764,15 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
// } // }
/**
*
* @param lawsMonthlyReportWriteEOS 月报
* @param lawsMonthlyReportTitleTemplateEOS 二级目录(参数传过来时没有排序)
* @param reportTitleOneList 一级目录(参数传过来时已经进行正序排序)
* @param titleCN
* @param document
* @param cut
*/
private void word(List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS, private void word(List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS,
List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS, List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS,
List<LawsMonthlyReportTitleTemplateEO> reportTitleOneList, List<LawsMonthlyReportTitleTemplateEO> reportTitleOneList,
@@ -891,9 +789,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
//标题 //标题
WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 14, WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 14,
false, false, "Blue Sky Noto Regular",null,null,null); false, false, "Blue Sky Noto Regular",null,null,null);
//主要内容 //主要内容(新需求中去掉此行)
WordUtil.exportWord(document, content, null, ParagraphAlignment.LEFT, 0, 12, // WordUtil.exportWord(document, content, null, ParagraphAlignment.LEFT, 0, 12,
false, true, "Blue Sky Noto Regular",null,null,null); // false, true, "Blue Sky Noto Regular",null,null,null);
//生成页脚 //生成页脚
WordUtil.exportHeardAndFootMain(document,moth); WordUtil.exportHeardAndFootMain(document,moth);
int oneCount = 1; int oneCount = 1;
@@ -910,12 +808,13 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
} }
if(StringUtils.isNotBlank(oneTitle)){ if(StringUtils.isNotBlank(oneTitle)){
WordUtil.exportWord(document, oneNumber+" "+oneTitle, null, ParagraphAlignment.LEFT, WordUtil.exportWord(document, oneNumber+" "+oneTitle, null, ParagraphAlignment.LEFT,
0, 12, false, true, "Blue Sky Noto Regular","0","一级标题",null); 0, 11, false, true, "Blue Sky Noto Regular","0","一级标题",null);
oneCount++; oneCount++;
} }
List<LawsMonthlyReportTitleTemplateEO> reportTitleTwoList = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> e.getParentId().equals(lawsMonthlyReportTitleTemplateEO.getId())).collect(Collectors.toList()); List<LawsMonthlyReportTitleTemplateEO> reportTitleTwoList = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> e.getParentId().equals(lawsMonthlyReportTitleTemplateEO.getId())).collect(Collectors.toList());
//二级目录按sort正序排序
Collections.sort(reportTitleTwoList);//正序排序
for (LawsMonthlyReportTitleTemplateEO monthlyReportTitleTemplateEO : reportTitleTwoList) { for (LawsMonthlyReportTitleTemplateEO monthlyReportTitleTemplateEO : reportTitleTwoList) {
int reportCount = 1; int reportCount = 1;
@@ -933,7 +832,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
} }
if(StringUtils.isNotBlank(twoTitle)){ if(StringUtils.isNotBlank(twoTitle)){
WordUtil.exportWord(document, twoNumber+" "+twoTitle, null, ParagraphAlignment.LEFT, WordUtil.exportWord(document, twoNumber+" "+twoTitle, null, ParagraphAlignment.LEFT,
2, 12, false, true, "Blue Sky Noto Regular","1","二级标题",null); 6, 11, false, true, "Blue Sky Noto Regular","1","二级标题",null);
twoCount++; twoCount++;
} }
@@ -947,7 +846,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
} }
if(org.apache.commons.lang3.StringUtils.isNotBlank(reportTitle)){ if(org.apache.commons.lang3.StringUtils.isNotBlank(reportTitle)){
WordUtil.exportWord(document, reportCount+". "+reportTitle, null, ParagraphAlignment.LEFT, WordUtil.exportWord(document, reportCount+". "+reportTitle, null, ParagraphAlignment.LEFT,
4, 12, false, false, "Blue Sky Noto Regular","2","三级标题",null); 12, 11, false, false, "Blue Sky Noto Regular","2","三级标题",null);
reportCount++; reportCount++;
} }
} }
@@ -1257,7 +1156,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
// WordUtil.exportHeardAndFoot(document,moth); // WordUtil.exportHeardAndFoot(document,moth);
//生成页眉页脚 //生成页眉页脚
WordUtil.exportHeardAndFoot(document,moth); WordUtil.exportHeardAndFoot(document,moth,cut);
//生成标题 //生成标题
// WordUtil.exportWord(document, "", null, ParagraphAlignment.CENTER, 0, 18, // WordUtil.exportWord(document, "", null, ParagraphAlignment.CENTER, 0, 18,
// false, true, "Blue Sky Noto Regular",null,null,null); // false, true, "Blue Sky Noto Regular",null,null,null);
@@ -1284,7 +1183,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
} }
List<LawsMonthlyReportTitleTemplateEO> reportTitleTwoList = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> e.getParentId().equals(lawsMonthlyReportTitleTemplateEO.getId())).collect(Collectors.toList()); List<LawsMonthlyReportTitleTemplateEO> reportTitleTwoList = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> e.getParentId().equals(lawsMonthlyReportTitleTemplateEO.getId())).collect(Collectors.toList());
Collections.sort(reportTitleTwoList);//正序排序
for (LawsMonthlyReportTitleTemplateEO monthlyReportTitleTemplateEO : reportTitleTwoList) { for (LawsMonthlyReportTitleTemplateEO monthlyReportTitleTemplateEO : reportTitleTwoList) {
int reportCount = 1; int reportCount = 1;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+31 -24
View File
@@ -208,7 +208,7 @@ public class WordUtil {
//主要内容生成页眉页脚(office版本) //主要内容生成页眉页脚(office版本)
@SneakyThrows @SneakyThrows
public static void exportHeardAndFoot(XWPFDocument document,String month){ public static void exportHeardAndFoot(XWPFDocument document,String month,String cut){
XWPFHeaderFooterPolicy headerFooterPolicy = document.getHeaderFooterPolicy(); XWPFHeaderFooterPolicy headerFooterPolicy = document.getHeaderFooterPolicy();
if (headerFooterPolicy == null) headerFooterPolicy = document.createHeaderFooterPolicy(); if (headerFooterPolicy == null) headerFooterPolicy = document.createHeaderFooterPolicy();
XWPFHeader header = headerFooterPolicy.createHeader(XWPFHeaderFooterPolicy.DEFAULT); XWPFHeader header = headerFooterPolicy.createHeader(XWPFHeaderFooterPolicy.DEFAULT);
@@ -232,7 +232,14 @@ public class WordUtil {
picture.getCTPicture().getBlipFill().getBlip().setEmbed(blipID); picture.getCTPicture().getBlipFill().getBlip().setEmbed(blipID);
run.addTab(); run.addTab();
is.close(); is.close();
run.setText(" "+month); if(CutEnum.CN.getValue().equals(cut)){
run.setText(" "+month+" (总第 期)");
}else{
String replace = month.replace("年", " ").replace("月", "");
String monthTemp = replace.split(" ")[1]+"/"+replace.split(" ")[0];
run.setText(" "+monthTemp+" (Issue No. )");
}
run.setFontSize(11); run.setFontSize(11);
run.setFontFamily("Blue Sky Noto Regular"); run.setFontFamily("Blue Sky Noto Regular");
} }
@@ -399,7 +406,7 @@ public class WordUtil {
paragraph.setAlignment(ParagraphAlignment.CENTER); paragraph.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run = paragraph.createRun(); XWPFRun run = paragraph.createRun();
run.setText("NIO Internal"); run.setText("NIO Internal");
run.setFontSize(18); run.setFontSize(12);
run.setFontFamily("Blue Sky Standard Regular"); run.setFontFamily("Blue Sky Standard Regular");
// run.setFontFamily("Blue Sky Noto Regular"); // run.setFontFamily("Blue Sky Noto Regular");
run.setBold(true); run.setBold(true);
@@ -413,8 +420,8 @@ public class WordUtil {
pgSz.setH(BigInteger.valueOf(16838)); pgSz.setH(BigInteger.valueOf(16838));
CTPageMar pageMar = sectPr.getPgMar(); CTPageMar pageMar = sectPr.getPgMar();
if (pageMar == null) pageMar = sectPr.addNewPgMar(); if (pageMar == null) pageMar = sectPr.addNewPgMar();
pageMar.setLeft(BigInteger.valueOf(1797)); //左边距 pageMar.setLeft(BigInteger.valueOf(1083)); //左边距
pageMar.setRight(BigInteger.valueOf(1797));//右边距 pageMar.setRight(BigInteger.valueOf(1083));//右边距
pageMar.setTop(BigInteger.valueOf(1440)); //页眉高度 pageMar.setTop(BigInteger.valueOf(1440)); //页眉高度
pageMar.setBottom(BigInteger.valueOf(1440));//页脚高度 pageMar.setBottom(BigInteger.valueOf(1440));//页脚高度
@@ -594,7 +601,7 @@ public class WordUtil {
//适用车型中文名 //适用车型中文名
String applyCarName = dictItem(sysDictItems, applyCar,cut, DictCodeReportEnum.APPLYCAR.getValue()); String applyCarName = dictItem(sysDictItems, applyCar,cut, DictCodeReportEnum.APPLYCAR.getValue());
String applyScopeName = dictItem(sysDictItems, applyScope,cut, DictCodeReportEnum.APPLYSCOPE.getValue()); String applyScopeName = dictItem(sysDictItems, applyScope,cut, DictCodeReportEnum.APPLYSCOPE.getValue());
String stateName = dictItem(sysDictItems, state,cut, DictCodeReportEnum.STATE.getValue()); String stateName = dictItem(sysDictItems, state,cut, DictCodeReportEnum.STATE_REPORT.getValue());
String useMethodName = dictItem(sysDictItems, useMethod,cut, DictCodeReportEnum.USEMETHOD.getValue()); String useMethodName = dictItem(sysDictItems, useMethod,cut, DictCodeReportEnum.USEMETHOD.getValue());
XWPFTable table = document.createTable(10, 2); XWPFTable table = document.createTable(10, 2);
@@ -629,9 +636,9 @@ public class WordUtil {
//第6行 //第6行
// setCell(table,4, "实施车型",implementCar); // setCell(table,4, "实施车型",implementCar);
//第7行 //第7行
setCell(table,4, "新车型实施日期",newCarImplementTime); setCell(table,4, "发布日期",newCarImplementTime);
//第8行 //第8行
setCell(table,5, "在产车实施日期",productionCarImplementTime); setCell(table,5, "实施日期",productionCarImplementTime);
//第9行 //第9行
setCell(table,6, "主要内容",contentCn); setCell(table,6, "主要内容",contentCn);
//第10行 //第10行
@@ -654,9 +661,9 @@ public class WordUtil {
//第6行 //第6行
// setCell(table,4,"Implementation Model",implementCar); // setCell(table,4,"Implementation Model",implementCar);
//第7行 //第7行
setCell(table,4,"New Type Execution Date",newCarImplementTime); setCell(table,4,"Release Date",newCarImplementTime);
//第8行 //第8行
setCell(table,5,"New Vehicle Execution Date",productionCarImplementTime); setCell(table,5,"Execution Date",productionCarImplementTime);
//第9行 //第9行
setCell(table,6,"Main Content",contentEn); setCell(table,6,"Main Content",contentEn);
//第10行 //第10行
@@ -1264,28 +1271,28 @@ public class WordUtil {
String blank = ""; String blank = "";
switch (value) { switch (value) {
case "M": case "M":
blank = " "; blank = " ";
break; break;
case "N": case "N":
blank = "\r\n"; blank = "\r\n";
break; break;
case "企业": case "企业":
blank = " "; blank = " ";
break; break;
case "整车": case "整车":
blank = " "; blank = " ";
break; break;
case "系统/零部件": case "系统/零部件":
blank = "\r\n"; blank = "\r\n";
break; break;
case "新车型": case "新车型":
blank = " "; blank = " ";
break; break;
case "在产车型`": case "在产车型`":
blank = ""; blank = "";
break; break;
case "Enterprise": case "Enterprise":
blank = " "; blank = " ";
break; break;
case "Vehicle": case "Vehicle":
blank = " "; blank = " ";
@@ -1294,43 +1301,43 @@ public class WordUtil {
blank = "\r\n"; blank = "\r\n";
break; break;
case "New Car Model": case "New Car Model":
blank = " "; blank = " ";
break; break;
case "Models In Production": case "Models In Production":
blank = ""; blank = "";
break; break;
case "草稿": case "草稿":
blank = " "; blank = " ";
break; break;
case "公示稿": case "公示稿":
blank = " "; blank = " ";
break; break;
case "发布稿": case "发布稿":
blank = ""; blank = "";
break; break;
case "Draft": case "Draft":
blank = " "; blank = " ";
break; break;
case "Public Notice": case "Public Notice":
blank = " "; blank = " ";
break; break;
case "Release": case "Release":
blank = ""; blank = "";
break; break;
case "强制": case "强制":
blank = " "; blank = " ";
break; break;
case "推荐": case "推荐":
blank = " "; blank = " ";
break; break;
case "安装需符合": case "安装需符合":
blank = ""; blank = "";
break; break;
case "Mandatory": case "Mandatory":
blank = " "; blank = " ";
break; break;
case "Voluntary": case "Voluntary":
blank = " "; blank = "\r\n";
break; break;
case "Mandatory if fitted": case "Mandatory if fitted":
blank = ""; blank = "";
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
+2 -2
View File
@@ -92,14 +92,14 @@
@click="viewClick(record)"> @click="viewClick(record)">
{{$t('view')}} {{$t('view')}}
</a> </a>
<!-- v-if="record.createBy == userData.username || administrators"-->
<a class="text-operation" <a class="text-operation"
v-if="record.createBy == userData.username || administrators"
v-has="'monthlyReportFilling:edit'" v-has="'monthlyReportFilling:edit'"
@click="edit(record)"> @click="edit(record)">
{{$t('edit')}} {{$t('edit')}}
</a> </a>
<!-- v-if="record.createBy == userData.username || administrators"-->
<a class="text-operation" <a class="text-operation"
v-if="record.createBy == userData.username || administrators"
v-has="'monthlyReportFilling:delete'" v-has="'monthlyReportFilling:delete'"
@click="deleteLib(record)"> @click="deleteLib(record)">
{{$t('deleteLib')}} {{$t('deleteLib')}}
jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+4 -4
View File
@@ -164,7 +164,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" <span class="title-text-text"
:title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span> :title="$t('releaseDate')">{{$t('releaseDate')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="newCarImplementTime"> <a-form-model-item class="itemModel" prop="newCarImplementTime">
<!-- :placeholder="$t('PleaseEnter')+$t('ImplementationDate')"--> <!-- :placeholder="$t('PleaseEnter')+$t('ImplementationDate')"-->
@@ -179,7 +179,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" <span class="title-text-text"
:title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span> :title="$t('implemenDate')">{{$t('implemenDate')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="productionCarImplementTime"> <a-form-model-item class="itemModel" prop="productionCarImplementTime">
<!-- $t('PleaseEnter')+$t('vehicleInProductionDate')--> <!-- $t('PleaseEnter')+$t('vehicleInProductionDate')-->
@@ -340,14 +340,14 @@
productionCarImplementTime: [ productionCarImplementTime: [
{ {
max: 500, max: 500,
message: this.$t('vehicleInProductionDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), message: this.$t('implemenDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur' trigger: 'blur'
} }
], ],
newCarImplementTime: [ newCarImplementTime: [
{ {
max: 500, max: 500,
message: this.$t('ImplementationDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), message: this.$t('releaseDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur' trigger: 'blur'
} }
], ],