From 81dff4f27a915f9db5892e839495df8e1266146e Mon Sep 17 00:00:00 2001 From: wxyclub Date: Wed, 8 Nov 2023 14:52:22 +0800 Subject: [PATCH 01/15] =?UTF-8?q?bug:=20=E4=BF=AE=E6=94=B9=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=97=A0=E6=B3=95=E4=B8=8B=E8=BD=BD=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/login/security/WebMvcConfig.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 51def962..ffd39451 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -196,8 +196,18 @@ public class WebMvcConfig implements WebMvcConfigurer { // 政策课题导出接口 addInterceptor.excludePathPatterns("/api/lawss/sarLawsTopic/exportLawsTopicInfo"); + // 政策资料导出接口 addInterceptor.excludePathPatterns("/api/lawss/sarLawsInformation/exportLawsInformationInfo"); + // 内外部会议模板下载 + addInterceptor.excludePathPatterns("/api/lawss/insideOutsideMeeting/exportTemplateFile"); + + // 政策课题模板下载 + addInterceptor.excludePathPatterns("/api/lawss/sarLawsTopic/exportTemplateFile"); + + // 政策资料模板下载 + addInterceptor.excludePathPatterns("/api/lawss/sarLawsInformation/exportTemplateFile"); + // // 添加自定义拦截器，并拦截对应 url addInterceptor.addPathPatterns("/**"); } From 3e681cbd1135731fae0888ff22ffdb9a83136e45 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Wed, 8 Nov 2023 14:53:53 +0800 Subject: [PATCH 02/15] =?UTF-8?q?bug:=20=E4=BF=AE=E6=94=B9=E6=94=BF?= =?UTF-8?q?=E7=AD=96=E8=AF=BE=E9=A2=98=E6=80=BB=E6=9D=A1=E6=95=B0=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java | 2 +- .../sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java | 2 +- .../mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java index ddbd8f2b..62169489 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java @@ -17,7 +17,7 @@ import java.util.List; @Mapper public interface SarLawsTopicMapper extends BaseMapper { - Integer queryByPageCount(SarLawsTopicVO page); + List queryByPageCount(SarLawsTopicVO page); List queryByPage(SarLawsTopicVO page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java index 7e94b4ad..eda4d874 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java @@ -217,7 +217,7 @@ public class SarLawsTopicServiceImpl extends ServiceImpl sarLawsTopicVOList = this.baseMapper.queryByPage(page); for (SarLawsTopicVO lawsTopicVO : sarLawsTopicVOList) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml index 606e448c..e874943b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml @@ -185,13 +185,14 @@ From 705819ac1be203a354420f16de143c2b219fe52d Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 9 Nov 2023 16:26:11 +0800 Subject: [PATCH 06/15] =?UTF-8?q?bug:=20=E5=86=85=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE=E6=9D=A1?= =?UTF-8?q?=E6=95=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java | 2 +- .../service/impl/InsideOutsideMeetingServiceImpl.java | 2 +- .../mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java index 98537ae7..4dca1bcb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java @@ -16,7 +16,7 @@ import java.util.List; @Mapper public interface InsideOutsideMeetingDao extends BaseMapper { - Integer queryByPageCount(InsideOutsideMeetingVO page); + List queryByPageCount(InsideOutsideMeetingVO page); List queryByPage(InsideOutsideMeetingVO page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java index d3305cc3..250c16d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java @@ -187,7 +187,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl insideOutsideMeetingVOList = this.baseMapper.queryByPage(page); for (InsideOutsideMeetingVO insideOutsideMeeting : insideOutsideMeetingVOList) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml index dda636cf..eb48940c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml @@ -88,10 +88,11 @@ - select count(iom.ID) from inside_outside_meeting iom join meeting_topic mt on iom.ID = mt.MEETING_ID + select count(1) from inside_outside_meeting iom join meeting_topic mt on iom.ID = mt.MEETING_ID where iom.VALID_FLAG = 0 - group by iom.ID - select count(1) from inside_outside_meeting iom join meeting_topic mt on iom.ID = mt.MEETING_ID + select count(iom.ID) from inside_outside_meeting iom join meeting_topic mt on iom.ID = mt.MEETING_ID where iom.VALID_FLAG = 0 + group by iom.ID select count(1) From d23cef196d8b4571999b0e93f41dd378bc1ab5e1 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 12 Nov 2023 13:02:46 +0800 Subject: [PATCH 10/15] =?UTF-8?q?bug:=20=E6=94=BF=E7=AD=96=E8=B5=84?= =?UTF-8?q?=E6=96=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarLawsInformation.java | 8 +- .../impl/SarLawsInformationServiceImpl.java | 206 +++++++++++------- .../SarLawsInformationMapper.xml | 6 +- 3 files changed, 133 insertions(+), 87 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java index e44c6f47..20ea8e57 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java @@ -45,7 +45,7 @@ public class SarLawsInformation extends BasePage implements Serializable { * 一级资料类别名称 */ @ApiModelProperty(value = "一级资料类别名称") - @TableField(exist = false) +// @TableField(exist = false) @Excel(name = "一级资料类别", orderNum = "0") private String firstTypeName; @@ -60,7 +60,7 @@ public class SarLawsInformation extends BasePage implements Serializable { * 二级资料类别名称 */ @ApiModelProperty(value = "二级资料类别名称") - @TableField(exist = false) +// @TableField(exist = false) @Excel(name = "二级资料类别", orderNum = "1") private String secondTypeName; @@ -75,7 +75,7 @@ public class SarLawsInformation extends BasePage implements Serializable { * 三级资料类别名称 */ @ApiModelProperty(value = "三级资料类别名称") - @TableField(exist = false) +// @TableField(exist = false) @Excel(name = "三级资料类别", orderNum = "2") private String thirdTypeName; @@ -90,7 +90,7 @@ public class SarLawsInformation extends BasePage implements Serializable { * 四级资料类别名称 */ @ApiModelProperty(value = "四级资料类别名称") - @TableField(exist = false) +// @TableField(exist = false) @Excel(name = "四级资料类别", orderNum = "3") private String fourthTypeName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java index c4afb771..b5cef826 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java @@ -80,7 +80,7 @@ public class SarLawsInformationServiceImpl extends ServiceImpl 0) { List viewableBy = new ArrayList<>(); list1.forEach(item -> { - String userName = userService.userIdByName(userId); - viewableBy.add(userName); + String userName = userService.userIdByName(item.getUserId()); + viewableBy.add(userName + "(" + item.getUserId() + ")"); }); sarLawsInformation.setViewableBy(String.join(",", viewableBy)); } LambdaQueryWrapper wrapper2 = new LambdaQueryWrapper<>(); wrapper2.eq(SarLawsInformationAuth::getLawsInformationId, sarLawsInformation.getId()); - wrapper2.eq(SarLawsInformationAuth::getAuthType, "viewableBy"); + wrapper2.eq(SarLawsInformationAuth::getAuthType, "downloadableBy"); wrapper2.select(SarLawsInformationAuth::getUserId); - List list2 = authService.list(wrapper1); + List list2 = authService.list(wrapper2); if (list2.size() > 0) { List downloadableBy = new ArrayList<>(); list2.forEach(item -> { - String userName = userService.userIdByName(userId); - downloadableBy.add(userName); + String userName = userService.userIdByName(item.getUserId()); + downloadableBy.add(userName + "(" + item.getUserId() + ")"); // 判断是否可下载 if (item.getUserId().equals(userId)) { sarLawsInformation.setDownloadable(true); @@ -154,13 +154,16 @@ public class SarLawsInformationServiceImpl extends ServiceImpl sarLawsInformationList = this.baseMapper.queryByPage(page); // 对一级类别或二级类别做排序 - // TODO 对类别做排序 // if (page.getSortField().contains("_")) for (SarLawsInformation sarLawsInformation : sarLawsInformationList) { // 将字典编号变更为字典值 @@ -207,18 +209,13 @@ public class SarLawsInformationServiceImpl extends ServiceImpl viewableByList = extractContentInParentheses(sarLawsInformation.getViewableBy()); if (!viewableByList.contains(userId)) { viewableByList.add(userId); @@ -231,13 +228,7 @@ public class SarLawsInformationServiceImpl extends ServiceImpl downloadableByList = extractContentInParentheses(sarLawsInformation.getDownloadableBy()); if (!downloadableByList.contains(userId)) { downloadableByList.add(userId); @@ -256,16 +247,17 @@ public class SarLawsInformationServiceImpl extends ServiceImpl compareResult = compareSarLawsInformation(oldLawsInformation, lawsInformation); if (compareResult.size() > 0) { int update = this.baseMapper.updateById(lawsInformation); + for (String compareItem : compareResult) { + if (compareItem.contains("可查看者")) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SarLawsInformationAuth::getLawsInformationId, lawsInformation.getId()); + wrapper.eq(SarLawsInformationAuth::getAuthType, "viewableBy"); + authService.remove(wrapper); + List viewableByList = extractContentInParentheses(lawsInformation.getViewableBy()); + viewableByList.forEach(viewableBy -> { + SarLawsInformationAuth auth = new SarLawsInformationAuth(); + auth.setLawsInformationId(lawsInformation.getId()); + auth.setAuthType("viewableBy"); + auth.setUserId(viewableBy); + authService.save(auth); + }); + } + if (compareItem.contains("可下载者")) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SarLawsInformationAuth::getLawsInformationId, lawsInformation.getId()); + wrapper.eq(SarLawsInformationAuth::getAuthType, "downloadableBy"); + authService.remove(wrapper); + List downloadableByList = extractContentInParentheses(lawsInformation.getDownloadableBy()); + downloadableByList.forEach(downloadableBy -> { + SarLawsInformationAuth auth = new SarLawsInformationAuth(); + auth.setLawsInformationId(lawsInformation.getId()); + auth.setAuthType("downloadableBy"); + auth.setUserId(downloadableBy); + authService.save(auth); + }); + } + } // 添加修改记录 SarUpdLog sarUpdLogEO = new SarUpdLog(); sarUpdLogEO.setId(UUIDUtils.randomUUID20()); @@ -313,19 +335,29 @@ public class SarLawsInformationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(SarLawsInformation::getId, idList); List sarLawsInformationList = this.baseMapper.selectList(wrapper); - for (SarLawsInformation sarLawsInformation : sarLawsInformationList) { - // 将字典编号变更为字典值 - convertCodeToName(sarLawsInformation); - } +// for (SarLawsInformation sarLawsInformation : sarLawsInformationList) { +// // 将字典编号变更为字典值 +// convertCodeToName(sarLawsInformation); +// } return sarLawsInformationList; } @Override public List getAllLawsInformation(SarLawsInformation sarLawsInformation) { + String userId = LoginUserUtil.getUserId(); + // 查询有权限的资料ID + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SarLawsInformationAuth::getUserId, userId); + wrapper.select(SarLawsInformationAuth::getLawsInformationId); + List informationAuthList = authService.list(wrapper); + if (informationAuthList.size() > 0) { + List informationIdList = informationAuthList.stream().map(SarLawsInformationAuth::getLawsInformationId).collect(Collectors.toList()); + sarLawsInformation.setInformationIdList(informationIdList); + } List sarLawsInformationList = this.baseMapper.getAllLawsInformation(sarLawsInformation); for (SarLawsInformation lawsInformation : sarLawsInformationList) { // 将字典编号变更为字典值 - convertCodeToName(lawsInformation); +// convertCodeToName(lawsInformation); // 查询文件信息 if (StringUtils.isNotBlank(lawsInformation.getInformationFile())) { String[] split = lawsInformation.getInformationFile().split(","); @@ -547,7 +579,7 @@ public class SarLawsInformationServiceImpl extends ServiceImpl changes = new ArrayList<>(); // 需要比较的字段 String[] fieldArr = {"firstType","secondType","thirdType","fourthType","name", - "department","author","description","informationFile","treeNodeId"}; + "department","author","description","informationFile","treeNodeId","viewableBy","downloadableBy"}; List fieldList = Arrays.asList(fieldArr); // 获取SarLawsInformation类的所有字段 Field[] fields = SarLawsInformation.class.getDeclaredFields(); @@ -558,49 +590,57 @@ public class SarLawsInformationServiceImpl extends ServiceImpl typeNameList = new ArrayList<>(); - if (StringUtils.isNotBlank(newValue)) { - for (String type : newValue.split(",")) { - if (StringUtils.isNotBlank(type)) { - typeNameList.add(dicTypeService.getDicTypeNameByDicCode(type)); + switch (field.getName()) { +// case "firstType": +// case "secondType": +// case "thirdType": +// case "fourthType": { +// List typeNameList = new ArrayList<>(); +// if (StringUtils.isNotBlank(newValue)) { +// for (String type : newValue.split(",")) { +// if (StringUtils.isNotBlank(type)) { +// typeNameList.add(dicTypeService.getDicTypeNameByDicCode(type)); +// } +// } +// } +// // 获取资料类型名称 +// String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1); +// Method method = SarLawsInformation.class.getMethod("get" + fieldName + "Name"); +// Object oldTypeName = method.invoke(oldInfo); +// ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; +// changes.add(annotationsByType.value() + "由\"" + oldTypeName + "\"改为\"" + String.join(",", typeNameList) + "\""); +// break; +// } + case "informationFile": { + List fileNameList = new ArrayList<>(); + if (StringUtils.isNotBlank(newValue)) { + String[] split = newValue.split(","); + for (String attId : split) { + AttFileEO fileInfo = attFileEOService.getFileInfo(attId); + fileNameList.add(fileInfo.getOldFileName()); } } - } - // 获取资料类型名称 - String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1); - Method method = SarLawsInformation.class.getMethod("get" + fieldName + "Name"); - Object oldTypeName = method.invoke(oldInfo); - ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; - changes.add(annotationsByType.value() + "由\"" + oldTypeName + "\"改为\"" + String.join(",",typeNameList) + "\""); - } else if ("informationFile".equals(field.getName())) { - List fileNameList = new ArrayList<>(); - if (StringUtils.isNotBlank(newValue)) { - String[] split = newValue.split(","); - for (String attId : split) { - AttFileEO fileInfo = attFileEOService.getFileInfo(attId); - fileNameList.add(fileInfo.getOldFileName()); + // 获取资料类型名称 + String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1); + Method method = SarLawsInformation.class.getMethod("get" + fieldName + "List"); + List oldFileList = (List) method.invoke(oldInfo); + List oldFileNameList = new ArrayList<>(); + if (oldFileList != null && oldFileList.size() > 0) { + for (Object oldFile : oldFileList) { + AttFileEO oldFile1 = (AttFileEO) oldFile; + oldFileNameList.add(oldFile1.getOldFileName()); + } } + // 获取字段名称 + ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; + changes.add(annotationsByType.value() + "由\"" + String.join(",", oldFileNameList) + "\"改为\"" + String.join(",", fileNameList) + "\""); + break; } - // 获取资料类型名称 - String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1); - Method method = SarLawsInformation.class.getMethod("get" + fieldName + "List"); - List oldFileList = (List)method.invoke(oldInfo); - List oldFileNameList = new ArrayList<>(); - if (oldFileList != null && oldFileList.size() > 0) { - for (Object oldFile : oldFileList) { - AttFileEO oldFile1 = (AttFileEO) oldFile; - oldFileNameList.add(oldFile1.getOldFileName()); - } + default: { + ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; + changes.add(annotationsByType.value() + "由\"" + oldValue + "\"改为\"" + newValue + "\""); + break; } - // 获取字段名称 - ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; - changes.add(annotationsByType.value() + "由\"" + String.join(",",oldFileNameList) + "\"改为\"" + String.join(",",fileNameList) + "\""); - } - else { - ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; - changes.add(annotationsByType.value() + "由\"" + oldValue + "\"改为\"" + newValue + "\""); } } } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { @@ -643,6 +683,16 @@ public class SarLawsInformationServiceImpl extends ServiceImpl set1, Set set2){ + if(set1 == null || set2 ==null){//null就直接不比了 + return false; + } + if(set1.size()!=set2.size()){//大小不同也不用比了 + return false; + } + return set1.containsAll(set2);//最后比containsAll + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml index 8a04eebc..6457df92 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml @@ -20,10 +20,8 @@ - - - + @@ -40,8 +38,6 @@ UPLOAD_TIME, `DESCRIPTION`, INFORMATION_FILE, - VIEWABLE_BY, - DOWNLOADABLE_BY, VALID_FLAG, CREATE_TIME, MODIFY_TIME From f71115e045a86d8cbc2da33aebf70903314fb073 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 13 Nov 2023 10:29:04 +0800 Subject: [PATCH 11/15] =?UTF-8?q?bug:=20=E6=94=BF=E7=AD=96=E8=B5=84?= =?UTF-8?q?=E6=96=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsInformationServiceImpl.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java index b5cef826..072b1504 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java @@ -118,6 +118,7 @@ public class SarLawsInformationServiceImpl extends ServiceImpl wrapper2 = new LambdaQueryWrapper<>(); wrapper2.eq(SarLawsInformationAuth::getLawsInformationId, sarLawsInformation.getId()); wrapper2.eq(SarLawsInformationAuth::getAuthType, "downloadableBy"); @@ -134,6 +135,16 @@ public class SarLawsInformationServiceImpl extends ServiceImpl wrapper3 = new LambdaQueryWrapper<>(); + wrapper3.eq(SarLawsInformationAuth::getLawsInformationId, sarLawsInformation.getId()); + wrapper3.eq(SarLawsInformationAuth::getAuthType, "createAndApproveBy"); + wrapper3.eq(SarLawsInformationAuth::getUserId, userId); + int count = authService.count(wrapper3); + if (count > 0) { + sarLawsInformation.setDownloadable(true); } return sarLawsInformation; } @@ -147,6 +158,8 @@ public class SarLawsInformationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SarLawsInformationAuth::getUserId, userId); + wrapper.eq(SarLawsInformationAuth::getAuthType, "viewableBy"); + wrapper.or().eq(SarLawsInformationAuth::getAuthType, "createAndApproveBy"); wrapper.select(SarLawsInformationAuth::getLawsInformationId); List informationAuthList = authService.list(wrapper); if (informationAuthList.size() > 0) { @@ -348,6 +361,8 @@ public class SarLawsInformationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SarLawsInformationAuth::getUserId, userId); + wrapper.eq(SarLawsInformationAuth::getAuthType, "viewableBy"); + wrapper.or().eq(SarLawsInformationAuth::getAuthType, "createAndApproveBy"); wrapper.select(SarLawsInformationAuth::getLawsInformationId); List informationAuthList = authService.list(wrapper); if (informationAuthList.size() > 0) { @@ -683,16 +698,6 @@ public class SarLawsInformationServiceImpl extends ServiceImpl set1, Set set2){ - if(set1 == null || set2 ==null){//null就直接不比了 - return false; - } - if(set1.size()!=set2.size()){//大小不同也不用比了 - return false; - } - return set1.containsAll(set2);//最后比containsAll - } } From eac7f3395f447f3fb3ed0c956f072b01682dfc70 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 13 Nov 2023 12:24:46 +0800 Subject: [PATCH 12/15] =?UTF-8?q?bug:=20=E4=BC=81=E6=A0=87=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E3=80=81=E5=9B=BD=E5=86=85=E3=80=81=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E3=80=81=E4=BC=81=E6=A0=87=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EsRevisePlanController.java | 77 +++++++++---------- .../adc/da/utils/util/FieldConvertUtil.java | 6 ++ .../adc/da/utils/util/StandExportUtil.java | 27 ++++--- .../SarStandardsInfoMapper.xml | 2 + 4 files changed, 63 insertions(+), 49 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index f10d5d5d..fa4476ff 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -8,8 +8,7 @@ import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; -import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao; -import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; import com.adc.da.utils.util.EsRevisePlanExportUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; /** *

@@ -52,7 +48,7 @@ public class EsRevisePlanController extends BaseController { @Autowired IEsRevisePlanService iEsRevisePlanService; @Autowired - private QualityEvaluationDao qualityEvaluationDao; + private IQualityEvaluationService qualityEvaluationService; @ApiOperation(value = "获取所有企标计划") @GetMapping("getAllPlans") @@ -106,38 +102,41 @@ public class EsRevisePlanController extends BaseController { revisePlan.setArea(area); //查评分 if (ObjectUtils.isNotEmpty(revisePlan.getStandId())) { - List last = new ArrayList<>(); - List evaluations = qualityEvaluationDao.getEvaluationForm(new QueryWrapper().eq("law_id", revisePlan.getStandId()).eq("evaluation_type", "quality")); - for (QualityEvaluation evaluation : evaluations) { - Double score; - String value; - if (evaluation.getProcessNode()==null){ - value=""; - }else { - value=evaluation.getProcessNode(); - } - String evaluationScore = ObjectUtils.isEmpty(evaluation.getScore()) ? "0" : evaluation.getScore(); - switch (value){ - case "征求意见": - score=Double.valueOf(evaluationScore) * 0.3; - break; - case "技术委员会评审、评审意见修改": - score=Double.valueOf(evaluationScore) * 0.4; - break; - case "重新技术委员会评审、评审意见修改": - score=Double.valueOf(evaluationScore) * 0.4; - break; - case "标准化复审": - score=Double.valueOf(evaluationScore) * 0.15; - break; - case "标准法规部高级经理审核": - score=Double.valueOf(evaluationScore) * 0.15; - break; - default: score=Double.valueOf(evaluationScore); - } - last.add(score); - } - revisePlan.setScore(last.stream().mapToDouble(Double::doubleValue).sum()); + Map score = qualityEvaluationService.getScore(revisePlan.getStandId()); + revisePlan.setScore(score.get("finalScore")); +// List last = new ArrayList<>(); +// List evaluations = qualityEvaluationDao.getEvaluationForm(new QueryWrapper().eq("law_id", revisePlan.getStandId()).eq("evaluation_type", "quality")); +// for (QualityEvaluation evaluation : evaluations) { +// Double score; +// String value; +// if (evaluation.getProcessNode()==null){ +// value=""; +// }else { +// value=evaluation.getProcessNode(); +// } +// String evaluationScore = ObjectUtils.isEmpty(evaluation.getScore()) ? "0" : evaluation.getScore(); +// switch (value){ +// case "征求意见": +// score=Double.valueOf(evaluationScore) * 0.3; +// break; +// case "技术委员会评审、评审意见修改": +// score=Double.valueOf(evaluationScore) * 0.4; +// break; +// case "重新技术委员会评审、评审意见修改": +// score=Double.valueOf(evaluationScore) * 0.4; +// break; +// case "标准化复审": +// score=Double.valueOf(evaluationScore) * 0.15; +// break; +// case "标准法规部高级经理审核": +// score=Double.valueOf(evaluationScore) * 0.15; +// break; +// default: score=Double.valueOf(evaluationScore); +// } +// last.add(score); +// } +// revisePlan.setScore(last.stream().mapToDouble(Double::doubleValue).sum()); + } } workbook = EsRevisePlanExportUtil.exportDatas(datas); diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 77b17ad3..1703f7e6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -33,9 +33,15 @@ public class FieldConvertUtil { public static String exportBaseFieldNames = "标准体系,是否纳入认证清单,标准性质,标准类别,标准编号,标准年份,中文名称,英文名称," + "文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28 + public static String exportBaseFieldNewNames = "标准体系,是否纳入认证清单,标准性质,标准编号,中文名称,英文名称," + + "文本状态,发布日期"; // 导出基础表字段 //删除 标准类别 标准编号 标准年份 ，统一为标准编号 2023-11-13 + public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," + "文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段 + public static String exportBaseFieldNamesNewForeign = "标准编号,中文名称,英文名称," + + "文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段 //删除 标准类别 标准编号 标准年份 ，统一为标准编号 2023-11-13 + public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," + "标签,发布稿（必读）,增补件（必读）,报批稿,送审稿,征求意见稿,草案,相关资料,新车型实施日期（文本）,在产车实施日期（文本）," + "EOP实施日期（文本）,责任部门,相关部门,SVPPS,FO,项目评估角色,法规维护人,代替标准编号," + diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java index 3a9ae643..e7aecc4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java @@ -39,17 +39,21 @@ public class StandExportUtil { } for (SarStandAttrDetails detailsEO : detailsEOList) { if (!InitStandAttrUtil.fileFieldList.contains(detailsEO.getAttrField())) { - attrBud.append(detailsEO.getAttrName() + ","); attrInfoMap.put(detailsEO.getAttrName(),detailsEO.getAttrField()); + // 去掉 参会记录 和 相关流程 两个导出字段 2023-11-13 + if("参会记录".equals(detailsEO.getAttrName()) || "相关流程".equals(detailsEO.getAttrName())) { + continue; + } + attrBud.append(detailsEO.getAttrName() + ","); } } - String header = FieldConvertUtil.exportBaseFieldNames + "," + attrBud.toString(); + String header = FieldConvertUtil.exportBaseFieldNewNames + "," + attrBud.toString(); //国内导出去掉体系类别 if (SarTypeEnum.INLAND_STAND.getValue().equals(standType)) { header = header.replace(",体系类别",""); } if (SarTypeEnum.FOREIGN_STAND.getValue().equals(standType)) { - header = FieldConvertUtil.exportBaseFieldNamesForeign + "," + attrBud.toString(); + header = FieldConvertUtil.exportBaseFieldNamesNewForeign + "," + attrBud.toString(); } //创建工作表对象 Sheet sheet = workbook.createSheet(); @@ -125,9 +129,9 @@ public class StandExportUtil { case "适用区域": value = verifyBean(sarStandardsInfoEO.getCountryShow()); break; - case "标准类别": - value = verifyBean(sarStandardsInfoEO.getStandSortShow()); - break; +// case "标准类别": +// value = verifyBean(sarStandardsInfoEO.getStandSortShow()); +// break; case "重要度": if (StringUtils.isNotBlank(sarStandardsInfoEO.getIsRelateAccess())) { if ("1".equals(sarStandardsInfoEO.getIsRelateAccess())) { @@ -138,11 +142,14 @@ public class StandExportUtil { } value = sarStandardsInfoEO.getIsRelateAccess(); break; +// case "标准编号": +// value = verifyBean(sarStandardsInfoEO.getStandNumber()); +// break; +// case "标准年份": +// value = verifyBean(sarStandardsInfoEO.getStandYear()); +// break; case "标准编号": - value = verifyBean(sarStandardsInfoEO.getStandNumber()); - break; - case "标准年份": - value = verifyBean(sarStandardsInfoEO.getStandYear()); + value = sarStandardsInfoEO.getStandCode(); break; case "中文名称": value = verifyBean(sarStandardsInfoEO.getStandName()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index bb3e4ac3..7468836f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -44,6 +44,7 @@ + @@ -115,6 +116,7 @@ SAR_STANDARDS_INFO.stand_sort, SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, + concat(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year) as standCode, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name, SAR_STANDARDS_INFO.stand_state, From b550395b104d0d88b1571f726be13cb042df99c1 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 13 Nov 2023 13:47:45 +0800 Subject: [PATCH 13/15] =?UTF-8?q?bug:=20=E4=BC=81=E6=A0=87=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E3=80=81=E5=9B=BD=E5=86=85=E3=80=81=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E3=80=81=E4=BC=81=E6=A0=87=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/utils/util/BussStandExportUtil.java | 5 ++++- .../main/java/com/adc/da/utils/util/FieldConvertUtil.java | 4 ++-- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java index ab1c43e1..a7181c46 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java @@ -33,8 +33,11 @@ public class BussStandExportUtil { Map attrInfoMap = new HashMap<>(); for (SarStandAttrDetails detailsEO : detailsEOList) { if (!InitStandAttrUtil.fileFieldListBuss.contains(detailsEO.getAttrField())) { - attrBud.append(detailsEO.getAttrName() + ","); attrInfoMap.put(detailsEO.getAttrName(),detailsEO.getAttrField()); + if ("关联流程".equals(detailsEO.getAttrName())) { + continue; + } + attrBud.append(detailsEO.getAttrName() + ","); } } String header = FieldConvertUtil.exportBaseFieldNamesBuss + "," + attrBud.toString(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 1703f7e6..643db6da 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -33,8 +33,8 @@ public class FieldConvertUtil { public static String exportBaseFieldNames = "标准体系,是否纳入认证清单,标准性质,标准类别,标准编号,标准年份,中文名称,英文名称," + "文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28 - public static String exportBaseFieldNewNames = "标准体系,是否纳入认证清单,标准性质,标准编号,中文名称,英文名称," + - "文本状态,发布日期"; // 导出基础表字段 //删除 标准类别 标准编号 标准年份 ，统一为标准编号 2023-11-13 + public static String exportBaseFieldNewNames = "标准编号,中文名称,英文名称,标准体系," + + "文本状态,发布日期,标准性质"; // 导出基础表字段 // 删除是否纳入认证清单，删除 标准类别 标准编号 标准年份 ，统一为标准编号 2023-11-13 public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," + "文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 7468836f..e8b4ac04 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -116,7 +116,7 @@ SAR_STANDARDS_INFO.stand_sort, SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, - concat(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year) as standCode, + concat(COALESCE(SAR_STANDARDS_INFO.stand_sort, ''), ' ', COALESCE(SAR_STANDARDS_INFO.stand_number, ''), '-' , COALESCE(SAR_STANDARDS_INFO.stand_year, '')) as standCode, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name, SAR_STANDARDS_INFO.stand_state, From b9ff91d5d61e6effae2e1bf1129f854eadf53e8a Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 13 Nov 2023 14:26:12 +0800 Subject: [PATCH 14/15] =?UTF-8?q?bug:=2078422=E6=94=BF=E7=AD=96=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E8=B5=84=E6=96=99=E5=92=8C=E6=94=BF=E7=AD=96=E8=AF=BE?= =?UTF-8?q?=E9=A2=98=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarLawsInformation/entity/SarLawsInformation.java | 10 +++++----- .../controller/SarLawsTopicController.java | 2 +- .../da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java | 2 +- .../java/com/adc/da/utils/util/FieldConvertUtil.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java index 20ea8e57..c24b5639 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java @@ -37,7 +37,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 一级资料类别 */ - @ApiModelProperty("一级资料类别") + @ApiModelProperty("1级资料分类") @TableField(value = "FIRST_TYPE") private String firstType; @@ -46,7 +46,7 @@ public class SarLawsInformation extends BasePage implements Serializable { */ @ApiModelProperty(value = "一级资料类别名称") // @TableField(exist = false) - @Excel(name = "一级资料类别", orderNum = "0") + @Excel(name = "1级资料分类", orderNum = "0") private String firstTypeName; /** @@ -61,7 +61,7 @@ public class SarLawsInformation extends BasePage implements Serializable { */ @ApiModelProperty(value = "二级资料类别名称") // @TableField(exist = false) - @Excel(name = "二级资料类别", orderNum = "1") + @Excel(name = "2级资料分类", orderNum = "1") private String secondTypeName; /** @@ -76,7 +76,7 @@ public class SarLawsInformation extends BasePage implements Serializable { */ @ApiModelProperty(value = "三级资料类别名称") // @TableField(exist = false) - @Excel(name = "三级资料类别", orderNum = "2") + @Excel(name = "3级资料分类", orderNum = "2") private String thirdTypeName; /** @@ -91,7 +91,7 @@ public class SarLawsInformation extends BasePage implements Serializable { */ @ApiModelProperty(value = "四级资料类别名称") // @TableField(exist = false) - @Excel(name = "四级资料类别", orderNum = "3") + @Excel(name = "4级资料分类", orderNum = "3") private String fourthTypeName; /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java index 11af44bd..d2f908f0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java @@ -178,7 +178,7 @@ public class SarLawsTopicController extends BaseController { HSSFCellStyle cellStyle1 = workbook.createCellStyle(); cellStyle1.setAlignment(HorizontalAlignment.CENTER); cellStyle1.setVerticalAlignment(VerticalAlignment.CENTER); - String exportFieldName = "课题名称,课题承办单位,课题指导单位,课题参与单位,开始时间,结题时间,课题费用（万元）"; + String exportFieldName = "课题名称,课题承办单位,课题指导单位,课题参与单位,启动时间,结题时间,课题费用（万元）"; String[] headerArr = exportFieldName.split(","); for (int i=0;i < headerArr.length; i++) { Cell cell = rowHeader.createCell(i); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java index c3ae5219..9ac842d3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java @@ -56,7 +56,7 @@ public class SarLawsTopicVO extends BasePage { */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", orderNum = "4", exportFormat = "yyyy-MM-dd", needMerge = true) + @Excel(name = "启动时间", orderNum = "4", exportFormat = "yyyy-MM-dd", needMerge = true) private Date startTime; /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 643db6da..1d63b5c6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -70,7 +70,7 @@ public class FieldConvertUtil { public static String exportFieldNamesMeetingTopic = "议题名称,汇报人,汇报单位,议题主要内容"; // 政策法规资料 表头 - public static String exportFieldLawsInformation = "一级资料类别,二级资料类别,三级资料类别,四级资料类别,资料名称,资料归属部门,作者,资料说明"; + public static String exportFieldLawsInformation = "1级资料分类,2级资料分类,3级资料分类,4级资料分类,资料名称,资料归属部门,作者,资料说明"; // 政策课题 表头 public static String exportFieldLawsTopic = "课题名称,课题承办单位,课题指导单位,课题参与单位,开始时间,结题时间,课题费用（万元）,课题组会议列表,课题组联系方式,内部联系方式"; From ec0c40f7cafa6b347c66df2aa72cd783f8d2fa94 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 13 Nov 2023 15:04:10 +0800 Subject: [PATCH 15/15] =?UTF-8?q?bug:=2078317=E6=94=BF=E7=AD=96=E8=AF=BE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarLawsTopic/entity/SarLawsTopic.java | 2 +- .../service/impl/SarLawsTopicServiceImpl.java | 26 +++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java index 9ceb0cff..de104c22 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java @@ -58,7 +58,7 @@ public class SarLawsTopic implements Serializable { /** * 开始时间 */ - @ApiModelProperty(value = "开始时间") + @ApiModelProperty(value = "启动时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @TableField(value = "START_TIME") private Date startTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java index eda4d874..c8fad2fb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java @@ -414,14 +414,16 @@ public class SarLawsTopicServiceImpl extends ServiceImpl fileNameList = new ArrayList<>(); - if (StringUtils.isNotBlank(newValue)) { - String[] split = newValue.split(","); + if (StringUtils.isNotBlank(newValueStr)) { + String[] split = newValueStr.split(","); for (String attId : split) { AttFileEO fileInfo = attFileEOService.getFileInfo(attId); fileNameList.add(fileInfo.getOldFileName()); @@ -447,7 +449,21 @@ public class SarLawsTopicServiceImpl extends ServiceImpl