From 890e6bc463c36d2a32b80795ab403c258123415c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 23 Mar 2022 16:54:24 +0800 Subject: [PATCH 01/64] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E6=96=B0=E5=A2=9E=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8A=9F=E8=83=BD=20=E8=BF=87=E6=BB=A4excel?= =?UTF-8?q?=E7=BA=AF=E7=A9=BA=E8=A1=8C=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/processModel/exportWkExcel.java | 4 +- .../processModel/service/IExportService.java | 2 +- .../service/impl/IExportServiceImpl.java | 92 ++++++++++--------- .../utils/ExcelImportUtilByWk.java | 20 +++- 4 files changed, 70 insertions(+), 48 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java index 0fa0771a..a3fdd787 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java @@ -71,7 +71,9 @@ public class exportWkExcel { public ResponseMessage importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { StringBuilder stringBuilder=new StringBuilder(); List res=exportService.delWithWkData(file,stringBuilder); - if (stringBuilder.toString().length()>0){ + if(null==res){ + return Result.error("-1","","请严格按照模板上传文件"); + }else if (stringBuilder.toString().length()>0){ return Result.error("-1","",stringBuilder.toString()); }else { return Result.success(res); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/IExportService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/IExportService.java index 8d7d246c..cec1c948 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/IExportService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/IExportService.java @@ -7,6 +7,6 @@ import java.util.List; public interface IExportService { - List delWithWkData(MultipartFile file ,StringBuilder stringBuilder); + List delWithWkData(MultipartFile file ,StringBuilder stringBuilder) throws Exception; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java index 675a4bf6..44452ed7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java @@ -39,7 +39,7 @@ public class IExportServiceImpl implements IExportService { @Override - public List delWithWkData(MultipartFile file ,StringBuilder stringBuilder) { + public List delWithWkData(MultipartFile file ,StringBuilder stringBuilder) throws Exception { // //获取数据字典数据 // Map dicTypeEO = dicTypeEOService.getDicTypeListCode(); @@ -64,57 +64,61 @@ public class IExportServiceImpl implements IExportService { tsUserMap.put(tsUser.getAccount(),tsUser.getUname()); }); List res= ExcelImportUtilByWk.readExcelpublic(importExcelDTO.class,file); - DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); - int i=1; - for (importExcelDTO importExcelDTO: res) { - if (null!=importExcelDTO.getWgLeader() && !"".equals(importExcelDTO.getWgLeader())) { - importExcelDTO.setWgLeaderName(tsUserMap.get(importExcelDTO.getWgLeader())); - if (null == tsUserMap.get(importExcelDTO.getWgLeader())) { - stringBuilder.append("第" + i + "行第7列工作组组长填写不符合格式要求请检查；"); + if (null!=res) { + DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); + int i = 1; + for (importExcelDTO importExcelDTO : res) { + if (null != importExcelDTO.getWgLeader() && !"".equals(importExcelDTO.getWgLeader())) { + importExcelDTO.setWgLeaderName(tsUserMap.get(importExcelDTO.getWgLeader())); + if (null == tsUserMap.get(importExcelDTO.getWgLeader())) { + stringBuilder.append("第" + i + "行第7列工作组组长填写不符合格式要求请检查；"); + } } - } - if (null!=importExcelDTO.getUnitName() && !"".equals(importExcelDTO.getUnitName())){ - importExcelDTO.setUnit(tsInstitutionMap.get(importExcelDTO.getUnitName())); - if (null==tsInstitutionMap.get(importExcelDTO.getUnitName())){ - stringBuilder.append("第"+i+"行第4列起草责任单位填写不符合格式要求请检查；"); + if (null != importExcelDTO.getUnitName() && !"".equals(importExcelDTO.getUnitName())) { + importExcelDTO.setUnit(tsInstitutionMap.get(importExcelDTO.getUnitName())); + if (null == tsInstitutionMap.get(importExcelDTO.getUnitName())) { + stringBuilder.append("第" + i + "行第4列起草责任单位填写不符合格式要求请检查；"); + } } - } - if (null!=importExcelDTO.getDrafter() && !"".equals(importExcelDTO.getDrafter())){ - importExcelDTO.setDrafterName(tsUserMap.get(importExcelDTO.getDrafter())); - if ( null==tsUserMap.get(importExcelDTO.getDrafter())){ - stringBuilder.append("第"+i+"行第5列起草人填写不符合格式要求请检查；"); + if (null != importExcelDTO.getDrafter() && !"".equals(importExcelDTO.getDrafter())) { + importExcelDTO.setDrafterName(tsUserMap.get(importExcelDTO.getDrafter())); + if (null == tsUserMap.get(importExcelDTO.getDrafter())) { + stringBuilder.append("第" + i + "行第5列起草人填写不符合格式要求请检查；"); + } } - } - if (null!=importExcelDTO.getResPerson() && !"".equals(importExcelDTO.getResPerson())){ - importExcelDTO.setResPersonName(tsUserMap.get(importExcelDTO.getResPerson())); - if ( null==tsUserMap.get(importExcelDTO.getResPerson())){ - stringBuilder.append("第"+i+"行第6列评审责任人填写不符合格式要求请检查；"); + if (null != importExcelDTO.getResPerson() && !"".equals(importExcelDTO.getResPerson())) { + importExcelDTO.setResPersonName(tsUserMap.get(importExcelDTO.getResPerson())); + if (null == tsUserMap.get(importExcelDTO.getResPerson())) { + stringBuilder.append("第" + i + "行第6列评审责任人填写不符合格式要求请检查；"); + } } - } - try { - if (null!=importExcelDTO.getEndTime() && !"".equals(importExcelDTO.getEndTime())) { - importExcelDTO.setEndTime(formater.format(HSSFDateUtil.getJavaDate(Double.valueOf(importExcelDTO.getEndTime())))); + try { + if (null != importExcelDTO.getEndTime() && !"".equals(importExcelDTO.getEndTime())) { + importExcelDTO.setEndTime(formater.format(HSSFDateUtil.getJavaDate(Double.valueOf(importExcelDTO.getEndTime())))); + } + } catch (Exception e) { + stringBuilder.append("第" + i + "行第10列立项完成时间填写不符合格式要求请检查；"); } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第10列立项完成时间填写不符合格式要求请检查；"); - } - try { - if (null!=importExcelDTO.getReleaseTime() && !"".equals(importExcelDTO.getReleaseTime())) { - importExcelDTO.setReleaseTime(formater.format(HSSFDateUtil.getJavaDate(Double.valueOf(importExcelDTO.getReleaseTime())))); + try { + if (null != importExcelDTO.getReleaseTime() && !"".equals(importExcelDTO.getReleaseTime())) { + importExcelDTO.setReleaseTime(formater.format(HSSFDateUtil.getJavaDate(Double.valueOf(importExcelDTO.getReleaseTime())))); + } + } catch (Exception e) { + stringBuilder.append("第" + i + "行第9列计划标准发布时间填写不符合格式要求请检查；"); } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第9列计划标准发布时间填写不符合格式要求请检查；"); - } - try { - if (null!=importExcelDTO.getDraftTime() && !"".equals(importExcelDTO.getDraftTime())) { - importExcelDTO.setDraftTime(formater.format(HSSFDateUtil.getJavaDate(Double.valueOf(importExcelDTO.getDraftTime())))); + try { + if (null != importExcelDTO.getDraftTime() && !"".equals(importExcelDTO.getDraftTime())) { + importExcelDTO.setDraftTime(formater.format(HSSFDateUtil.getJavaDate(Double.valueOf(importExcelDTO.getDraftTime())))); + } + } catch (Exception e) { + stringBuilder.append("第" + i + "行第8列计划初稿完成日期填写不符合格式要求请检查；"); } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第8列计划初稿完成日期填写不符合格式要求请检查；"); + i++; } - i++; - } - return res; + return res; + }else { + return null; + } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java index bd95f7f2..d6334c11 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java @@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import com.adc.da.slrs.processModel.entity.importExcelDTO; import com.adc.da.util.DateUtils; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Cell; @@ -33,7 +34,7 @@ public class ExcelImportUtilByWk { * @param file 上传的Excel文件 * @return 读取结果列表，读取失败时返回null */ - public static List readExcelpublic(Class tClass,MultipartFile file) { + public static List readExcelpublic(Class tClass,MultipartFile file) { Workbook workbook = null; @@ -83,8 +84,15 @@ public class ExcelImportUtilByWk { mapExcel.put(Integer.valueOf(excel.orderNum()), excel); } } + Row headRow=sheet.getRow(firstRowNum); + for (int j=0;j Date: Wed, 23 Mar 2022 16:55:27 +0800 Subject: [PATCH 02/64] =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java index d6334c11..c0375857 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java @@ -87,6 +87,7 @@ public class ExcelImportUtilByWk { Row headRow=sheet.getRow(firstRowNum); for (int j=0;j Date: Wed, 23 Mar 2022 17:40:11 +0800 Subject: [PATCH 03/64] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BA=BA=E5=91=98=E5=A2=9E=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=98=BE=E7=A4=BA-=E5=90=8E=E5=8F=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java | 2 ++ .../src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index e4ee3dac..b93029f4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -54,6 +54,7 @@ public class TsRoleServiceImpl extends ServiceImpl implements public List getAll() { QueryWrapper tsRoleQueryWrapper=new QueryWrapper<>(); tsRoleQueryWrapper.eq("ROLE_HIERARCHY",1); + tsRoleQueryWrapper.orderByDesc("NAME"); List rootRole=tsRoleDao.selectList(tsRoleQueryWrapper); for(TsRole tsRole:rootRole){ tsRole.setChildren(recursionGetRole(tsRole)); @@ -70,6 +71,7 @@ public class TsRoleServiceImpl extends ServiceImpl implements QueryWrapper tsRoleQueryWrapper=new QueryWrapper<>(); tsRoleQueryWrapper.eq("parent_id",tsRole.getId()); tsRoleQueryWrapper.eq("ROLE_HIERARCHY",tsRole.getRoleHierarchy()+1); + tsRoleQueryWrapper.orderByDesc("NAME"); List tsRoles=tsRoleDao.selectList(tsRoleQueryWrapper); for(TsRole tsRoleNode:tsRoles){ tsRoleNode.setChildren(recursionGetRole(tsRoleNode)); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index 07ca1c62..6d27f23b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -143,7 +143,8 @@ @@ -155,6 +162,12 @@ and ts_user.UNAME like concat(concat('%',#{role.userName}),'%') + + and ts_institution.name like concat(concat('%',#{role.institutionName}),'%') + + + and ts_user.INSTITUTION_ID = #{role.institutionId} + limit ${(role.pageNumber - 1) * role.pageSize},${role.pageSize} From 3669a6e8883dc49e21afc77978305f4e03f9afe2 Mon Sep 17 00:00:00 2001 From: 11528 <1152856986@qq.com> Date: Thu, 24 Mar 2022 09:47:06 +0800 Subject: [PATCH 05/64] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WgdCgfyServiceImpl.java | 207 ++++++----- .../service/impl/WgdFyfyServiceImpl.java | 206 ++++++----- .../service/impl/WgdSrbServiceImpl.java | 239 ++++++------ .../service/impl/WgdWbtjServiceImpl.java | 345 +++++++++--------- .../service/impl/WgdWbxdServiceImpl.java | 317 ++++++++-------- .../service/impl/WgdZcbServiceImpl.java | 216 +++++------ .../service/impl/WgdAssocCostServiceImpl.java | 297 +++++++-------- .../service/impl/WgdAssocInfoServiceImpl.java | 329 +++++++++-------- .../service/impl/WgdCommiInfoServiceImpl.java | 315 ++++++++-------- .../impl/WgdExReviseCostServiceImpl.java | 208 +++++------ .../service/impl/WgdMeetCostServiceImpl.java | 235 ++++++------ 11 files changed, 1483 insertions(+), 1431 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java index a206a82c..1fbaaafa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java @@ -1,101 +1,106 @@ -package com.adc.da.slrs.wgdCensusLeo.service.impl; - -import com.adc.da.http.Result; -import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; -import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; -import com.adc.da.slrs.wgdCensusLeo.dao.WgdCgfyDao; -import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService; -import com.adc.da.util.MD5Util; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -/** - *

- * 采购费用信息统计 服务实现类 - *

- * - * @author super_liu - * @since 2021-11-12 - */ -@Service -public class WgdCgfyServiceImpl extends ServiceImpl implements IWgdCgfyService { - - @Autowired - WgdCgfyDao wgdCgfyDao; - - @Autowired - IWgdCgfyService iWgdCgfyService; - @Override - public List getAllWgdCgfys() { - return wgdCgfyDao.selectAll(); - } - - @Override - public List queryAllWgdCgfys(WgdCgfy wgdCgfy) { - Integer count = wgdCgfyDao.getQueryTotal(wgdCgfy); - wgdCgfy.getPager().setRowCount(count); - return wgdCgfyDao.queryAll(wgdCgfy); - } - - @Override - public WgdCgfy getWgdCgfyById(String id) { - return wgdCgfyDao.selectById(id); - } - - @Override - public int updateWgdCgfy(WgdCgfy wgdCgfy) { - return wgdCgfyDao.updateOne(wgdCgfy); - } - - @Override - public int insertWgdCgfy(WgdCgfy wgdCgfy) { - wgdCgfy.setId(UUIDUtils.randomUUID(32)); - return wgdCgfyDao.insertOne(wgdCgfy); - } - - @Override - public int deleteWgdCgfy(String id) { - return wgdCgfyDao.deleteOne(id); - } - - @Override - public int deleteWgdCgfys(String ids) { - String[] str = ids.split(","); - return wgdCgfyDao.deleteBatch(str); - } - - @Override - public List importCgfy(MultipartFile file, StringBuilder stringBuilder) { - - List res= ExcelImportUtilByWk.readExcelpublic(WgdCgfy.class,file); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(WgdCgfy.class, info -> !info.getColumn().equals("id")); - List wgdCgfy=iWgdCgfyService.list(queryWrapper); - List remove=new ArrayList<>(); - wgdCgfy.forEach(WgbWbtj -> { - WgbWbtj.setId(null); - if (res.contains(WgbWbtj)){ - remove.add(WgbWbtj); - } - - }); - res.removeAll(remove); - res.forEach(wgdAssocInfo -> { - wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); - }); - if (res.size()>0 && iWgdCgfyService.saveOrUpdateBatch(res)) { - return res; - }else { - return null; - } - } -} +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.http.Result; +import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; +import com.adc.da.slrs.wgdCensusLeo.dao.WgdCgfyDao; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService; +import com.adc.da.util.MD5Util; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 采购费用信息统计 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public class WgdCgfyServiceImpl extends ServiceImpl implements IWgdCgfyService { + + @Autowired + WgdCgfyDao wgdCgfyDao; + + @Autowired + IWgdCgfyService iWgdCgfyService; + @Override + public List getAllWgdCgfys() { + return wgdCgfyDao.selectAll(); + } + + @Override + public List queryAllWgdCgfys(WgdCgfy wgdCgfy) { + Integer count = wgdCgfyDao.getQueryTotal(wgdCgfy); + wgdCgfy.getPager().setRowCount(count); + return wgdCgfyDao.queryAll(wgdCgfy); + } + + @Override + public WgdCgfy getWgdCgfyById(String id) { + return wgdCgfyDao.selectById(id); + } + + @Override + public int updateWgdCgfy(WgdCgfy wgdCgfy) { + return wgdCgfyDao.updateOne(wgdCgfy); + } + + @Override + public int insertWgdCgfy(WgdCgfy wgdCgfy) { + wgdCgfy.setId(UUIDUtils.randomUUID(32)); + return wgdCgfyDao.insertOne(wgdCgfy); + } + + @Override + public int deleteWgdCgfy(String id) { + return wgdCgfyDao.deleteOne(id); + } + + @Override + public int deleteWgdCgfys(String ids) { + String[] str = ids.split(","); + return wgdCgfyDao.deleteBatch(str); + } + + @Override + public List importCgfy(MultipartFile file, StringBuilder stringBuilder) { + + List res= ExcelImportUtilByWk.readExcelpublic(WgdCgfy.class,file); + if (res != null){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select(WgdCgfy.class, info -> !info.getColumn().equals("id")); + List wgdCgfy=iWgdCgfyService.list(queryWrapper); + List remove=new ArrayList<>(); + wgdCgfy.forEach(WgbWbtj -> { + WgbWbtj.setId(null); + if (res.contains(WgbWbtj)){ + remove.add(WgbWbtj); + } + + }); + res.removeAll(remove); + res.forEach(wgdAssocInfo -> { + wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); + }); + if (res.size()>0 && iWgdCgfyService.saveOrUpdateBatch(res)) { + return res; + }else { + stringBuilder.append("表格数据全部重复"); + } + return res; + }else { + return null; + } + + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java index b8916c9c..98e78df1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java @@ -1,101 +1,105 @@ -package com.adc.da.slrs.wgdCensusLeo.service.impl; - -import com.adc.da.http.Result; -import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; -import com.adc.da.slrs.wgdCensusLeo.dao.WgdFyfyDao; -import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; -import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -/** - *

- * 翻译费用信息统计 服务实现类 - *

- * - * @author super_liu - * @since 2021-11-12 - */ -@Service -public class WgdFyfyServiceImpl extends ServiceImpl implements IWgdFyfyService { - - @Autowired - WgdFyfyDao wgdFyfyDao; - - @Autowired - IWgdFyfyService iWgdFyfyService; - - @Override - public List getAllWgdFyfys() { - return wgdFyfyDao.selectAll(); - } - - @Override - public List queryAllWgdFyfys(WgdFyfy wgdFyfy) { - Integer count = wgdFyfyDao.getQueryTotal(wgdFyfy); - wgdFyfy.getPager().setRowCount(count); - return wgdFyfyDao.queryAll(wgdFyfy); - } - - @Override - public WgdFyfy getWgdFyfyById(String id) { - return wgdFyfyDao.selectOne(id); - } - - @Override - public int updateWgdFyfy(WgdFyfy wgdFyfy) { - return wgdFyfyDao.updateOne(wgdFyfy); - } - - @Override - public int insertWgdFyfy(WgdFyfy wgdFyfy) { - wgdFyfy.setId(UUIDUtils.randomUUID(32)); - return wgdFyfyDao.insertOne(wgdFyfy); - } - - @Override - public int deleteWgdFyfy(String id) { - return wgdFyfyDao.deleteOne(id); - } - - @Override - public int deleteWgdFyfys(String ids) { - String[] str = ids.split(","); - return wgdFyfyDao.deleteBatch(str); - } - - @Override - public List importFyfy(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdFyfy.class,file); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(WgdFyfy.class, info -> !info.getColumn().equals("id")); - List wgdFyfy=iWgdFyfyService.list(queryWrapper); - List remove=new ArrayList<>(); - wgdFyfy.forEach(WgbWbtj -> { - WgbWbtj.setId(null); - if (res.contains(WgbWbtj)){ - remove.add(WgbWbtj); - } - - }); - res.removeAll(remove); - res.forEach(wgdAssocInfo -> { - wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); - }); - if (res.size()>0 && iWgdFyfyService.saveOrUpdateBatch(res)) { - return res; - }else { - stringBuilder.append("表格数据全部重复"); - } - return res; - } -} +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.http.Result; +import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; +import com.adc.da.slrs.wgdCensusLeo.dao.WgdFyfyDao; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 翻译费用信息统计 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public class WgdFyfyServiceImpl extends ServiceImpl implements IWgdFyfyService { + + @Autowired + WgdFyfyDao wgdFyfyDao; + + @Autowired + IWgdFyfyService iWgdFyfyService; + + @Override + public List getAllWgdFyfys() { + return wgdFyfyDao.selectAll(); + } + + @Override + public List queryAllWgdFyfys(WgdFyfy wgdFyfy) { + Integer count = wgdFyfyDao.getQueryTotal(wgdFyfy); + wgdFyfy.getPager().setRowCount(count); + return wgdFyfyDao.queryAll(wgdFyfy); + } + + @Override + public WgdFyfy getWgdFyfyById(String id) { + return wgdFyfyDao.selectOne(id); + } + + @Override + public int updateWgdFyfy(WgdFyfy wgdFyfy) { + return wgdFyfyDao.updateOne(wgdFyfy); + } + + @Override + public int insertWgdFyfy(WgdFyfy wgdFyfy) { + wgdFyfy.setId(UUIDUtils.randomUUID(32)); + return wgdFyfyDao.insertOne(wgdFyfy); + } + + @Override + public int deleteWgdFyfy(String id) { + return wgdFyfyDao.deleteOne(id); + } + + @Override + public int deleteWgdFyfys(String ids) { + String[] str = ids.split(","); + return wgdFyfyDao.deleteBatch(str); + } + + @Override + public List importFyfy(MultipartFile file, StringBuilder stringBuilder) { + List res= ExcelImportUtilByWk.readExcelpublic(WgdFyfy.class,file); + if (res != null){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select(WgdFyfy.class, info -> !info.getColumn().equals("id")); + List wgdFyfy=iWgdFyfyService.list(queryWrapper); + List remove=new ArrayList<>(); + wgdFyfy.forEach(WgbWbtj -> { + WgbWbtj.setId(null); + if (res.contains(WgbWbtj)){ + remove.add(WgbWbtj); + } + + }); + res.removeAll(remove); + res.forEach(wgdAssocInfo -> { + wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); + }); + if (res.size()>0 && iWgdFyfyService.saveOrUpdateBatch(res)) { + return res; + }else { + stringBuilder.append("表格数据全部重复"); + } + return res; + }else { + return null; + } + + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java index e5987030..264a756e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java @@ -1,117 +1,122 @@ -package com.adc.da.slrs.wgdCensusLeo.service.impl; - -import com.adc.da.http.Result; -import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; -import com.adc.da.slrs.wgdCensusLeo.dao.WgdSrbDao; -import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; -import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService; -import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; -import com.adc.da.util.UUIDUtils; -import com.adc.da.util.utils.StringUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -/** - *

- * 标准制修订补助资金收支统计收入表 服务实现类 - *

- * - * @author super_liu - * @since 2021-11-12 - */ -@Service -public class WgdSrbServiceImpl extends ServiceImpl implements IWgdSrbService { - - @Autowired - WgdSrbDao wgdSrbDao; - - @Autowired - IWgdSrbService iWgdSrbService; - - @Override - public List getAllWgdSrbs() { - return wgdSrbDao.selectAll(); - } - - @Override - public List queryAllWgdSrbs(WgdSrb wgdSrb) { - Integer count = wgdSrbDao.getQueryTotal(wgdSrb); - wgdSrb.getPager().setRowCount(count); - return wgdSrbDao.queryAll(wgdSrb); - } - - @Override - public WgdSrb getWgdSrbById(String id) { - return wgdSrbDao.selectOne(id); - } - - @Override - public int updateWgdSrb(WgdSrb wgdSrb) { - return wgdSrbDao.updateOne(wgdSrb); - } - - @Override - public int insertWgdSrb(WgdSrb wgdSrb) { - wgdSrb.setId(UUIDUtils.randomUUID(32)); - return wgdSrbDao.insertOne(wgdSrb); - } - - @Override - public int deleteWgdSrb(String id) { - return wgdSrbDao.deleteOne(id); - } - - @Override - public int deleteWgdSrbs(String ids) { - String[] str = ids.split(","); - return wgdSrbDao.deleteBatch(str); - } - - @Override - public List importSrb(MultipartFile file, StringBuilder stringBuilder) { - - List res= ExcelImportUtilByWk.readExcelpublic(WgdSrb.class,file); - DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); - int i=1; - for (WgdSrb wgdSrb: res) { - try { - if (null!=wgdSrb.getTime() && !"".equals(wgdSrb.getTime())) { - wgdSrb.setTime(wgdSrb.getTime()); - } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第5列入账时间填写不符合格式要求请检查；"); - } - i++; - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(WgdSrb.class, info -> !info.getColumn().equals("id")); - List wgdSrb=iWgdSrbService.list(queryWrapper); - List remove=new ArrayList<>(); - wgdSrb.forEach(WgbWbtj -> { - WgbWbtj.setId(null); - if (res.contains(WgbWbtj)){ - remove.add(WgbWbtj); - } - - }); - res.removeAll(remove); - res.forEach(wgdAssocInfo -> { - wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); - }); - if (res.size()>0 && iWgdSrbService.saveOrUpdateBatch(res)) { - return res; - }else { - stringBuilder.append("表格数据全部重复"); - } - return res; - } -} +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.http.Result; +import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; +import com.adc.da.slrs.wgdCensusLeo.dao.WgdSrbDao; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService; +import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; +import com.adc.da.util.UUIDUtils; +import com.adc.da.util.utils.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 标准制修订补助资金收支统计收入表 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public class WgdSrbServiceImpl extends ServiceImpl implements IWgdSrbService { + + @Autowired + WgdSrbDao wgdSrbDao; + + @Autowired + IWgdSrbService iWgdSrbService; + + @Override + public List getAllWgdSrbs() { + return wgdSrbDao.selectAll(); + } + + @Override + public List queryAllWgdSrbs(WgdSrb wgdSrb) { + Integer count = wgdSrbDao.getQueryTotal(wgdSrb); + wgdSrb.getPager().setRowCount(count); + return wgdSrbDao.queryAll(wgdSrb); + } + + @Override + public WgdSrb getWgdSrbById(String id) { + return wgdSrbDao.selectOne(id); + } + + @Override + public int updateWgdSrb(WgdSrb wgdSrb) { + return wgdSrbDao.updateOne(wgdSrb); + } + + @Override + public int insertWgdSrb(WgdSrb wgdSrb) { + wgdSrb.setId(UUIDUtils.randomUUID(32)); + return wgdSrbDao.insertOne(wgdSrb); + } + + @Override + public int deleteWgdSrb(String id) { + return wgdSrbDao.deleteOne(id); + } + + @Override + public int deleteWgdSrbs(String ids) { + String[] str = ids.split(","); + return wgdSrbDao.deleteBatch(str); + } + + @Override + public List importSrb(MultipartFile file, StringBuilder stringBuilder) { + + List res= ExcelImportUtilByWk.readExcelpublic(WgdSrb.class,file); + if (res != null){ + DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); + int i=1; + for (WgdSrb wgdSrb: res) { + try { + if (null!=wgdSrb.getTime() && !"".equals(wgdSrb.getTime())) { + wgdSrb.setTime(wgdSrb.getTime()); + } + }catch (Exception e){ + stringBuilder.append("第"+i+"行第5列入账时间填写不符合格式要求请检查；"); + } + i++; + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select(WgdSrb.class, info -> !info.getColumn().equals("id")); + List wgdSrb=iWgdSrbService.list(queryWrapper); + List remove=new ArrayList<>(); + wgdSrb.forEach(WgbWbtj -> { + WgbWbtj.setId(null); + if (res.contains(WgbWbtj)){ + remove.add(WgbWbtj); + } + + }); + res.removeAll(remove); + res.forEach(wgdAssocInfo -> { + wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); + }); + if (res.size()>0 && iWgdSrbService.saveOrUpdateBatch(res)) { + return res; + }else { + stringBuilder.append("表格数据全部重复"); + } + return res; + }else { + return null; + } + + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java index 6aa8ddce..a511c686 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java @@ -1,170 +1,175 @@ -package com.adc.da.slrs.wgdCensusLeo.service.impl; - -import com.adc.da.http.Result; -import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; -import com.adc.da.slrs.wgdCensusLeo.dao.WgdWbtjDao; -import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; -import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -/** - *

- * 参与外部协会会议统计 服务实现类 - *

- * - * @author super_liu - * @since 2021-11-12 - */ -@Service -public class WgdWbtjServiceImpl extends ServiceImpl implements IWgdWbtjService { - - @Autowired - WgdWbtjDao wgdWbtjDao; - - @Autowired - IWgdWbtjService iWgdWbtjService; - - @Override - public List getAllWgdWbtjs() { - return wgdWbtjDao.selectAll(); - } - - @Override - public List queryAllWgdWbtjs(WgdWbtj wgdWbtj) { - Integer count = wgdWbtjDao.getQueryTotal(wgdWbtj); - wgdWbtj.getPager().setRowCount(count); - return wgdWbtjDao.queryAll(wgdWbtj); - } - - @Override - public WgdWbtj getWgdWbtjById(String id) { - return wgdWbtjDao.selectOne(id); - } - - @Override - public int updateWgdWbtj(WgdWbtj wgdWbtj) { - return wgdWbtjDao.updateOne(wgdWbtj); - } - - @Override - public int insertWgdWbtj(WgdWbtj wgdWbtj) { - wgdWbtj.setId(UUIDUtils.randomUUID(32)); - return wgdWbtjDao.insertOne(wgdWbtj); - } - - @Override - public int deleteWgdWbtj(String id) { - return wgdWbtjDao.deleteOne(id); - } - - @Override - public int deleteWgdWbtjs(String ids) { - String[] str = ids.split(","); - return wgdWbtjDao.deleteBatch(str); - } - - @Override - public List importWbtj(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdWbtj.class,file); - DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); - int i=1; - for (WgdWbtj wgdWbtj: res) { - if (null == wgdWbtj.getHost() || "".equals(wgdWbtj.getHost())){ - stringBuilder.append("第" + i + "行第1列主办单位填写不符合格式要求请检查；"); - } - if (null == wgdWbtj.getMeeting() || "".equals(wgdWbtj.getMeeting())){ - stringBuilder.append("第" + i + "行第2列会议名称填写不符合格式要求请检查；"); - } - if (null == wgdWbtj.getPlace() || "".equals(wgdWbtj.getPlace())){ - stringBuilder.append("第" + i + "行第4列会议地点填写不符合格式要求请检查；"); - } - if (null == wgdWbtj.getContributions() || "".equals(wgdWbtj.getContributions())){ - stringBuilder.append("第" + i + "行第5列会费标准填写不符合格式要求请检查；"); - } - if (null == wgdWbtj.getExpenses() || "".equals(wgdWbtj.getExpenses())){ - stringBuilder.append("第" + i + "行第7列费用列支填写不符合格式要求请检查；"); - } - if (null == wgdWbtj.getUser() || "".equals(wgdWbtj.getUser())){ - stringBuilder.append("第" + i + "行第8列参会人员填写不符合格式要求请检查；"); - } - if (null == wgdWbtj.getLeadership() || "".equals(wgdWbtj.getLeadership())){ - stringBuilder.append("第" + i + "行第9列主管领导填写不符合格式要求请检查；"); - } - if (null == wgdWbtj.getParticipants() || "".equals(wgdWbtj.getParticipants())){ - stringBuilder.append("第" + i + "行第10列参会单位填写不符合格式要求请检查；"); - } - if (null == wgdWbtj.getIssues() || "".equals(wgdWbtj.getIssues())){ - stringBuilder.append("第" + i + "行第13列主要议题填写不符合格式要求请检查；"); - } - try { - if (null!=wgdWbtj.getTime() && !"".equals(wgdWbtj.getTime())) { - wgdWbtj.setTime(wgdWbtj.getTime()); - } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第3列会议时间填写不符合格式要求请检查；"); - } - i++; - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(WgdWbtj.class,tableFieldInfo -> !tableFieldInfo.getColumn().equals("id")); - List WgdWbtjs=iWgdWbtjService.list(queryWrapper); - List remove=new ArrayList<>(); - WgdWbtjs.forEach(WgbWbtj -> { - WgbWbtj.setId(null); - if (res.contains(WgbWbtj)){ - remove.add(WgbWbtj); - } - res.forEach(resWbtj->{ - if (null == resWbtj.getHost() || "".equals(resWbtj.getHost())){ - remove.add(resWbtj); - } - if (null == resWbtj.getMeeting() || "".equals(resWbtj.getMeeting())){ - remove.add(resWbtj); - } - if (null == resWbtj.getPlace() || "".equals(resWbtj.getPlace())){ - remove.add(resWbtj); - } - if (null == resWbtj.getContributions() || "".equals(resWbtj.getContributions())){ - remove.add(resWbtj); - } - if (null == resWbtj.getExpenses() || "".equals(resWbtj.getExpenses())){ - remove.add(resWbtj); - } - if (null == resWbtj.getUser() || "".equals(resWbtj.getUser())){ - remove.add(resWbtj); - } - if (null == resWbtj.getLeadership() || "".equals(resWbtj.getLeadership())){ - remove.add(resWbtj); - } - if (null == resWbtj.getParticipants() || "".equals(resWbtj.getParticipants())){ - remove.add(resWbtj); - } - if (null == resWbtj.getIssues() || "".equals(resWbtj.getIssues())){ - remove.add(resWbtj); - } - }); - - }); - res.removeAll(remove); - res.forEach(WgbWbtj -> { - WgbWbtj.setId(String.valueOf(UUID.randomUUID())); - }); - if (res.size()>0 && iWgdWbtjService.saveOrUpdateBatch(res)) { - return res; - }else { - stringBuilder.append("表格数据全部重复"); - } - return res; - } -} +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.http.Result; +import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; +import com.adc.da.slrs.wgdCensusLeo.dao.WgdWbtjDao; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 参与外部协会会议统计 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public class WgdWbtjServiceImpl extends ServiceImpl implements IWgdWbtjService { + + @Autowired + WgdWbtjDao wgdWbtjDao; + + @Autowired + IWgdWbtjService iWgdWbtjService; + + @Override + public List getAllWgdWbtjs() { + return wgdWbtjDao.selectAll(); + } + + @Override + public List queryAllWgdWbtjs(WgdWbtj wgdWbtj) { + Integer count = wgdWbtjDao.getQueryTotal(wgdWbtj); + wgdWbtj.getPager().setRowCount(count); + return wgdWbtjDao.queryAll(wgdWbtj); + } + + @Override + public WgdWbtj getWgdWbtjById(String id) { + return wgdWbtjDao.selectOne(id); + } + + @Override + public int updateWgdWbtj(WgdWbtj wgdWbtj) { + return wgdWbtjDao.updateOne(wgdWbtj); + } + + @Override + public int insertWgdWbtj(WgdWbtj wgdWbtj) { + wgdWbtj.setId(UUIDUtils.randomUUID(32)); + return wgdWbtjDao.insertOne(wgdWbtj); + } + + @Override + public int deleteWgdWbtj(String id) { + return wgdWbtjDao.deleteOne(id); + } + + @Override + public int deleteWgdWbtjs(String ids) { + String[] str = ids.split(","); + return wgdWbtjDao.deleteBatch(str); + } + + @Override + public List importWbtj(MultipartFile file, StringBuilder stringBuilder) { + List res= ExcelImportUtilByWk.readExcelpublic(WgdWbtj.class,file); + if (res != null){ + DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); + int i=1; + for (WgdWbtj wgdWbtj: res) { + if (null == wgdWbtj.getHost() || "".equals(wgdWbtj.getHost())){ + stringBuilder.append("第" + i + "行第1列主办单位填写不符合格式要求请检查；"); + } + if (null == wgdWbtj.getMeeting() || "".equals(wgdWbtj.getMeeting())){ + stringBuilder.append("第" + i + "行第2列会议名称填写不符合格式要求请检查；"); + } + if (null == wgdWbtj.getPlace() || "".equals(wgdWbtj.getPlace())){ + stringBuilder.append("第" + i + "行第4列会议地点填写不符合格式要求请检查；"); + } + if (null == wgdWbtj.getContributions() || "".equals(wgdWbtj.getContributions())){ + stringBuilder.append("第" + i + "行第5列会费标准填写不符合格式要求请检查；"); + } + if (null == wgdWbtj.getExpenses() || "".equals(wgdWbtj.getExpenses())){ + stringBuilder.append("第" + i + "行第7列费用列支填写不符合格式要求请检查；"); + } + if (null == wgdWbtj.getUser() || "".equals(wgdWbtj.getUser())){ + stringBuilder.append("第" + i + "行第8列参会人员填写不符合格式要求请检查；"); + } + if (null == wgdWbtj.getLeadership() || "".equals(wgdWbtj.getLeadership())){ + stringBuilder.append("第" + i + "行第9列主管领导填写不符合格式要求请检查；"); + } + if (null == wgdWbtj.getParticipants() || "".equals(wgdWbtj.getParticipants())){ + stringBuilder.append("第" + i + "行第10列参会单位填写不符合格式要求请检查；"); + } + if (null == wgdWbtj.getIssues() || "".equals(wgdWbtj.getIssues())){ + stringBuilder.append("第" + i + "行第13列主要议题填写不符合格式要求请检查；"); + } + try { + if (null!=wgdWbtj.getTime() && !"".equals(wgdWbtj.getTime())) { + wgdWbtj.setTime(wgdWbtj.getTime()); + } + }catch (Exception e){ + stringBuilder.append("第"+i+"行第3列会议时间填写不符合格式要求请检查；"); + } + i++; + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select(WgdWbtj.class,tableFieldInfo -> !tableFieldInfo.getColumn().equals("id")); + List WgdWbtjs=iWgdWbtjService.list(queryWrapper); + List remove=new ArrayList<>(); + WgdWbtjs.forEach(WgbWbtj -> { + WgbWbtj.setId(null); + if (res.contains(WgbWbtj)){ + remove.add(WgbWbtj); + } + res.forEach(resWbtj->{ + if (null == resWbtj.getHost() || "".equals(resWbtj.getHost())){ + remove.add(resWbtj); + } + if (null == resWbtj.getMeeting() || "".equals(resWbtj.getMeeting())){ + remove.add(resWbtj); + } + if (null == resWbtj.getPlace() || "".equals(resWbtj.getPlace())){ + remove.add(resWbtj); + } + if (null == resWbtj.getContributions() || "".equals(resWbtj.getContributions())){ + remove.add(resWbtj); + } + if (null == resWbtj.getExpenses() || "".equals(resWbtj.getExpenses())){ + remove.add(resWbtj); + } + if (null == resWbtj.getUser() || "".equals(resWbtj.getUser())){ + remove.add(resWbtj); + } + if (null == resWbtj.getLeadership() || "".equals(resWbtj.getLeadership())){ + remove.add(resWbtj); + } + if (null == resWbtj.getParticipants() || "".equals(resWbtj.getParticipants())){ + remove.add(resWbtj); + } + if (null == resWbtj.getIssues() || "".equals(resWbtj.getIssues())){ + remove.add(resWbtj); + } + }); + + }); + res.removeAll(remove); + res.forEach(WgbWbtj -> { + WgbWbtj.setId(String.valueOf(UUID.randomUUID())); + }); + if (res.size()>0 && iWgdWbtjService.saveOrUpdateBatch(res)) { + return res; + }else { + stringBuilder.append("表格数据全部重复"); + } + return res; + }else { + return null; + } + + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java index 995aabd6..87c2e827 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java @@ -1,156 +1,161 @@ -package com.adc.da.slrs.wgdCensusLeo.service.impl; - -import com.adc.da.http.Result; -import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; -import com.adc.da.slrs.wgdCensusLeo.dao.WgdWbxdDao; -import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; -import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -/** - *

- * 参与外部标准制修订信息统计 服务实现类 - *

- * - * @author super_liu - * @since 2021-11-12 - */ -@Service -public class WgdWbxdServiceImpl extends ServiceImpl implements IWgdWbxdService { - - @Autowired - WgdWbxdDao wgdWbxdDao; - - @Autowired - IWgdWbxdService iWgdWbxdService; - - @Override - public List getAllWgdWbxds() { - return wgdWbxdDao.selectAll(); - } - - @Override - public List queryAllWgdWbxds(WgdWbxd wgdWbxd) { - Integer count = wgdWbxdDao.getQueryTotal(wgdWbxd); - wgdWbxd.getPager().setRowCount(count); - return wgdWbxdDao.queryAll(wgdWbxd); - } - - @Override - public WgdWbxd getWgdWbxdById(String id) { - return wgdWbxdDao.selectOne(id); - } - - @Override - public int updateWgdWbxd(WgdWbxd wgdWbxd) { - return wgdWbxdDao.updateOne(wgdWbxd); - } - - @Override - public int insertWgdWbxd(WgdWbxd wgdWbxd) { - wgdWbxd.setId(UUIDUtils.randomUUID(32)); - return wgdWbxdDao.insertOne(wgdWbxd); - } - - @Override - public int deleteWgdWbxd(String id) { - return wgdWbxdDao.deleteOne(id); - } - - @Override - public int deleteWgdWbxds(String ids) { - String[] str = ids.split(","); - return wgdWbxdDao.deleteBatch(str); - } - - @Override - public List importWbxd(MultipartFile file, StringBuilder stringBuilder) { - - - List res= ExcelImportUtilByWk.readExcelpublic(WgdWbxd.class,file); - DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); - int i=1; - for (WgdWbxd wgdWbxd: res) { - if (null == wgdWbxd.getName() || "".equals(wgdWbxd.getName())){ - stringBuilder.append("第" + i + "行第3列标准名称填写不符合格式要求请检查；"); - } - if (null == wgdWbxd.getType() || "".equals(wgdWbxd.getType())){ - stringBuilder.append("第" + i + "行第6列标类型填写不符合格式要求请检查；"); - } - if (null == wgdWbxd.getPreside() || "".equals(wgdWbxd.getPreside())){ - stringBuilder.append("第" + i + "行第7列主持或参与填写不符合格式要求请检查；"); - } - if (null == wgdWbxd.getParticipants() || "".equals(wgdWbxd.getParticipants())){ - stringBuilder.append("第" + i + "行第14列参与人填写不符合格式要求请检查；"); - } - try { - if (null!=wgdWbxd.getDataStart() && !"".equals(wgdWbxd.getDataStart())) { - wgdWbxd.setDataStart(wgdWbxd.getDataStart()); - } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第8列发布日期填写不符合格式要求请检查；"); - } - try { - if (null!=wgdWbxd.getDataImplement() && !"".equals(wgdWbxd.getDataImplement())) { - wgdWbxd.setDataImplement(wgdWbxd.getDataImplement()); - } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第9列实施日期填写不符合格式要求请检查；"); - } - try { - if (null!=wgdWbxd.getDataRecord() && !"".equals(wgdWbxd.getDataRecord())) { - wgdWbxd.setDataRecord(wgdWbxd.getDataRecord()); - } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第12列备案时间填写不符合格式要求请检查；"); - } - i++; - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(WgdWbxd.class, info -> !info.getColumn().equals("id")); - List wgdAssocInfos=iWgdWbxdService.list(queryWrapper); - List remove=new ArrayList<>(); - wgdAssocInfos.forEach(WgbWbtj -> { - WgbWbtj.setId(null); - if (res.contains(WgbWbtj)){ - remove.add(WgbWbtj); - } - res.forEach(resWBxd->{ - if (null == resWBxd.getName() || "".equals(resWBxd.getName())){ - remove.add(resWBxd); - } - if (null == resWBxd.getType() || "".equals(resWBxd.getType())){ - remove.add(resWBxd); - } - if (null == resWBxd.getPreside() || "".equals(resWBxd.getPreside())){ - remove.add(resWBxd); - } - if (null == resWBxd.getParticipants() || "".equals(resWBxd.getParticipants())){ - remove.add(resWBxd); - } - }); - - }); - res.removeAll(remove); - res.forEach(wgdAssocInfo -> { - wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); - }); - if (res.size()>0 && iWgdWbxdService.saveOrUpdateBatch(res)) { - return res; - }else { - stringBuilder.append("表格数据全部重复"); - } - return res; - } -} +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.http.Result; +import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; +import com.adc.da.slrs.wgdCensusLeo.dao.WgdWbxdDao; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 参与外部标准制修订信息统计 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public class WgdWbxdServiceImpl extends ServiceImpl implements IWgdWbxdService { + + @Autowired + WgdWbxdDao wgdWbxdDao; + + @Autowired + IWgdWbxdService iWgdWbxdService; + + @Override + public List getAllWgdWbxds() { + return wgdWbxdDao.selectAll(); + } + + @Override + public List queryAllWgdWbxds(WgdWbxd wgdWbxd) { + Integer count = wgdWbxdDao.getQueryTotal(wgdWbxd); + wgdWbxd.getPager().setRowCount(count); + return wgdWbxdDao.queryAll(wgdWbxd); + } + + @Override + public WgdWbxd getWgdWbxdById(String id) { + return wgdWbxdDao.selectOne(id); + } + + @Override + public int updateWgdWbxd(WgdWbxd wgdWbxd) { + return wgdWbxdDao.updateOne(wgdWbxd); + } + + @Override + public int insertWgdWbxd(WgdWbxd wgdWbxd) { + wgdWbxd.setId(UUIDUtils.randomUUID(32)); + return wgdWbxdDao.insertOne(wgdWbxd); + } + + @Override + public int deleteWgdWbxd(String id) { + return wgdWbxdDao.deleteOne(id); + } + + @Override + public int deleteWgdWbxds(String ids) { + String[] str = ids.split(","); + return wgdWbxdDao.deleteBatch(str); + } + + @Override + public List importWbxd(MultipartFile file, StringBuilder stringBuilder) { + + + List res= ExcelImportUtilByWk.readExcelpublic(WgdWbxd.class,file); + if (res != null){ + DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); + int i=1; + for (WgdWbxd wgdWbxd: res) { + if (null == wgdWbxd.getName() || "".equals(wgdWbxd.getName())){ + stringBuilder.append("第" + i + "行第3列标准名称填写不符合格式要求请检查；"); + } + if (null == wgdWbxd.getType() || "".equals(wgdWbxd.getType())){ + stringBuilder.append("第" + i + "行第6列标类型填写不符合格式要求请检查；"); + } + if (null == wgdWbxd.getPreside() || "".equals(wgdWbxd.getPreside())){ + stringBuilder.append("第" + i + "行第7列主持或参与填写不符合格式要求请检查；"); + } + if (null == wgdWbxd.getParticipants() || "".equals(wgdWbxd.getParticipants())){ + stringBuilder.append("第" + i + "行第14列参与人填写不符合格式要求请检查；"); + } + try { + if (null!=wgdWbxd.getDataStart() && !"".equals(wgdWbxd.getDataStart())) { + wgdWbxd.setDataStart(wgdWbxd.getDataStart()); + } + }catch (Exception e){ + stringBuilder.append("第"+i+"行第8列发布日期填写不符合格式要求请检查；"); + } + try { + if (null!=wgdWbxd.getDataImplement() && !"".equals(wgdWbxd.getDataImplement())) { + wgdWbxd.setDataImplement(wgdWbxd.getDataImplement()); + } + }catch (Exception e){ + stringBuilder.append("第"+i+"行第9列实施日期填写不符合格式要求请检查；"); + } + try { + if (null!=wgdWbxd.getDataRecord() && !"".equals(wgdWbxd.getDataRecord())) { + wgdWbxd.setDataRecord(wgdWbxd.getDataRecord()); + } + }catch (Exception e){ + stringBuilder.append("第"+i+"行第12列备案时间填写不符合格式要求请检查；"); + } + i++; + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select(WgdWbxd.class, info -> !info.getColumn().equals("id")); + List wgdAssocInfos=iWgdWbxdService.list(queryWrapper); + List remove=new ArrayList<>(); + wgdAssocInfos.forEach(WgbWbtj -> { + WgbWbtj.setId(null); + if (res.contains(WgbWbtj)){ + remove.add(WgbWbtj); + } + res.forEach(resWBxd->{ + if (null == resWBxd.getName() || "".equals(resWBxd.getName())){ + remove.add(resWBxd); + } + if (null == resWBxd.getType() || "".equals(resWBxd.getType())){ + remove.add(resWBxd); + } + if (null == resWBxd.getPreside() || "".equals(resWBxd.getPreside())){ + remove.add(resWBxd); + } + if (null == resWBxd.getParticipants() || "".equals(resWBxd.getParticipants())){ + remove.add(resWBxd); + } + }); + + }); + res.removeAll(remove); + res.forEach(wgdAssocInfo -> { + wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); + }); + if (res.size()>0 && iWgdWbxdService.saveOrUpdateBatch(res)) { + return res; + }else { + stringBuilder.append("表格数据全部重复"); + } + return res; + }else { + return null; + } + + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java index dfe74bc5..c5ae5934 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java @@ -1,106 +1,110 @@ -package com.adc.da.slrs.wgdCensusLeo.service.impl; - -import com.adc.da.http.Result; -import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; -import com.adc.da.slrs.wgdCensusLeo.dao.WgdZcbDao; -import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; -import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -/** - *

- * 标准制修订补助资金收支统计支出表 服务实现类 - *

- * - * @author super_liu - * @since 2021-11-12 - */ -@Service -public class WgdZcbServiceImpl extends ServiceImpl implements IWgdZcbService { - - @Autowired - WgdZcbDao wgdZcbDao; - - @Autowired - IWgdZcbService iWgdZcbService; - @Override - public List getAllWgdZcbs() { - return wgdZcbDao.selectAll(); - } - - @Override - public List queryAllWgdZcbs(WgdZcb wgdZcb) { - Integer count = wgdZcbDao.getQueryTotal(wgdZcb); - wgdZcb.getPager().setRowCount(count); - return wgdZcbDao.queryAll(wgdZcb); - } - - @Override - public WgdZcb getWgdZcbById(String id) { - return wgdZcbDao.selectOne(id); - } - - @Override - public int updateWgdZcb(WgdZcb wgdZcb) { - return wgdZcbDao.updateOne(wgdZcb); - } - - @Override - public int insertWgdZcb(WgdZcb wgdZcb) { - wgdZcb.setId(UUIDUtils.randomUUID(32)); - return wgdZcbDao.insertOne(wgdZcb); - } - - @Override - public int deleteWgdZcb(String id) { - return wgdZcbDao.deleteOne(id); - } - - @Override - public int deleteWgdZcbs(String ids) { - String[] str = ids.split(","); - return wgdZcbDao.deleteBatch(str); - } - - @Override - public List importZcb(MultipartFile file, StringBuilder stringBuilder) { - - List res= ExcelImportUtilByWk.readExcelpublic(WgdZcb.class,file); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(WgdZcb.class, info -> !info.getColumn().equals("id")); - List wgdZcb=iWgdZcbService.list(queryWrapper); - List remove=new ArrayList<>(); - wgdZcb.forEach(WgbWbtj -> { - WgbWbtj.setId(null); - if (res.contains(WgbWbtj)){ - remove.add(WgbWbtj); - } - res.forEach(resZcb->{ - if (null!=resZcb.getAnnexs() && !"".equals(resZcb.getAnnexs())) { - resZcb.setAnnexs(null); - } - }); - - }); - res.removeAll(remove); - res.forEach(wgdAssocInfo -> { - wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); - }); - if (res.size()>0 && iWgdZcbService.saveOrUpdateBatch(res)) { - return res; - }else { - stringBuilder.append("表格数据全部重复"); - } - return res; - } -} +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.http.Result; +import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; +import com.adc.da.slrs.wgdCensusLeo.dao.WgdZcbDao; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 标准制修订补助资金收支统计支出表 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public class WgdZcbServiceImpl extends ServiceImpl implements IWgdZcbService { + + @Autowired + WgdZcbDao wgdZcbDao; + + @Autowired + IWgdZcbService iWgdZcbService; + @Override + public List getAllWgdZcbs() { + return wgdZcbDao.selectAll(); + } + + @Override + public List queryAllWgdZcbs(WgdZcb wgdZcb) { + Integer count = wgdZcbDao.getQueryTotal(wgdZcb); + wgdZcb.getPager().setRowCount(count); + return wgdZcbDao.queryAll(wgdZcb); + } + + @Override + public WgdZcb getWgdZcbById(String id) { + return wgdZcbDao.selectOne(id); + } + + @Override + public int updateWgdZcb(WgdZcb wgdZcb) { + return wgdZcbDao.updateOne(wgdZcb); + } + + @Override + public int insertWgdZcb(WgdZcb wgdZcb) { + wgdZcb.setId(UUIDUtils.randomUUID(32)); + return wgdZcbDao.insertOne(wgdZcb); + } + + @Override + public int deleteWgdZcb(String id) { + return wgdZcbDao.deleteOne(id); + } + + @Override + public int deleteWgdZcbs(String ids) { + String[] str = ids.split(","); + return wgdZcbDao.deleteBatch(str); + } + + @Override + public List importZcb(MultipartFile file, StringBuilder stringBuilder) { + + List res= ExcelImportUtilByWk.readExcelpublic(WgdZcb.class,file); + if (res != null){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select(WgdZcb.class, info -> !info.getColumn().equals("id")); + List wgdZcb=iWgdZcbService.list(queryWrapper); + List remove=new ArrayList<>(); + wgdZcb.forEach(WgbWbtj -> { + WgbWbtj.setId(null); + if (res.contains(WgbWbtj)){ + remove.add(WgbWbtj); + } + res.forEach(resZcb->{ + if (null!=resZcb.getAnnexs() && !"".equals(resZcb.getAnnexs())) { + resZcb.setAnnexs(null); + } + }); + + }); + res.removeAll(remove); + res.forEach(wgdAssocInfo -> { + wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); + }); + if (res.size()>0 && iWgdZcbService.saveOrUpdateBatch(res)) { + return res; + }else { + stringBuilder.append("表格数据全部重复"); + } + return res; + }else { + return null; + } + + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java index e21cb0d9..86b0b49a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java @@ -1,146 +1,151 @@ -package com.adc.da.slrs.wgdCensusZ.service.impl; - -import com.adc.da.http.Result; -import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; -import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; -import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocCostDao; -import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; -import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - -/** - *

- * 协会费用信息统计 服务实现类 - *

- * - * @author zcr - * @since 2021-11-12 - */ -@Service -public class WgdAssocCostServiceImpl extends ServiceImpl implements IWgdAssocCostService { - - @Autowired - WgdAssocCostDao wgdAssocCostDao; - - @Autowired - IWgdAssocCostService iWgdAssocCostService; - - @Override - public List selectAllAssocCosts() { - return wgdAssocCostDao.selectAllAssocCosts(); - } - - @Override - public List getAllWgdAssocCosts(WgdAssocCost page) { - Integer count = wgdAssocCostDao.getTotal(); - page.getPager().setRowCount(count); - List wgdAssocCosts = wgdAssocCostDao.selectAll(page); - return wgdAssocCosts; - } - - @Override - public List queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost) { - Integer count = wgdAssocCostDao.getQueryTotal(wgdAssocCost); - wgdAssocCost.getPager().setRowCount(count); - List wgdAssocCosts = wgdAssocCostDao.queryAll(wgdAssocCost); - return wgdAssocCosts; - } - - @Override - public WgdAssocCost getWgdAssocCostById(String id) { - return wgdAssocCostDao.selectOne(id); - } - - @Override - public int updateWgdAssocCost(WgdAssocCost wgdAssocCost) { - return wgdAssocCostDao.updateOne(wgdAssocCost); - } - - @Override - public int insertWgdAssocCost(WgdAssocCost wgdAssocCost) { - wgdAssocCost.setId(UUIDUtils.randomUUID(32)); - return wgdAssocCostDao.insertOne(wgdAssocCost); - } - - @Override - public int deleteWgdAssocCost(String id) { - return wgdAssocCostDao.deleteOne(id); - } - - @Override - public int deleteWgdAssocCosts(String ids) { - String[] str = ids.split(","); - return wgdAssocCostDao.deleteBatch(str); - } - - @Override - public List importAssocCosts(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdAssocCost.class,file); - DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); - int i=1; - for (WgdAssocCost wgdAssocCost: res) { - if (null == wgdAssocCost.getScName() || "".equals(wgdAssocCost.getScName())){ - stringBuilder.append("第" + i + "行第1列协会名称-标委会填写不符合格式要求请检查；"); - } - if (null == wgdAssocCost.getWgName() || "".equals(wgdAssocCost.getWgName())){ - stringBuilder.append("第" + i + "行第3列协会名称-工作组填写不符合格式要求请检查；"); - } - if (null == wgdAssocCost.getCostOutlay() || "".equals(wgdAssocCost.getCostOutlay())){ - stringBuilder.append("第" + i + "行第6列费用列支填写不符合格式要求请检查；"); - } - if (null == wgdAssocCost.getAnnualPayment() || "".equals(wgdAssocCost.getAnnualPayment())){ - stringBuilder.append("第" + i + "行第7列每年缴费情况填写不符合格式要求请检查；"); - } - i++; - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(WgdAssocCost.class, info -> !info.getColumn().equals("id")); - List wgdAssocCost=iWgdAssocCostService.list(queryWrapper); - List remove=new ArrayList<>(); - wgdAssocCost.forEach(WgbWbtj -> { - WgbWbtj.setId(null); - if (res.contains(WgbWbtj)){ - remove.add(WgbWbtj); - } - res.forEach(resAssoc->{ - if (null == resAssoc.getScName() || "".equals(resAssoc.getScName())){ - remove.add(resAssoc); - } - if (null == resAssoc.getWgName() || "".equals(resAssoc.getWgName())){ - remove.add(resAssoc); - } - if (null == resAssoc.getCostOutlay() || "".equals(resAssoc.getCostOutlay())){ - remove.add(resAssoc); - } - if (null == resAssoc.getAnnualPayment() || "".equals(resAssoc.getAnnualPayment())){ - remove.add(resAssoc); - } - }); - - }); - res.removeAll(remove); - res.forEach(wgdAssocInfo -> { - wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); - }); - if (res.size()>0 && iWgdAssocCostService.saveOrUpdateBatch(res)) { - return res; - }else { - stringBuilder.append("表格数据全部重复"); - } - return res; - } -} +package com.adc.da.slrs.wgdCensusZ.service.impl; + +import com.adc.da.http.Result; +import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocCostDao; +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 协会费用信息统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdAssocCostServiceImpl extends ServiceImpl implements IWgdAssocCostService { + + @Autowired + WgdAssocCostDao wgdAssocCostDao; + + @Autowired + IWgdAssocCostService iWgdAssocCostService; + + @Override + public List selectAllAssocCosts() { + return wgdAssocCostDao.selectAllAssocCosts(); + } + + @Override + public List getAllWgdAssocCosts(WgdAssocCost page) { + Integer count = wgdAssocCostDao.getTotal(); + page.getPager().setRowCount(count); + List wgdAssocCosts = wgdAssocCostDao.selectAll(page); + return wgdAssocCosts; + } + + @Override + public List queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost) { + Integer count = wgdAssocCostDao.getQueryTotal(wgdAssocCost); + wgdAssocCost.getPager().setRowCount(count); + List wgdAssocCosts = wgdAssocCostDao.queryAll(wgdAssocCost); + return wgdAssocCosts; + } + + @Override + public WgdAssocCost getWgdAssocCostById(String id) { + return wgdAssocCostDao.selectOne(id); + } + + @Override + public int updateWgdAssocCost(WgdAssocCost wgdAssocCost) { + return wgdAssocCostDao.updateOne(wgdAssocCost); + } + + @Override + public int insertWgdAssocCost(WgdAssocCost wgdAssocCost) { + wgdAssocCost.setId(UUIDUtils.randomUUID(32)); + return wgdAssocCostDao.insertOne(wgdAssocCost); + } + + @Override + public int deleteWgdAssocCost(String id) { + return wgdAssocCostDao.deleteOne(id); + } + + @Override + public int deleteWgdAssocCosts(String ids) { + String[] str = ids.split(","); + return wgdAssocCostDao.deleteBatch(str); + } + + @Override + public List importAssocCosts(MultipartFile file, StringBuilder stringBuilder) { + List res= ExcelImportUtilByWk.readExcelpublic(WgdAssocCost.class,file); + if (res != null){ + DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); + int i=1; + for (WgdAssocCost wgdAssocCost: res) { + if (null == wgdAssocCost.getScName() || "".equals(wgdAssocCost.getScName())){ + stringBuilder.append("第" + i + "行第1列协会名称-标委会填写不符合格式要求请检查；"); + } + if (null == wgdAssocCost.getWgName() || "".equals(wgdAssocCost.getWgName())){ + stringBuilder.append("第" + i + "行第3列协会名称-工作组填写不符合格式要求请检查；"); + } + if (null == wgdAssocCost.getCostOutlay() || "".equals(wgdAssocCost.getCostOutlay())){ + stringBuilder.append("第" + i + "行第6列费用列支填写不符合格式要求请检查；"); + } + if (null == wgdAssocCost.getAnnualPayment() || "".equals(wgdAssocCost.getAnnualPayment())){ + stringBuilder.append("第" + i + "行第7列每年缴费情况填写不符合格式要求请检查；"); + } + i++; + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select(WgdAssocCost.class, info -> !info.getColumn().equals("id")); + List wgdAssocCost=iWgdAssocCostService.list(queryWrapper); + List remove=new ArrayList<>(); + wgdAssocCost.forEach(WgbWbtj -> { + WgbWbtj.setId(null); + if (res.contains(WgbWbtj)){ + remove.add(WgbWbtj); + } + res.forEach(resAssoc->{ + if (null == resAssoc.getScName() || "".equals(resAssoc.getScName())){ + remove.add(resAssoc); + } + if (null == resAssoc.getWgName() || "".equals(resAssoc.getWgName())){ + remove.add(resAssoc); + } + if (null == resAssoc.getCostOutlay() || "".equals(resAssoc.getCostOutlay())){ + remove.add(resAssoc); + } + if (null == resAssoc.getAnnualPayment() || "".equals(resAssoc.getAnnualPayment())){ + remove.add(resAssoc); + } + }); + + }); + res.removeAll(remove); + res.forEach(wgdAssocInfo -> { + wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); + }); + if (res.size()>0 && iWgdAssocCostService.saveOrUpdateBatch(res)) { + return res; + }else { + stringBuilder.append("表格数据全部重复"); + } + return res; + }else { + return null; + } + + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java index e2e3e4db..2067b505 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java @@ -1,162 +1,167 @@ -package com.adc.da.slrs.wgdCensusZ.service.impl; - -import com.adc.da.http.Result; -import com.adc.da.slrs.processModel.entity.importExcelDTO; -import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; -import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; -import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocInfoDao; -import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.poi.hssf.usermodel.HSSFDateUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; - -/** - *

- * 协会信息数据统计 服务实现类 - *

- * - * @author zcr - * @since 2021-11-12 - */ -@Service -public class WgdAssocInfoServiceImpl extends ServiceImpl implements IWgdAssocInfoService { - - @Autowired - WgdAssocInfoDao wgdAssocInfoDao; - @Autowired - IWgdAssocInfoService iWgdAssocInfoService; - - @Override - public List getAllWgdAssocInfos() { - return wgdAssocInfoDao.selectAll(); - } - - @Override - public List queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo) { - Integer count = wgdAssocInfoDao.getQueryTotal(wgdAssocInfo); - wgdAssocInfo.getPager().setRowCount(count); - return wgdAssocInfoDao.queryAll(wgdAssocInfo); - } - - @Override - public WgdAssocInfo getWgdAssocInfoById(String id) { - return wgdAssocInfoDao.selectById(id); - } - - @Override - public int updateWgdAssocInfo(WgdAssocInfo wgdAssocInfo) { - return wgdAssocInfoDao.updateOne(wgdAssocInfo); - } - - @Override - public int insertWgdAssocInfo(WgdAssocInfo wgdAssocInfo) { - wgdAssocInfo.setId(UUIDUtils.randomUUID(32)); - return wgdAssocInfoDao.insertOne(wgdAssocInfo); - } - - @Override - public int deleteWgdAssocInfo(String id) { - return wgdAssocInfoDao.deleteOne(id); - } - - @Override - public int deleteWgdAssocInfos(String ids) { - String[] str = ids.split(","); - return wgdAssocInfoDao.deleteBatch(str); - } - - @Override - public List delWithWkData(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdAssocInfo.class,file); - DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); - int i=1; - for (WgdAssocInfo importExcelDTO: res) { - if (null == importExcelDTO.getScName() || "".equals(importExcelDTO.getScName())){ - stringBuilder.append("第" + i + "行第1列协会名称-标委会填写不符合格式要求请检查；"); - } - if (null == importExcelDTO.getSscName() || "".equals(importExcelDTO.getSscName())){ - stringBuilder.append("第" + i + "行第2列协会名称-分标委填写不符合格式要求请检查；"); - } - if (null == importExcelDTO.getWgName() || "".equals(importExcelDTO.getWgName())){ - stringBuilder.append("第" + i + "行第3列协会名称-工作组填写不符合格式要求请检查；"); - } - if (null == importExcelDTO.getRole() || "".equals(importExcelDTO.getRole())){ - stringBuilder.append("第" + i + "行第4列会员角色填写不符合格式要求请检查；"); - } - if (null == importExcelDTO.getAttend() || "".equals(importExcelDTO.getAttend())){ - stringBuilder.append("第" + i + "行第5列参与人填写不符合格式要求请检查；"); - } - try { - if (null!=importExcelDTO.getIniTime() && !"".equals(importExcelDTO.getIniTime())) { - importExcelDTO.setIniTime(importExcelDTO.getIniTime()); - } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第9列初始入会时间填写不符合格式要求请检查；"); - } - try { - if (null!=importExcelDTO.getCurTime() && !"".equals(importExcelDTO.getCurTime())) { - - importExcelDTO.setCurTime(importExcelDTO.getCurTime()); - } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第10列本届入会时间填写不符合格式要求请检查；"); - } - try { - if (null!=importExcelDTO.getLastPayTime() && !"".equals(importExcelDTO.getLastPayTime())) { - importExcelDTO.setLastPayTime(importExcelDTO.getLastPayTime()); - } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第13列上次缴纳时间填写不符合格式要求请检查；"); - } - i++; - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(WgdAssocInfo.class, info -> !info.getColumn().equals("id")); - List wgdAssocInfos=iWgdAssocInfoService.list(queryWrapper); - List remove=new ArrayList<>(); - wgdAssocInfos.forEach(WgbWbtj -> { - WgbWbtj.setId(null); - if (res.contains(WgbWbtj)){ - remove.add(WgbWbtj); - } - res.forEach(resOne->{ - if (null == resOne.getScName() || "".equals(resOne.getScName())){ - remove.add(resOne); - } - if (null == resOne.getSscName() || "".equals(resOne.getSscName())){ - remove.add(resOne); - } - if (null == resOne.getWgName() || "".equals(resOne.getWgName())){ - remove.add(resOne); - } - if (null == resOne.getRole() || "".equals(resOne.getRole())){ - remove.add(resOne); - } - if (null == resOne.getAttend() || "".equals(resOne.getAttend())){ - remove.add(resOne); - } - }); - }); - res.removeAll(remove); - res.forEach(wgdAssocInfo -> { - wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); - }); - if (res.size()>0 && iWgdAssocInfoService.saveOrUpdateBatch(res)) { - return res; - }else { - stringBuilder.append("表格数据全部重复"); - } - return res; - } -} +package com.adc.da.slrs.wgdCensusZ.service.impl; + +import com.adc.da.http.Result; +import com.adc.da.slrs.processModel.entity.importExcelDTO; +import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocInfoDao; +import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.poi.hssf.usermodel.HSSFDateUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 协会信息数据统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdAssocInfoServiceImpl extends ServiceImpl implements IWgdAssocInfoService { + + @Autowired + WgdAssocInfoDao wgdAssocInfoDao; + @Autowired + IWgdAssocInfoService iWgdAssocInfoService; + + @Override + public List getAllWgdAssocInfos() { + return wgdAssocInfoDao.selectAll(); + } + + @Override + public List queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo) { + Integer count = wgdAssocInfoDao.getQueryTotal(wgdAssocInfo); + wgdAssocInfo.getPager().setRowCount(count); + return wgdAssocInfoDao.queryAll(wgdAssocInfo); + } + + @Override + public WgdAssocInfo getWgdAssocInfoById(String id) { + return wgdAssocInfoDao.selectById(id); + } + + @Override + public int updateWgdAssocInfo(WgdAssocInfo wgdAssocInfo) { + return wgdAssocInfoDao.updateOne(wgdAssocInfo); + } + + @Override + public int insertWgdAssocInfo(WgdAssocInfo wgdAssocInfo) { + wgdAssocInfo.setId(UUIDUtils.randomUUID(32)); + return wgdAssocInfoDao.insertOne(wgdAssocInfo); + } + + @Override + public int deleteWgdAssocInfo(String id) { + return wgdAssocInfoDao.deleteOne(id); + } + + @Override + public int deleteWgdAssocInfos(String ids) { + String[] str = ids.split(","); + return wgdAssocInfoDao.deleteBatch(str); + } + + @Override + public List delWithWkData(MultipartFile file, StringBuilder stringBuilder) { + List res= ExcelImportUtilByWk.readExcelpublic(WgdAssocInfo.class,file); + if (res != null){ + DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); + int i=1; + for (WgdAssocInfo importExcelDTO: res) { + if (null == importExcelDTO.getScName() || "".equals(importExcelDTO.getScName())){ + stringBuilder.append("第" + i + "行第1列协会名称-标委会填写不符合格式要求请检查；"); + } + if (null == importExcelDTO.getSscName() || "".equals(importExcelDTO.getSscName())){ + stringBuilder.append("第" + i + "行第2列协会名称-分标委填写不符合格式要求请检查；"); + } + if (null == importExcelDTO.getWgName() || "".equals(importExcelDTO.getWgName())){ + stringBuilder.append("第" + i + "行第3列协会名称-工作组填写不符合格式要求请检查；"); + } + if (null == importExcelDTO.getRole() || "".equals(importExcelDTO.getRole())){ + stringBuilder.append("第" + i + "行第4列会员角色填写不符合格式要求请检查；"); + } + if (null == importExcelDTO.getAttend() || "".equals(importExcelDTO.getAttend())){ + stringBuilder.append("第" + i + "行第5列参与人填写不符合格式要求请检查；"); + } + try { + if (null!=importExcelDTO.getIniTime() && !"".equals(importExcelDTO.getIniTime())) { + importExcelDTO.setIniTime(importExcelDTO.getIniTime()); + } + }catch (Exception e){ + stringBuilder.append("第"+i+"行第9列初始入会时间填写不符合格式要求请检查；"); + } + try { + if (null!=importExcelDTO.getCurTime() && !"".equals(importExcelDTO.getCurTime())) { + + importExcelDTO.setCurTime(importExcelDTO.getCurTime()); + } + }catch (Exception e){ + stringBuilder.append("第"+i+"行第10列本届入会时间填写不符合格式要求请检查；"); + } + try { + if (null!=importExcelDTO.getLastPayTime() && !"".equals(importExcelDTO.getLastPayTime())) { + importExcelDTO.setLastPayTime(importExcelDTO.getLastPayTime()); + } + }catch (Exception e){ + stringBuilder.append("第"+i+"行第13列上次缴纳时间填写不符合格式要求请检查；"); + } + i++; + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select(WgdAssocInfo.class, info -> !info.getColumn().equals("id")); + List wgdAssocInfos=iWgdAssocInfoService.list(queryWrapper); + List remove=new ArrayList<>(); + wgdAssocInfos.forEach(WgbWbtj -> { + WgbWbtj.setId(null); + if (res.contains(WgbWbtj)){ + remove.add(WgbWbtj); + } + res.forEach(resOne->{ + if (null == resOne.getScName() || "".equals(resOne.getScName())){ + remove.add(resOne); + } + if (null == resOne.getSscName() || "".equals(resOne.getSscName())){ + remove.add(resOne); + } + if (null == resOne.getWgName() || "".equals(resOne.getWgName())){ + remove.add(resOne); + } + if (null == resOne.getRole() || "".equals(resOne.getRole())){ + remove.add(resOne); + } + if (null == resOne.getAttend() || "".equals(resOne.getAttend())){ + remove.add(resOne); + } + }); + }); + res.removeAll(remove); + res.forEach(wgdAssocInfo -> { + wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); + }); + if (res.size()>0 && iWgdAssocInfoService.saveOrUpdateBatch(res)) { + return res; + }else { + stringBuilder.append("表格数据全部重复"); + } + return res; + }else { + return null; + } + + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java index 52356d83..e1251a7e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java @@ -1,155 +1,160 @@ -package com.adc.da.slrs.wgdCensusZ.service.impl; - -import com.adc.da.http.Result; -import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; -import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; -import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; -import com.adc.da.slrs.wgdCensusZ.dao.WgdCommiInfoDao; -import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService; -import com.adc.da.util.MD5Util; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -/** - *

- * 委员信息数据统计 服务实现类 - *

- * - * @author zcr - * @since 2021-11-12 - */ -@Service -public class WgdCommiInfoServiceImpl extends ServiceImpl implements IWgdCommiInfoService { - - @Autowired - WgdCommiInfoDao wgdCommiInfoDao; - - @Autowired - IWgdCommiInfoService iWgdCommiInfoService; - - @Override - public List getAllWgdCommiInfos() { - return wgdCommiInfoDao.selectAll(); - } - - @Override - public List queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo) { - Integer count = wgdCommiInfoDao.getQueryTotal(wgdCommiInfo); - wgdCommiInfo.getPager().setRowCount(count); - return wgdCommiInfoDao.queryAll(wgdCommiInfo); - } - - @Override - public WgdCommiInfo getWgdCommiInfoById(String id) { - return wgdCommiInfoDao.selectById(id); - } - - @Override - public int updateWgdCommiInfo(WgdCommiInfo wgdCommiInfo) { - wgdCommiInfo.setPassword(MD5Util.convertMD5(wgdCommiInfo.getPassword())); - return wgdCommiInfoDao.updateOne(wgdCommiInfo); - } - - @Override - public int insertWgdCommiInfo(WgdCommiInfo wgdCommiInfo) { - wgdCommiInfo.setId(UUIDUtils.randomUUID(32)); - wgdCommiInfo.setPassword(MD5Util.convertMD5(wgdCommiInfo.getPassword())); - return wgdCommiInfoDao.insertOne(wgdCommiInfo); - } - - @Override - public int deleteWgdCommiInfo(String id) { - return wgdCommiInfoDao.deleteOne(id); - } - - @Override - public int deleteWgdCommiInfos(String ids) { - String[] str = ids.split(","); - return wgdCommiInfoDao.deleteBatch(str); - } - - @Override - public List importCommiInfo(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdCommiInfo.class,file); - DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); - int i=1; - for (WgdCommiInfo wgdCommiInfo: res) { - if (null == wgdCommiInfo.getScName() || "".equals(wgdCommiInfo.getScName())){ - stringBuilder.append("第" + i + "行第2列协会名称-标委会填写不符合格式要求请检查；"); - } - if (null == wgdCommiInfo.getSscName() || "".equals(wgdCommiInfo.getSscName())){ - stringBuilder.append("第" + i + "行第3列协会名称-分标委填写不符合格式要求请检查；"); - } - if (null == wgdCommiInfo.getWgName() || "".equals(wgdCommiInfo.getWgName())){ - stringBuilder.append("第" + i + "行第4列协会名称-工作组填写不符合格式要求请检查；"); - } - if (null == wgdCommiInfo.getRole() || "".equals(wgdCommiInfo.getRole())){ - stringBuilder.append("第" + i + "行第6列会员角色填写不符合格式要求请检查；"); - } - if (null == wgdCommiInfo.getAttend() || "".equals(wgdCommiInfo.getAttend())){ - stringBuilder.append("第" + i + "行第7列参与人填写不符合格式要求请检查；"); - } - if (null == wgdCommiInfo.getTel() || "".equals(wgdCommiInfo.getTel())){ - stringBuilder.append("第" + i + "行第10列参与人填写不符合格式要求请检查；"); - } - try { - if (null!=wgdCommiInfo.getCurTime() && !"".equals(wgdCommiInfo.getCurTime())) { - wgdCommiInfo.setCurTime(wgdCommiInfo.getCurTime()); - } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第5列本届入会时间填写不符合格式要求请检查；"); - } - i++; - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(WgdCommiInfo.class, info -> !info.getColumn().equals("id")); - List wgdCommiInfo=iWgdCommiInfoService.list(queryWrapper); - List remove=new ArrayList<>(); - wgdCommiInfo.forEach(WgbWbtj -> { - WgbWbtj.setId(null); - if (res.contains(WgbWbtj)){ - remove.add(WgbWbtj); - } - res.forEach(resCommiInfo->{ - if (null == resCommiInfo.getScName() || "".equals(resCommiInfo.getScName())){ - remove.add(resCommiInfo); - } - if (null == resCommiInfo.getSscName() || "".equals(resCommiInfo.getSscName())){ - remove.add(resCommiInfo); - } - if (null == resCommiInfo.getWgName() || "".equals(resCommiInfo.getWgName())){ - remove.add(resCommiInfo); - } - if (null == resCommiInfo.getRole() || "".equals(resCommiInfo.getRole())){ - remove.add(resCommiInfo); - } - if (null == resCommiInfo.getAttend() || "".equals(resCommiInfo.getAttend())){ - remove.add(resCommiInfo); - } - if (null == resCommiInfo.getTel() || "".equals(resCommiInfo.getTel())){ - remove.add(resCommiInfo); - } - }); - }); - res.removeAll(remove); - res.forEach(wgdAssocInfo -> { - wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); - }); - if (res.size()>0 && iWgdCommiInfoService.saveOrUpdateBatch(res)) { - return res; - }else { - stringBuilder.append("表格数据全部重复"); - } - return res; - } -} +package com.adc.da.slrs.wgdCensusZ.service.impl; + +import com.adc.da.http.Result; +import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.slrs.wgdCensusZ.dao.WgdCommiInfoDao; +import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService; +import com.adc.da.util.MD5Util; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 委员信息数据统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdCommiInfoServiceImpl extends ServiceImpl implements IWgdCommiInfoService { + + @Autowired + WgdCommiInfoDao wgdCommiInfoDao; + + @Autowired + IWgdCommiInfoService iWgdCommiInfoService; + + @Override + public List getAllWgdCommiInfos() { + return wgdCommiInfoDao.selectAll(); + } + + @Override + public List queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo) { + Integer count = wgdCommiInfoDao.getQueryTotal(wgdCommiInfo); + wgdCommiInfo.getPager().setRowCount(count); + return wgdCommiInfoDao.queryAll(wgdCommiInfo); + } + + @Override + public WgdCommiInfo getWgdCommiInfoById(String id) { + return wgdCommiInfoDao.selectById(id); + } + + @Override + public int updateWgdCommiInfo(WgdCommiInfo wgdCommiInfo) { + wgdCommiInfo.setPassword(MD5Util.convertMD5(wgdCommiInfo.getPassword())); + return wgdCommiInfoDao.updateOne(wgdCommiInfo); + } + + @Override + public int insertWgdCommiInfo(WgdCommiInfo wgdCommiInfo) { + wgdCommiInfo.setId(UUIDUtils.randomUUID(32)); + wgdCommiInfo.setPassword(MD5Util.convertMD5(wgdCommiInfo.getPassword())); + return wgdCommiInfoDao.insertOne(wgdCommiInfo); + } + + @Override + public int deleteWgdCommiInfo(String id) { + return wgdCommiInfoDao.deleteOne(id); + } + + @Override + public int deleteWgdCommiInfos(String ids) { + String[] str = ids.split(","); + return wgdCommiInfoDao.deleteBatch(str); + } + + @Override + public List importCommiInfo(MultipartFile file, StringBuilder stringBuilder) { + List res= ExcelImportUtilByWk.readExcelpublic(WgdCommiInfo.class,file); + if (res != null){ + DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); + int i=1; + for (WgdCommiInfo wgdCommiInfo: res) { + if (null == wgdCommiInfo.getScName() || "".equals(wgdCommiInfo.getScName())){ + stringBuilder.append("第" + i + "行第2列协会名称-标委会填写不符合格式要求请检查；"); + } + if (null == wgdCommiInfo.getSscName() || "".equals(wgdCommiInfo.getSscName())){ + stringBuilder.append("第" + i + "行第3列协会名称-分标委填写不符合格式要求请检查；"); + } + if (null == wgdCommiInfo.getWgName() || "".equals(wgdCommiInfo.getWgName())){ + stringBuilder.append("第" + i + "行第4列协会名称-工作组填写不符合格式要求请检查；"); + } + if (null == wgdCommiInfo.getRole() || "".equals(wgdCommiInfo.getRole())){ + stringBuilder.append("第" + i + "行第6列会员角色填写不符合格式要求请检查；"); + } + if (null == wgdCommiInfo.getAttend() || "".equals(wgdCommiInfo.getAttend())){ + stringBuilder.append("第" + i + "行第7列参与人填写不符合格式要求请检查；"); + } + if (null == wgdCommiInfo.getTel() || "".equals(wgdCommiInfo.getTel())){ + stringBuilder.append("第" + i + "行第10列参与人填写不符合格式要求请检查；"); + } + try { + if (null!=wgdCommiInfo.getCurTime() && !"".equals(wgdCommiInfo.getCurTime())) { + wgdCommiInfo.setCurTime(wgdCommiInfo.getCurTime()); + } + }catch (Exception e){ + stringBuilder.append("第"+i+"行第5列本届入会时间填写不符合格式要求请检查；"); + } + i++; + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select(WgdCommiInfo.class, info -> !info.getColumn().equals("id")); + List wgdCommiInfo=iWgdCommiInfoService.list(queryWrapper); + List remove=new ArrayList<>(); + wgdCommiInfo.forEach(WgbWbtj -> { + WgbWbtj.setId(null); + if (res.contains(WgbWbtj)){ + remove.add(WgbWbtj); + } + res.forEach(resCommiInfo->{ + if (null == resCommiInfo.getScName() || "".equals(resCommiInfo.getScName())){ + remove.add(resCommiInfo); + } + if (null == resCommiInfo.getSscName() || "".equals(resCommiInfo.getSscName())){ + remove.add(resCommiInfo); + } + if (null == resCommiInfo.getWgName() || "".equals(resCommiInfo.getWgName())){ + remove.add(resCommiInfo); + } + if (null == resCommiInfo.getRole() || "".equals(resCommiInfo.getRole())){ + remove.add(resCommiInfo); + } + if (null == resCommiInfo.getAttend() || "".equals(resCommiInfo.getAttend())){ + remove.add(resCommiInfo); + } + if (null == resCommiInfo.getTel() || "".equals(resCommiInfo.getTel())){ + remove.add(resCommiInfo); + } + }); + }); + res.removeAll(remove); + res.forEach(wgdAssocInfo -> { + wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); + }); + if (res.size()>0 && iWgdCommiInfoService.saveOrUpdateBatch(res)) { + return res; + }else { + stringBuilder.append("表格数据全部重复"); + } + return res; + }else { + return null; + } + + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java index 3af7db42..28f45ddf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java @@ -1,102 +1,106 @@ -package com.adc.da.slrs.wgdCensusZ.service.impl; - -import com.adc.da.http.Result; -import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; -import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; -import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; -import com.adc.da.slrs.wgdCensusZ.dao.WgdExReviseCostDao; -import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -/** - *

- * 参与外部标准制修订费用统计 服务实现类 - *

- * - * @author zcr - * @since 2021-11-12 - */ -@Service -public class WgdExReviseCostServiceImpl extends ServiceImpl implements IWgdExReviseCostService { - - @Autowired - WgdExReviseCostDao wgdExReviseCostDao; - - @Autowired - IWgdExReviseCostService iWgdExReviseCostService; - - @Override - public List getAllWgdExReviseCosts() { - return wgdExReviseCostDao.selectAll(); - } - - @Override - public List queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost) { - Integer count = wgdExReviseCostDao.getQueryTotal(wgdExReviseCost); - wgdExReviseCost.getPager().setRowCount(count); - return wgdExReviseCostDao.queryAll(wgdExReviseCost); - } - - @Override - public WgdExReviseCost getWgdExReviseCostById(String id) { - return wgdExReviseCostDao.selectById(id); - } - - @Override - public int updateWgdExReviseCost(WgdExReviseCost wgdExReviseCost) { - return wgdExReviseCostDao.updateOne(wgdExReviseCost); - } - - @Override - public int insertWgdExReviseCost(WgdExReviseCost wgdExReviseCost) { - wgdExReviseCost.setId(UUIDUtils.randomUUID(32)); - return wgdExReviseCostDao.insertOne(wgdExReviseCost); - } - - @Override - public int deleteWgdExReviseCost(String id) { - return wgdExReviseCostDao.deleteOne(id); - } - - @Override - public int deleteWgdExReviseCosts(String ids) { - String[] str = ids.split(","); - return wgdExReviseCostDao.deleteBatch(str); - } - - @Override - public List importExReviseCost(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdExReviseCost.class,file); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(WgdExReviseCost.class, info -> !info.getColumn().equals("id")); - List wgdExReviseCost=iWgdExReviseCostService.list(queryWrapper); - List remove=new ArrayList<>(); - wgdExReviseCost.forEach(WgbWbtj -> { - WgbWbtj.setId(null); - if (res.contains(WgbWbtj)){ - remove.add(WgbWbtj); - } - - }); - res.removeAll(remove); - res.forEach(wgdAssocInfo -> { - wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); - }); - if (res.size()>0 && iWgdExReviseCostService.saveOrUpdateBatch(res)) { - return res; - }else { - stringBuilder.append("表格数据全部重复"); - } - return res; - } -} +package com.adc.da.slrs.wgdCensusZ.service.impl; + +import com.adc.da.http.Result; +import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; +import com.adc.da.slrs.wgdCensusZ.dao.WgdExReviseCostDao; +import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 参与外部标准制修订费用统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdExReviseCostServiceImpl extends ServiceImpl implements IWgdExReviseCostService { + + @Autowired + WgdExReviseCostDao wgdExReviseCostDao; + + @Autowired + IWgdExReviseCostService iWgdExReviseCostService; + + @Override + public List getAllWgdExReviseCosts() { + return wgdExReviseCostDao.selectAll(); + } + + @Override + public List queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost) { + Integer count = wgdExReviseCostDao.getQueryTotal(wgdExReviseCost); + wgdExReviseCost.getPager().setRowCount(count); + return wgdExReviseCostDao.queryAll(wgdExReviseCost); + } + + @Override + public WgdExReviseCost getWgdExReviseCostById(String id) { + return wgdExReviseCostDao.selectById(id); + } + + @Override + public int updateWgdExReviseCost(WgdExReviseCost wgdExReviseCost) { + return wgdExReviseCostDao.updateOne(wgdExReviseCost); + } + + @Override + public int insertWgdExReviseCost(WgdExReviseCost wgdExReviseCost) { + wgdExReviseCost.setId(UUIDUtils.randomUUID(32)); + return wgdExReviseCostDao.insertOne(wgdExReviseCost); + } + + @Override + public int deleteWgdExReviseCost(String id) { + return wgdExReviseCostDao.deleteOne(id); + } + + @Override + public int deleteWgdExReviseCosts(String ids) { + String[] str = ids.split(","); + return wgdExReviseCostDao.deleteBatch(str); + } + + @Override + public List importExReviseCost(MultipartFile file, StringBuilder stringBuilder) { + List res= ExcelImportUtilByWk.readExcelpublic(WgdExReviseCost.class,file); + if (res != null){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select(WgdExReviseCost.class, info -> !info.getColumn().equals("id")); + List wgdExReviseCost=iWgdExReviseCostService.list(queryWrapper); + List remove=new ArrayList<>(); + wgdExReviseCost.forEach(WgbWbtj -> { + WgbWbtj.setId(null); + if (res.contains(WgbWbtj)){ + remove.add(WgbWbtj); + } + + }); + res.removeAll(remove); + res.forEach(wgdAssocInfo -> { + wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); + }); + if (res.size()>0 && iWgdExReviseCostService.saveOrUpdateBatch(res)) { + return res; + }else { + stringBuilder.append("表格数据全部重复"); + } + return res; + }else { + return null; + } + + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java index c0ad73d0..90f4364f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java @@ -1,115 +1,120 @@ -package com.adc.da.slrs.wgdCensusZ.service.impl; - -import com.adc.da.http.Result; -import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; -import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; -import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; -import com.adc.da.slrs.wgdCensusZ.dao.WgdMeetCostDao; -import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -/** - *

- * 参会费用信息统计 服务实现类 - *

- * - * @author zcr - * @since 2021-11-12 - */ -@Service -public class WgdMeetCostServiceImpl extends ServiceImpl implements IWgdMeetCostService { - - @Autowired - WgdMeetCostDao wgdMeetCostDao; - - @Autowired - IWgdMeetCostService iWgdMeetCostService; - - @Override - public List getAllWgdMeetCosts() { - return wgdMeetCostDao.selectAll(); - } - - @Override - public List queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost) { - Integer count = wgdMeetCostDao.getQueryTotal(wgdMeetCost); - wgdMeetCost.getPager().setRowCount(count); - return wgdMeetCostDao.queryAll(wgdMeetCost); - } - - @Override - public WgdMeetCost getWgdMeetCostById(String id) { - return wgdMeetCostDao.selectById(id); - } - - @Override - public int updateWgdMeetCost(WgdMeetCost wgdMeetCost) { - return wgdMeetCostDao.updateOne(wgdMeetCost); - } - - @Override - public int insertWgdMeetCost(WgdMeetCost wgdMeetCost) { - wgdMeetCost.setId(UUIDUtils.randomUUID(32)); - return wgdMeetCostDao.insertOne(wgdMeetCost); - } - - @Override - public int deleteWgdMeetCost(String id) { - return wgdMeetCostDao.deleteOne(id); - } - - @Override - public int deleteWgdMeetCosts(String ids) { - String[] str = ids.split(","); - return wgdMeetCostDao.deleteBatch(str); - } - - @Override - public List importMeetCost(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdMeetCost.class,file); - DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); - int i=1; - for (WgdMeetCost wgdCommiInfo: res) { - try { - if (null!=wgdCommiInfo.getMeetTime() && !"".equals(wgdCommiInfo.getMeetTime())) { - wgdCommiInfo.setMeetTime(wgdCommiInfo.getMeetTime()); - } - }catch (Exception e){ - stringBuilder.append("第"+i+"行第3列本届会议时间填写不符合格式要求请检查；"); - } - i++; - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(WgdMeetCost.class, info -> !info.getColumn().equals("id")); - List wgdMeetCost=iWgdMeetCostService.list(queryWrapper); - List remove=new ArrayList<>(); - wgdMeetCost.forEach(WgbWbtj -> { - WgbWbtj.setId(null); - if (res.contains(WgbWbtj)){ - remove.add(WgbWbtj); - } - - }); - res.removeAll(remove); - res.forEach(wgdAssocInfo -> { - wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); - }); - if (res.size()>0 && iWgdMeetCostService.saveOrUpdateBatch(res)) { - return res; - }else { - stringBuilder.append("表格数据全部重复"); - } - return res; - } -} +package com.adc.da.slrs.wgdCensusZ.service.impl; + +import com.adc.da.http.Result; +import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; +import com.adc.da.slrs.wgdCensusZ.dao.WgdMeetCostDao; +import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 参会费用信息统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdMeetCostServiceImpl extends ServiceImpl implements IWgdMeetCostService { + + @Autowired + WgdMeetCostDao wgdMeetCostDao; + + @Autowired + IWgdMeetCostService iWgdMeetCostService; + + @Override + public List getAllWgdMeetCosts() { + return wgdMeetCostDao.selectAll(); + } + + @Override + public List queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost) { + Integer count = wgdMeetCostDao.getQueryTotal(wgdMeetCost); + wgdMeetCost.getPager().setRowCount(count); + return wgdMeetCostDao.queryAll(wgdMeetCost); + } + + @Override + public WgdMeetCost getWgdMeetCostById(String id) { + return wgdMeetCostDao.selectById(id); + } + + @Override + public int updateWgdMeetCost(WgdMeetCost wgdMeetCost) { + return wgdMeetCostDao.updateOne(wgdMeetCost); + } + + @Override + public int insertWgdMeetCost(WgdMeetCost wgdMeetCost) { + wgdMeetCost.setId(UUIDUtils.randomUUID(32)); + return wgdMeetCostDao.insertOne(wgdMeetCost); + } + + @Override + public int deleteWgdMeetCost(String id) { + return wgdMeetCostDao.deleteOne(id); + } + + @Override + public int deleteWgdMeetCosts(String ids) { + String[] str = ids.split(","); + return wgdMeetCostDao.deleteBatch(str); + } + + @Override + public List importMeetCost(MultipartFile file, StringBuilder stringBuilder) { + List res= ExcelImportUtilByWk.readExcelpublic(WgdMeetCost.class,file); + if (res != null){ + DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); + int i=1; + for (WgdMeetCost wgdCommiInfo: res) { + try { + if (null!=wgdCommiInfo.getMeetTime() && !"".equals(wgdCommiInfo.getMeetTime())) { + wgdCommiInfo.setMeetTime(wgdCommiInfo.getMeetTime()); + } + }catch (Exception e){ + stringBuilder.append("第"+i+"行第3列本届会议时间填写不符合格式要求请检查；"); + } + i++; + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select(WgdMeetCost.class, info -> !info.getColumn().equals("id")); + List wgdMeetCost=iWgdMeetCostService.list(queryWrapper); + List remove=new ArrayList<>(); + wgdMeetCost.forEach(WgbWbtj -> { + WgbWbtj.setId(null); + if (res.contains(WgbWbtj)){ + remove.add(WgbWbtj); + } + + }); + res.removeAll(remove); + res.forEach(wgdAssocInfo -> { + wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); + }); + if (res.size()>0 && iWgdMeetCostService.saveOrUpdateBatch(res)) { + return res; + }else { + stringBuilder.append("表格数据全部重复"); + } + return res; + }else { + return null; + } + + } +} From 7067c45637d8534316243e731195fdc2ffcda277 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 24 Mar 2022 09:56:27 +0800 Subject: [PATCH 06/64] feat: There is no way the, BUG #51976 --- .../SarBussionessStandStateMapper.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml index acd38f45..dd40bfbd 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml @@ -38,13 +38,13 @@ and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') - and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + and DATE_FORMAT(ISSUE_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') - and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') >= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') + and DATE_FORMAT(ISSUE_TIME,'%Y-%m-%d') >= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') - and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + and DATE_FORMAT(ISSUE_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') @@ -64,13 +64,13 @@ and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') - and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + and DATE_FORMAT(ISSUE_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') - and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') >= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') + and DATE_FORMAT(ISSUE_TIME,'%Y-%m-%d') >= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') - and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + and DATE_FORMAT(ISSUE_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') From 0e3a67204d3cfed94f2faf436d63be4c651cf0c3 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 24 Mar 2022 16:40:59 +0800 Subject: [PATCH 07/64] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E7=9B=B4=E6=8E=A5=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=B8=A6=E5=85=A5=E6=95=B0=E6=8D=AE=E7=9A=84=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E9=A1=B9=20--=E5=BD=92=E6=A1=A3=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandardsInfoController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 4282d025..9ec7375e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -604,7 +604,12 @@ public class SarStandardsInfoController extends BaseController public ResponseMessage> getStandMenuId(SarStandMenu getStandId){ List sarStandMenus = sarStandMenuDao.getMenuByStandId(getStandId); - + //直接对回显数据进行处理 最好的解决方式是找到数据进入的地方进行修改 + for (int i=sarStandMenus.size()-1;i>=0;i--){ + if (null!=sarStandMenus.get(i) && null==sarStandMenus.get(i).getMenuName() ){ + sarStandMenus.remove(i); + } + } return Result.success(sarStandMenus); } From 309b59405c9b98dc6823745950ea03e57f553143 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 24 Mar 2022 18:21:29 +0800 Subject: [PATCH 08/64] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 3 +- .../dao/SarBussionessStandDao.java | 3 +- .../entity/SarBussionessStand.java | 6 + .../entity/SarBussionessStandExport.java | 608 ++++++++++++++++++ .../service/ISarBussionessStandService.java | 3 +- .../impl/SarBussionessStandServiceImpl.java | 187 +++++- .../entity/SarBussionessStandEOPage.java | 19 + .../da/utils/util/BussStandExportUtil.java | 15 +- .../SarBussionessStandMapper.xml | 33 +- 9 files changed, 852 insertions(+), 25 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStandExport.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index ccd01652..b6c1068f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -5,6 +5,7 @@ import com.adc.da.Log.BusinessType; import com.adc.da.Log.EpcLog; import com.adc.da.common.ReadExcel; import com.adc.da.person.service.IPersonCollectEOService; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; @@ -119,7 +120,7 @@ public class SarBussionessStandController extends BaseController datas = sarBussionessStandEOService.getSarBussionessStand(exportType,exportContent,userId); + List datas = sarBussionessStandEOService.getSarBussionessStand(exportType,exportContent,userId); workbook = BussStandExportUtil.exportDatas(datas); os = response.getOutputStream(); workbook.write(os); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index ed976a3f..46b2d23e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarBussionessStand.dao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.sys.entity.UserEO; @@ -45,7 +46,7 @@ public interface SarBussionessStandDao extends BaseMapper { int getBussionessStandInfoCountByRole(SarBussionessStandEOPage page); - List getSarBussionessStand(SarBussionessStandEOPage page); + List getSarBussionessStand(SarBussionessStandEOPage page); //liwenxuan:标准法规更新数量及清单:企业标准 Integer selectBussionessStandardsCount(Date visitTime); //liwenxuan:标准法规更新数量及清单:企业标准All diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index de095653..04c7a514 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -130,6 +130,12 @@ public class SarBussionessStand extends BaseEntity { @TableField(exist = false) private String DTQBBHBUSS; + /** + * 代替企标标准号 + */ + @TableField(exist = false) + private String BDTQBBHBUSS; + @TableField(exist = false) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private String firstPutTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStandExport.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStandExport.java new file mode 100644 index 00000000..248b9d07 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStandExport.java @@ -0,0 +1,608 @@ +package com.adc.da.slrs.sarBussionessStand.entity; + +import com.adc.da.att.vo.AttFileVo; +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.*; + +/** + *

+ * 企业标准信息表 + *

+ * + * @author super_liu + * @since 2021-07-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarBussionessStand对象", description="企业标准信息表") +public class SarBussionessStandExport extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + @ApiModelProperty(value = "企标标准号") + @TableField("STAND_CODE") + private String standCode; + + @ApiModelProperty(value = "标准编号") + @TableField("STAND_NUMBER") + private String standNumber; + + @ApiModelProperty(value = "标准名称") + @TableField("STAND_NAME") + private String standName; + + @ApiModelProperty(value = "标准英文名称") + @TableField("STAND_EN_NAME") + private String standEnName; + + @ApiModelProperty(value = "发布日期") + @TableField("ISSUE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String issueTime; + + @ApiModelProperty(value = "实施日期") + @TableField("PUT_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String putTime; + + @ApiModelProperty(value = "代替标准号") + @TableField("REPLACE_STAND_NUM") + private String replaceStandNum; + + @ApiModelProperty(value = "被代替标准号") + @TableField("REPLACED_STAND_NUM") + private String replacedStandNum; + + @ApiModelProperty(value = "标准状态") + @TableField("STAND_STATUS") + private String standStatus; + + @ApiModelProperty(value = "适用国家/地区") + @TableField("APPLY_COUNTRY") + private String applyCountry; + + @ApiModelProperty(value = "标准性质") + @TableField("STAND_NATURE") + private String standNature; + + @ApiModelProperty(value = "标准类别") + @TableField("STAND_SORT") + private String standSort; + + @ApiModelProperty(value = "标准年份") + @TableField("STAND_YEAR") + private String standYear; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private Integer validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + // 新添加字段 + @ApiModelProperty(value = "文本状态") + @TableField("TEXT_STATUS_BUSS") + private String textStatusBuss; + + @ApiModelProperty(value = "计划库制定状态 0 默认 1 制定 2修订") + @TableField("REVISE_STATUS") + private String reviseStatus; + + @ApiModelProperty(value = "标准顺序号") + @TableField("STAND_SN") + private String standSn; + + + // 非表字段 + @TableField(exist = false) + private String newStandSn; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String firstPutTime; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String putTimeShow; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String issueTimeShow; + + @TableField(exist = false) + private String issueTimeStr; + + @TableField(exist = false) + private String putTimeStr; + + @TableField(exist = false) + private String processNum;//流程编号 + + //目录ID 非标准信息表中的字段 + @TableField(exist = false) + private String menuId; + + @TableField(exist = false) + private String menuParentId; + + @TableField(exist = false) + private String textStatusBussShow; + + @TableField(exist = false) + private String standStatusShow; // 标准状态下拉框 --单选 + + @TableField(exist = false) + private String standNatrueShow; + + @TableField(exist = false) + private String standSortShow; + + @TableField(exist = false) + private String applyCountryShow; + + @TableField(exist = false) + private List standFileList = new ArrayList(); + + @TableField(exist = false) + private List opinionFilesList = new ArrayList(); + + @TableField(exist = false) + private List relevanceFileList = new ArrayList(); + + @TableField(exist = false) + private String collectId; + + //文件的类型 + @TableField(exist = false) + private String standFileClassify; + + //文件的下载id + @TableField(exist = false) + private String attId; + + //记录是否修改了替代文件号 + @TableField(exist = false) + private int upReplaceNumFlag; + //记录是否修改了文件号 + @TableField(exist = false) + private int upNumFlag; + // 数据库新加的字段 + + @TableField(exist = false) + private String remark;//备注 + + @TableField(exist = false) + private Map attrInfoMap = new LinkedHashMap<>(); //属性表字段与值 + + @TableField(exist = false) + private Map attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染 + + @TableField(exist = false) + private Map attrInfoProcessMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染 + + @TableField(exist = false) + private String sarStandAttrEOStr; //新增修改时属性表信息 + + @TableField(exist = false) + private String fileIds; //全部文件ID + + @TableField(exist = false) + private List attrInfoList = new ArrayList<>(); + + /** + * 新增条件字段 + * @return + */ + @TableField(exist = false) + private String reviewTime; + @TableField(exist = false) + private String issueTimeStart; + @TableField(exist = false) + private String issueTimeEnd; + @TableField(exist = false) + private String prcCreateUser; + + private String FZRQBUSS; + private String FSRQBUSS; + private String FBGBUSS; + private String BZSMBUSS; + private String LSBBBUSS; + private String QTWJBUSS; + private String QCDW; + private String QCRBUSS; + private String WJSCRYBUSS; + private String SYCXCLASS; + private String NYLXCLASS; + private String SYCPXCLASS; + private String TXLBBUSS; + private String VPPSBMBUSS; + private String VPPSCNBUSS; + private String DTQBBHBUSS; + private String BDTQBBHBUSS; + private String XGJLBUSS; + private String XGLC; + private String GLWJBUSS; + private String XCSJBUSS; + private String LLCS; + private String CS; + private String CYCVPPSBMBUSS; + private String CYCVPPSCNBUSS; + private String KCVPPSBMBUSS; + private String KCVPPSCNBUSS; + private String DYBXHBUSS; + private String DYMCBUSS; + private String YYBZ; + private String CBCD; + private String CYCD; + private String CYBZ; + private String BARQ; + private String XGD; + private String CSZD; + private String CDZD; + private String CYCDYBXHBUSS; + private String CYCDYMCBUSS; + + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getStandCode() { + return standCode; + } + + public void setStandCode(String standCode) { + this.standCode = standCode; + } + + public String getStandName() { + return standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String getStandEnName() { + return standEnName; + } + + public void setStandEnName(String standEnName) { + this.standEnName = standEnName; + } + + public String getIssueTime() { + return issueTime; + } + + public void setIssueTime(String issueTime) { + this.issueTime = issueTime; + } + + public String getPutTime() { + return putTime; + } + + public void setPutTime(String putTime) { + this.putTime = putTime; + } + + public String getReplaceStandNum() { + return replaceStandNum; + } + + public void setReplaceStandNum(String replaceStandNum) { + this.replaceStandNum = replaceStandNum; + } + + public String getReplacedStandNum() { + return replacedStandNum; + } + + public void setReplacedStandNum(String replacedStandNum) { + this.replacedStandNum = replacedStandNum; + } + + public String getStandStatus() { + return standStatus; + } + + public void setStandStatus(String standStatus) { + this.standStatus = standStatus; + } + + public String getApplyCountry() { + return applyCountry; + } + + public void setApplyCountry(String applyCountry) { + this.applyCountry = applyCountry; + } + + public String getStandNature() { + return standNature; + } + + public void setStandNature(String standNature) { + this.standNature = standNature; + } + + public String getStandSort() { + return standSort; + } + + public void setStandSort(String standSort) { + this.standSort = standSort; + } + + public String getStandYear() { + return standYear; + } + + public void setStandYear(String standYear) { + this.standYear = standYear; + } + + public Integer getValidFlag() { + return validFlag; + } + + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + public Date getCreationTime() { + return creationTime; + } + + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public String getTextStatusBuss() { + return textStatusBuss; + } + + public void setTextStatusBuss(String textStatusBuss) { + this.textStatusBuss = textStatusBuss; + } + + public String getFirstPutTime() { + return firstPutTime; + } + + public void setFirstPutTime(String firstPutTime) { + this.firstPutTime = firstPutTime; + } + + public String getPutTimeShow() { + return putTimeShow; + } + + public void setPutTimeShow(String putTimeShow) { + this.putTimeShow = putTimeShow; + } + + public String getIssueTimeShow() { + return issueTimeShow; + } + + public void setIssueTimeShow(String issueTimeShow) { + this.issueTimeShow = issueTimeShow; + } + + public String getIssueTimeStr() { + return issueTimeStr; + } + + public void setIssueTimeStr(String issueTimeStr) { + this.issueTimeStr = issueTimeStr; + } + + public String getPutTimeStr() { + return putTimeStr; + } + + public void setPutTimeStr(String putTimeStr) { + this.putTimeStr = putTimeStr; + } + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String getMenuParentId() { + return menuParentId; + } + + public void setMenuParentId(String menuParentId) { + this.menuParentId = menuParentId; + } + + public String getStandStatusShow() { + return standStatusShow; + } + + public void setStandStatusShow(String standStatusShow) { + this.standStatusShow = standStatusShow; + } + + public String getStandNatrueShow() { + return standNatrueShow; + } + + public void setStandNatrueShow(String standNatrueShow) { + this.standNatrueShow = standNatrueShow; + } + + public String getStandSortShow() { + return standSortShow; + } + + public void setStandSortShow(String standSortShow) { + this.standSortShow = standSortShow; + } + + public String getApplyCountryShow() { + return applyCountryShow; + } + + public void setApplyCountryShow(String applyCountryShow) { + this.applyCountryShow = applyCountryShow; + } + + public List getStandFileList() { + return standFileList; + } + + public void setStandFileList(List standFileList) { + this.standFileList = standFileList; + } + + public List getOpinionFilesList() { + return opinionFilesList; + } + + public void setOpinionFilesList(List opinionFilesList) { + this.opinionFilesList = opinionFilesList; + } + + public List getRelevanceFileList() { + return relevanceFileList; + } + + public void setRelevanceFileList(List relevanceFileList) { + this.relevanceFileList = relevanceFileList; + } + + public String getCollectId() { + return collectId; + } + + public void setCollectId(String collectId) { + this.collectId = collectId; + } + + public String getStandFileClassify() { + return standFileClassify; + } + + public void setStandFileClassify(String standFileClassify) { + this.standFileClassify = standFileClassify; + } + + public String getAttId() { + return attId; + } + + public void setAttId(String attId) { + this.attId = attId; + } + + public int getUpReplaceNumFlag() { + return upReplaceNumFlag; + } + + public void setUpReplaceNumFlag(int upReplaceNumFlag) { + this.upReplaceNumFlag = upReplaceNumFlag; + } + + public int getUpNumFlag() { + return upNumFlag; + } + + public void setUpNumFlag(int upNumFlag) { + this.upNumFlag = upNumFlag; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Map getAttrInfoMap() { + return attrInfoMap; + } + + public void setAttrInfoMap(Map attrInfoMap) { + this.attrInfoMap = attrInfoMap; + } + + public Map getAttrInfoCaseMap() { + return attrInfoCaseMap; + } + + public void setAttrInfoCaseMap(Map attrInfoCaseMap) { + this.attrInfoCaseMap = attrInfoCaseMap; + } + + public String getSarStandAttrEOStr() { + return sarStandAttrEOStr; + } + + public void setSarStandAttrEOStr(String sarStandAttrEOStr) { + this.sarStandAttrEOStr = sarStandAttrEOStr; + } + + public String getFileIds() { + return fileIds; + } + + public void setFileIds(String fileIds) { + this.fileIds = fileIds; + } + + public List getAttrInfoList() { + return attrInfoList; + } + + public void setAttrInfoList(List attrInfoList) { + this.attrInfoList = attrInfoList; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index bcff6aee..eafda7a5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarBussionessStand.service; import com.adc.da.http.ResponseMessage; import com.adc.da.search.entity.SarBussionessStandEO; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -24,7 +25,7 @@ public interface ISarBussionessStandService extends IService ResponseMessage deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception; - List getSarBussionessStand(String exportType, String exportContent,String userId) throws Exception; + List getSarBussionessStand(String exportType, String exportContent, String userId) throws Exception; SarBussionessStand updateSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 1215f68f..22784202 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarBussionessStand.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.common.ConvertMqEO; @@ -14,6 +15,7 @@ import com.adc.da.person.dao.PersonCollectEODao; import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.person.page.PersonCollectEOPage; import com.adc.da.person.service.IPersonCollectEOService; +import com.adc.da.search.entity.SarBussionessStandEO; import com.adc.da.search.entity.StandLawsEO; import com.adc.da.search.service.StandLawsSearchService; import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao; @@ -29,6 +31,7 @@ import com.adc.da.slrs.sarBussStandVal.dao.SarBussStandValDao; import com.adc.da.slrs.sarBussStandVal.entity.SarBussStandVal; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; @@ -52,6 +55,7 @@ import com.adc.da.utils.util.SarAdvanceSearchUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang.StringUtils; import org.json.JSONTokener; import org.slf4j.Logger; @@ -246,7 +250,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl getSarBussionessStand(String exportType, String exportContent,String userId) throws Exception { + public List getSarBussionessStand(String exportType, String exportContent, String userId) throws Exception { SarBussionessStandEOPage page = new SarBussionessStandEOPage(); if ("apart".equals(exportType)) { page.setIdlist(exportContent.split(",")); @@ -321,7 +325,39 @@ public class SarBussionessStandServiceImpl extends ServiceImpl getList = sarBussionessStandEODao.getSarBussionessStand(page); + String fieldInfo = InitStandAttrUtil.queryFieldBuss; + + List list = Arrays.asList(fieldInfo.split(",")).stream().map(s -> String.format("SAR_BUSS_STAND_ATTR_INFO."+s.trim())).collect(Collectors.toList()); + List listSelect = Arrays.asList(fieldInfo.split(",")).stream().map(s -> String.format("tmp_tb."+s.trim())).collect(Collectors.toList()); + String exportAllAttrInfo = list.stream().collect(Collectors.joining(",")); + String exportAllResult = listSelect.stream().collect(Collectors.joining(",")); + if(StringUtils.isNotBlank(exportAllAttrInfo)){ + page.setExportAllAttrInfo(exportAllAttrInfo); + } + + if(StringUtils.isNotBlank(exportAllResult)){ + page.setExportAllResult(exportAllResult); + } + + //配置列表显示的数据权限 + if ("1".equals(page.getIsKU())) { + List access = tsUserService.getResourceDataUserId(page.getUserId()); + if (null == page.getMenuId() && null == page.getMenuAllChildrenIdList()) { + page.setMenuAllChildrenIdList(access); + page.setMenuId(""); + } else if (page.getMenuId().equals("3")) { + page.setMenuAllChildrenIdList(access); + } + List finalData = page.getMenuAllChildrenIdList().stream().filter(s -> access.contains(s)).collect(Collectors.toList()); + if (finalData.size() > 0) { + page.setMenuAllChildrenIdList(finalData); + if (null == page.getMenuId() && null == page.getMenuAllChildrenIdList()) { + page.setMenuAllChildrenIdList(access); + } + } + } + + List getList = sarBussionessStandEODao.getSarBussionessStand(page); attrInfoShowExport(getList); return getList; } @@ -405,7 +441,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarlist) throws Exception { + public void attrInfoShowExport (List sarlist) throws Exception { //查询字典表,形成Hash映射提升速度 List dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); @@ -413,7 +449,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl !item.getDicTypeCode().isEmpty()) .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2)); - for(SarBussionessStand row : sarlist){ + for(SarBussionessStandExport row : sarlist){ attrInfoDetailsExport(row); Map getAttrMap = row.getAttrInfoMap(); Map getNewMap = new LinkedHashMap<>(); @@ -507,10 +543,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 0) { + // 主要逻辑处理新增的 + String nowEOrepNums[] = newCiteStand.split(","); + for (String citeStand : nowEOrepNums) { + sarStandardsSelectEO.setStandNumber(citeStand); +// if (StringUtils.isNotBlank(sarStandardsSelectEO.getStandNumber())) { +// String sort = ""; +// if (sarStandardsSelectEO.getStandNumber().length() > 3) { +// sort = sarStandardsSelectEO.getStandNumber().substring(0, 3); +// } +// if ("ECE".equals(sort)) { +// int length = sarStandardsSelectEO.getStandNumber().length(); +// String number = sarStandardsSelectEO.getStandNumber().substring(3, length); +// sarStandardsSelectEO.setStandNumber("UN(ECE)" + number); +// } +// } + List result = this.baseMapper.selectStandardsByStandnumber(sarStandardsSelectEO); + if (result != null && result.size() > 0) { + String standId = result.get(0).getId(); + String field = beUpedField; + String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId()); + String changeCitedStand = ""; + if (org.apache.commons.lang3.StringUtils.isNotBlank(citedStand)) { + String[] beforeReplacedStandNumStr = citedStand.split(","); + if (Arrays.asList(beforeReplacedStandNumStr).contains(addStrandNumber)) { + continue; + } else { + changeCitedStand = citedStand + "," + addStrandNumber; + } + } else { + changeCitedStand = addStrandNumber; + } + sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand); + } + } + // 如果id不为空，说明是修改，有逻辑删除的执行以下语句,存在之前是三项，现在修改成两项的情况 + if (null != beforeSarStandardsInfo) { + String oldCiteStand = String.valueOf(beforeSarStandardsInfo.getAttrInfoMap().get(upField)); + if (org.apache.commons.lang3.StringUtils.isNotEmpty(oldCiteStand)) { + String[] beforeEOrepNums = oldCiteStand.split(","); + for (String beforeStr : beforeEOrepNums) { + // 如果再旧的中包含，在新的中没有，需要删除 + if (!Arrays.asList(nowEOrepNums).contains(beforeStr)) { + sarStandardsSelectEO.setStandNumber(beforeStr); + List result = this.baseMapper.selectStandardsByStandnumber(sarStandardsSelectEO); + if (result != null && result.size() > 0) { + String standId = result.get(0).getId(); + String field = beUpedField; + String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId()); + String changeCitedStand = ""; + if (org.apache.commons.lang3.StringUtils.isNotBlank(citedStand)) { + String[] beforerepalced = citedStand.split(","); + ArrayList beforlist = new ArrayList<>(Arrays.asList(beforerepalced)); + if (beforlist.contains(beforeStrandNumber)) { + beforlist.remove(beforeStrandNumber); + changeCitedStand = org.apache.commons.lang3.StringUtils.join(beforlist.toArray(), ","); + } else { + continue; + } + sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand); + } + } + } + } + } + } + + } else { + // 如果为空，判断是否为修改 + if (null != beforeSarStandardsInfo) { + String oldCiteStand = String.valueOf(beforeSarStandardsInfo.getAttrInfoMap().get("YYBJ")); + if (org.apache.commons.lang3.StringUtils.isNotEmpty(oldCiteStand)) { + String[] beforeEOrepNums = oldCiteStand.split(","); + for (String beforeStr : beforeEOrepNums) { + // 如果再旧的中包含，在新的中没有，需要删除,相关数据取第一条是因为标准号是唯一的 + sarStandardsSelectEO.setStandNumber(beforeStr); + List result = this.baseMapper.selectStandardsByStandnumber(sarStandardsSelectEO); + if (result != null && result.size() > 0) { + String standId = result.get(0).getId(); + String field = "BYYBJ"; + String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId()); + String changeCitedStand = ""; + if (org.apache.commons.lang3.StringUtils.isNotBlank(citedStand)) { + String[] beforerepalced = citedStand.split(","); + ArrayList beforlist = new ArrayList<>(Arrays.asList(beforerepalced)); + if (beforlist.contains(beforeStrandNumber)) { + beforlist.remove(beforeStrandNumber); + changeCitedStand = org.apache.commons.lang3.StringUtils.join(beforlist.toArray(), ","); + } else { + continue; + } + sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand); + } + } + } + } + } + } + } + public void updateCollectAndShare(SarBussionessStand sarBussionessStandEO) throws Exception { //修改收藏表中 String number = sarBussionessStandEO.getStandCode()+ "）"; @@ -1347,11 +1510,14 @@ public class SarBussionessStandServiceImpl extends ServiceImpl getAttrMap = sarBussStandAttrInfoEODao.selectStandFieldAndData(fieldInfo,row.getId()); + List list = Arrays.asList(fieldInfo.split(",")).stream().map(s -> String.format(s.trim())).collect(Collectors.toList()); + + Map getAttrMap = BeanUtils.describe(row); + if (InitStandAttrUtil.clobFieldListBuss != null && !InitStandAttrUtil.clobFieldListBuss.isEmpty()) { // 遍历修改所有clob类型的值 for (String clobField : InitStandAttrUtil.clobFieldListBuss) { @@ -1365,6 +1531,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl entry : getAttrMap.entrySet()) { String name = entry.getKey(); + List filterList = list.stream().filter(a -> name.equals(a)).collect(Collectors.toList()); + if(filterList.isEmpty()){ + newMap.remove(name); + continue; + } Object value1 = entry.getValue(); if (value1 != null && value1.toString().equals("\"null\"")){ entry.setValue(""); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java index 2b80fa82..66498889 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -170,6 +170,25 @@ public class SarBussionessStandEOPage extends BasePage { private String CYBZ; private String isKU; + private String exportAllAttrInfo; + private String exportAllResult; + + public String getExportAllResult() { + return exportAllResult; + } + + public void setExportAllResult(String exportAllResult) { + this.exportAllResult = exportAllResult; + } + + public String getExportAllAttrInfo() { + return exportAllAttrInfo; + } + + public void setExportAllAttrInfo(String exportAllAttrInfo) { + this.exportAllAttrInfo = exportAllAttrInfo; + } + public String getIsKU() { return isKU; } 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 d820d66e..d1b38317 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 @@ -1,6 +1,7 @@ package com.adc.da.utils.util; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails; import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.usermodel.*; @@ -24,7 +25,7 @@ public class BussStandExportUtil { private static final Logger logger = LoggerFactory.getLogger(BussStandExportUtil.class); - public static Workbook exportDatas (List datas) { + public static Workbook exportDatas (List datas) { Workbook workbook = new XSSFWorkbook(); try { StringBuilder attrBud = new StringBuilder(); @@ -62,13 +63,13 @@ public class BussStandExportUtil { } } - public static void createDatas(Workbook workbook,Sheet sheet,List datas, + public static void createDatas(Workbook workbook,Sheet sheet,List datas, String header,Map attrInfoMap) throws Exception{ CellStyle cellStyle = workbook.createCellStyle();//初始化单元格格式对象 cellStyle.setAlignment(HorizontalAlignment.CENTER); if (datas != null && !datas.isEmpty()) { for (int i=0;i < datas.size(); i++) { - SarBussionessStand sarStandardsInfoEO = datas.get(i); + SarBussionessStandExport sarStandardsInfoEO = datas.get(i); Row row = sheet.createRow(i+1); String[] headerArr = header.split(","); int sheetNum = 0; @@ -85,7 +86,7 @@ public class BussStandExportUtil { } // 根据表头返回相应值 - public static String getValueByName (String name,SarBussionessStand sarStandardsInfoEO,Map attrInfoMap) throws Exception{ + public static String getValueByName (String name,SarBussionessStandExport sarStandardsInfoEO,Map attrInfoMap) throws Exception{ String value = ""; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map attrValueMap = sarStandardsInfoEO.getAttrInfoMap(); @@ -117,12 +118,6 @@ public class BussStandExportUtil { } value = putTime; break; - case "代替企标编号": - value = verifyBean(sarStandardsInfoEO.getReplaceStandNum()); - break; - case "被代替企标编号": - value = verifyBean(sarStandardsInfoEO.getReplacedStandNum()); - break; case "发布日期": String issueTime=""; if(sarStandardsInfoEO.getIssueTime() != null){ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 857d5e46..2a84194c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -25,7 +25,7 @@ - + @@ -55,6 +55,22 @@ stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number + + DISTINCT SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.modify_time, + SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag, + SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort,SAR_BUSSIONESS_STAND.stand_year, + stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name, + stand_name, stand_code,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number + + + + DISTINCT tmp_tb.id,tmp_tb.modify_time, + tmp_tb.creation_time, tmp_tb.valid_flag, + tmp_tb.apply_country, tmp_tb.stand_nature,tmp_tb.stand_sort,tmp_tb.stand_year, + tmp_tb.stand_status, tmp_tb.replaced_stand_num,tmp_tb.replace_stand_num,tmp_tb.put_time,tmp_tb.issue_time,tmp_tb.stand_en_name, + tmp_tb.stand_name, tmp_tb.stand_code,tmp_tb.text_status_buss,tmp_tb.stand_number + + stand_status, replaced_stand_num, replace_stand_num,put_time, issue_time, stand_en_name, stand_name, stand_code,stand_status, @@ -575,6 +591,9 @@ and SAR_BUSSIONESS_STAND.stand_sort = #{standSort} + + and SAR_BUSSIONESS_STAND.stand_year = #{standYear} + and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%') @@ -754,11 +773,17 @@ From d153a3be0f0aeee125df8e2a47df42c6cdd73695 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 24 Mar 2022 22:55:15 +0800 Subject: [PATCH 09/64] feat: There is no way the, --- .../entity/SarBussStandAttrInfo.java | 4 ++ .../dao/SarBussionessStandDao.java | 2 - .../impl/SarBussionessStandServiceImpl.java | 58 ++++++++++++++----- 3 files changed, 46 insertions(+), 18 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java index b2d919ed..47b0f8ae 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java @@ -57,6 +57,10 @@ public class SarBussStandAttrInfo extends BaseEntity { @TableField("TXLBBUSS") private String txlbbuss; + @ApiModelProperty(value = "被代替企标编号") + @TableField("BDTQBBHBUSS") + private String bdtqbbhbuss; + @TableField(exist = false) private String glwj; // diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 46b2d23e..8ff706e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -55,8 +55,6 @@ public interface SarBussionessStandDao extends BaseMapper { List selectSarBussionesDownloadFileInfo(String id); - List selectStandardsByStandnumber(SarBussionessStand sarStandardsInfoEO); - List selectStandByStandNumber(@Param("standCode") String standCode); /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 22784202..c42aa5fc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -628,13 +628,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 0) { + if (StringUtils.isNotEmpty(newCiteStand) && newCiteStand.split(",").length > 0) { // 主要逻辑处理新增的 String nowEOrepNums[] = newCiteStand.split(","); for (String citeStand : nowEOrepNums) { - sarStandardsSelectEO.setStandNumber(citeStand); + sarStandardsSelectEO.setStandCode(citeStand); // if (StringUtils.isNotBlank(sarStandardsSelectEO.getStandNumber())) { // String sort = ""; // if (sarStandardsSelectEO.getStandNumber().length() > 3) { @@ -663,41 +663,67 @@ public class SarBussionessStandServiceImpl extends ServiceImpl result = this.baseMapper.selectStandardsByStandnumber(sarStandardsSelectEO); + List result = this.baseMapper.selectStandardsByStandNumber(sarStandardsSelectEO); if (result != null && result.size() > 0) { String standId = result.get(0).getId(); String field = beUpedField; String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId()); String changeCitedStand = ""; - if (org.apache.commons.lang3.StringUtils.isNotBlank(citedStand)) { + if (StringUtils.isNotBlank(citedStand)) { String[] beforeReplacedStandNumStr = citedStand.split(","); if (Arrays.asList(beforeReplacedStandNumStr).contains(addStrandNumber)) { continue; } else { changeCitedStand = citedStand + "," + addStrandNumber; } + sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand); } else { changeCitedStand = addStrandNumber; + + String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr(); + String mustFields = FieldConvertUtil.mustFields; + String mustValues = FieldConvertUtil.mustValues(standId); + // 将字符串转为map进行解析 + Map sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); + StringBuilder fieldsBuilder = new StringBuilder(); + StringBuilder valuesBuilder = new StringBuilder(); + for (Map.Entry entry : sarStandAttrMap.entrySet()) { + String attrKey = entry.getKey(); + String attrValue = ""; + if (InitStandAttrUtil.queryFieldListBuss != null && !InitStandAttrUtil.queryFieldListBuss.isEmpty()) { + if (InitStandAttrUtil.queryFieldListBuss.contains(attrKey)) { + if("BDTQBBHBUSS".equals(attrKey)){ + valuesBuilder.append(",").append("'").append(changeCitedStand).append("'"); + }else { + valuesBuilder.append(",").append("'").append(attrValue).append("'"); + + } + fieldsBuilder.append(",").append(attrKey); + } + } + } + String insertField = mustFields + fieldsBuilder.toString(); + String insertValue = mustValues + valuesBuilder.toString(); + sarBussStandAttrInfoEODao.insertStandAttr(insertField,insertValue); } - sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand); } } // 如果id不为空，说明是修改，有逻辑删除的执行以下语句,存在之前是三项，现在修改成两项的情况 if (null != beforeSarStandardsInfo) { String oldCiteStand = String.valueOf(beforeSarStandardsInfo.getAttrInfoMap().get(upField)); - if (org.apache.commons.lang3.StringUtils.isNotEmpty(oldCiteStand)) { + if (StringUtils.isNotEmpty(oldCiteStand)) { String[] beforeEOrepNums = oldCiteStand.split(","); for (String beforeStr : beforeEOrepNums) { // 如果再旧的中包含，在新的中没有，需要删除 if (!Arrays.asList(nowEOrepNums).contains(beforeStr)) { sarStandardsSelectEO.setStandNumber(beforeStr); - List result = this.baseMapper.selectStandardsByStandnumber(sarStandardsSelectEO); + List result = this.baseMapper.selectStandardsByStandNumber(sarStandardsSelectEO); if (result != null && result.size() > 0) { String standId = result.get(0).getId(); String field = beUpedField; String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId()); String changeCitedStand = ""; - if (org.apache.commons.lang3.StringUtils.isNotBlank(citedStand)) { + if (StringUtils.isNotBlank(citedStand)) { String[] beforerepalced = citedStand.split(","); ArrayList beforlist = new ArrayList<>(Arrays.asList(beforerepalced)); if (beforlist.contains(beforeStrandNumber)) { @@ -718,23 +744,23 @@ public class SarBussionessStandServiceImpl extends ServiceImpl result = this.baseMapper.selectStandardsByStandnumber(sarStandardsSelectEO); + List result = this.baseMapper.selectStandardsByStandNumber(sarStandardsSelectEO); if (result != null && result.size() > 0) { String standId = result.get(0).getId(); String field = "BYYBJ"; String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId()); String changeCitedStand = ""; - if (org.apache.commons.lang3.StringUtils.isNotBlank(citedStand)) { + if (StringUtils.isNotBlank(citedStand)) { String[] beforerepalced = citedStand.split(","); ArrayList beforlist = new ArrayList<>(Arrays.asList(beforerepalced)); if (beforlist.contains(beforeStrandNumber)) { beforlist.remove(beforeStrandNumber); - changeCitedStand = org.apache.commons.lang3.StringUtils.join(beforlist.toArray(), ","); + changeCitedStand = StringUtils.join(beforlist.toArray(), ","); } else { continue; } From 36194ba8ebe61247ea3f38bb87e20749dafbcf56 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 24 Mar 2022 23:21:25 +0800 Subject: [PATCH 10/64] feat: There is no way the, bug #51957 --- .../service/impl/SarBussionessStandServiceImpl.java | 2 +- .../main/java/com/adc/da/utils/util/BussStandExportUtil.java | 2 +- .../src/main/java/com/adc/da/utils/util/FieldConvertUtil.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index c42aa5fc..1e6bfc0b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -492,7 +492,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Thu, 24 Mar 2022 23:24:45 +0800 Subject: [PATCH 11/64] feat: There is no way the, x --- .../src/main/java/com/adc/da/utils/util/FieldConvertUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 bc449a08..8541ab3b 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 @@ -54,8 +54,7 @@ public class FieldConvertUtil { "个性化标签,政策文本,过程稿件,新车型实施日期（文本）,在产车实施日期（文本）,EOP实施日期（文本）,SVPPS," + "相关部门,责任部门,FO,维护工程师,归口管理部门,发布机构,我司是否参与,相关资料"; - public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期," + - "代替企标编号,被代替企标编号"; + public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期"; public static String exportAttrFieldNamesBuss = "SVPPS,规范性引用文件,废止日期,复审日期,密级,授权,相关部门," + "需会签部门,起草部门,主要起草人,起草分标委,企标文本,过程文本"; From ed3882149ae13d7e0f35bf929d1ed74c107a5964 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 24 Mar 2022 23:44:50 +0800 Subject: [PATCH 12/64] feat: There is no way the, x --- .../service/impl/SarBussionessStandServiceImpl.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 1e6bfc0b..b730ebbb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -1583,11 +1583,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Fri, 25 Mar 2022 11:13:31 +0800 Subject: [PATCH 13/64] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E4=BB=A3=E6=9B=BF=E8=A2=AB=E4=BB=A3=E6=9B=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index b730ebbb..bba3f831 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -668,6 +668,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); + StringBuilder fieldsBuilder = new StringBuilder(); + StringBuilder valuesBuilder = new StringBuilder(); + for (Map.Entry entry : sarStandAttrMap.entrySet()) { + String attrKey = entry.getKey(); + String attrValue = ""; + if (InitStandAttrUtil.queryFieldListBuss != null && !InitStandAttrUtil.queryFieldListBuss.isEmpty()) { + if (InitStandAttrUtil.queryFieldListBuss.contains(attrKey)) { + if("BDTQBBHBUSS".equals(attrKey)){ + valuesBuilder.append(",").append("'").append(changeCitedStand).append("'"); + }else { + valuesBuilder.append(",").append("'").append(attrValue).append("'"); - String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr(); - String mustFields = FieldConvertUtil.mustFields; - String mustValues = FieldConvertUtil.mustValues(standId); - // 将字符串转为map进行解析 - Map sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); - StringBuilder fieldsBuilder = new StringBuilder(); - StringBuilder valuesBuilder = new StringBuilder(); - for (Map.Entry entry : sarStandAttrMap.entrySet()) { - String attrKey = entry.getKey(); - String attrValue = ""; - if (InitStandAttrUtil.queryFieldListBuss != null && !InitStandAttrUtil.queryFieldListBuss.isEmpty()) { - if (InitStandAttrUtil.queryFieldListBuss.contains(attrKey)) { - if("BDTQBBHBUSS".equals(attrKey)){ - valuesBuilder.append(",").append("'").append(changeCitedStand).append("'"); - }else { - valuesBuilder.append(",").append("'").append(attrValue).append("'"); - + } + fieldsBuilder.append(",").append(attrKey); } - fieldsBuilder.append(",").append(attrKey); } } + String insertField = mustFields + fieldsBuilder.toString(); + String insertValue = mustValues + valuesBuilder.toString(); + sarBussStandAttrInfoEODao.insertStandAttr(insertField,insertValue); + }else { + sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand); } - String insertField = mustFields + fieldsBuilder.toString(); - String insertValue = mustValues + valuesBuilder.toString(); - sarBussStandAttrInfoEODao.insertStandAttr(insertField,insertValue); } } } From a1475db7436124c90b5acd1aa5acb9a072b70b70 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 25 Mar 2022 13:32:10 +0800 Subject: [PATCH 14/64] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E4=BB=A3=E6=9B=BF=E8=A2=AB=E4=BB=A3=E6=9B=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index bba3f831..1de08800 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -546,7 +546,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl result = this.baseMapper.selectStandardsByStandNumber(sarStandardsSelectEO); if (result != null && result.size() > 0) { String standId = result.get(0).getId(); @@ -749,16 +749,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl result = this.baseMapper.selectStandardsByStandNumber(sarStandardsSelectEO); if (result != null && result.size() > 0) { String standId = result.get(0).getId(); - String field = "BYYBJ"; + String field = beUpedField; String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId()); String changeCitedStand = ""; if (StringUtils.isNotBlank(citedStand)) { From 9c3cf2442256629c56b2b6f6cf371518c31c2ce7 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 25 Mar 2022 17:07:46 +0800 Subject: [PATCH 15/64] feat: There is no way the, bug #52092 --- .../main/java/com/adc/da/common/BussEnum.java | 31 +++++++++++++++++++ .../service/ActSarItemsBussEOService.java | 16 ++++++++++ 2 files changed, 47 insertions(+) create mode 100644 adc-da-activiti/src/main/java/com/adc/da/common/BussEnum.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/BussEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/BussEnum.java new file mode 100644 index 00000000..9a905ffd --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/common/BussEnum.java @@ -0,0 +1,31 @@ +package com.adc.da.common; + +public enum BussEnum { + + BUSS_XD("tz4lqchzuy","修订","1"), + BUSS_FZ("3lqnlgmgcn","作废","2"), + BUSS_YX("9z741h2m3j","有效","3"); + + private String value; + private String lable; + private String state; + + private BussEnum(String value, String lable,String state) { + this.value = value; + this.lable = lable; + this.state = state; + } + public String getValue() { + return value; + } + public String getLable() { + return lable; + } + public String getState() { + return state; + } + + + + +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 897cd481..69dd75d1 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -1,6 +1,7 @@ package com.adc.da.workFlow.service; import com.adc.da.FeignClientImpl.workFlowFeignClientImpl; +import com.adc.da.common.BussEnum; import com.adc.da.common.SarConformStateEnum; import com.adc.da.common.SarStateColorEnum; import com.adc.da.common.SarTypeEnum; @@ -105,6 +106,21 @@ public class ActSarItemsBussEOService { String reviewTime = String.valueOf(standMap.get("reviewTime")); String reviewResults = String.valueOf(standMap.get("reviewResults")); + // 更新企标文本状态 + String textStatus = ""; + if("1".equals(reviewResults)){ + textStatus = BussEnum.BUSS_XD.getValue(); + }else if("2".equals(reviewResults)){ + textStatus = BussEnum.BUSS_FZ.getValue(); + }else if("3".equals(reviewResults)){ + textStatus = BussEnum.BUSS_YX.getValue(); + } + + SarBussionessStand bussionessStand = new SarBussionessStand(); + bussionessStand.setId(standId); + bussionessStand.setTextStatusBuss(textStatus); + iSarBussionessStandService.updateById(bussionessStand); + SarBussionessStandState state = new SarBussionessStandState(); state.setStandId(standId); state.setStandCode(standCode); From 25a36eff186d8f186737b4973386dbbd49f77aaf Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 25 Mar 2022 21:22:14 +0800 Subject: [PATCH 16/64] feat: There is no way the, xxxxx --- .../entity/SarBussionessStandState.java | 3 +++ .../entity/SarBussionessStandStatePage.java | 1 + .../SarBussionessStandStateMapper.xml | 23 +++++++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java index e22d5559..02a7ee49 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java @@ -92,4 +92,7 @@ public class SarBussionessStandState extends BaseEntity { @TableField(exist = false) private String QCRBUSS; + @TableField(exist = false) + private String standSort; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java index 8a9504f9..c053d6e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java @@ -72,6 +72,7 @@ public class SarBussionessStandStatePage extends BasePage { private String QCDW; private String QCRBUSS; + private String standSort; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml index dd40bfbd..31ed85e0 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml @@ -77,13 +77,32 @@ SELECT sar_public_idea_all.id,reason,ts_institution.name as - deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause + deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause,sar_public_idea_all.source_type as sourceType FROM sar_public_idea_all left join ts_user on ts_user.USID=sar_public_idea_all.user_id left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID @@ -67,7 +67,7 @@ - ( + SELECT CONCAT( sarInfo.STAND_SORT, @@ -39,7 +39,7 @@ del_flag=0 - trim(replace(CONCAT( + and trim(replace(CONCAT( sarInfo.STAND_SORT, ' ', sarInfo.STAND_NUMBER, @@ -51,17 +51,17 @@ - sarInfo.STAND_NAME LIKE CONCAT('%',#{pageVo.lawName},'%') + and sarInfo.STAND_NAME LIKE CONCAT('%',#{pageVo.lawName},'%') - issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%') + and issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%') - ) UNION ALL ( + UNION ALL SELECT sarInfo.LAWS_NUMBER AS law_code, sarInfo.LAWS_NAME AS law_name, @@ -73,20 +73,20 @@ del_flag=0 - sarInfo.LAWS_NUMBER LIKE CONCAT('%',#{pageVo.lawCode},'%') + and sarInfo.LAWS_NUMBER LIKE CONCAT('%',#{pageVo.lawCode},'%') - sarInfo.LAWS_NAME LIKE CONCAT('%',#{pageVo.lawName},'%') + and sarInfo.LAWS_NAME LIKE CONCAT('%',#{pageVo.lawName},'%') - issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%') + and issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%') - ) UNION ALL ( + UNION ALL SELECT sarInfo.STAND_CODE AS law_code, sarInfo.STAND_NAME AS law_name, @@ -100,21 +100,21 @@ del_flag=0 - sarInfo.STAND_CODE LIKE CONCAT('%',#{pageVo.lawCode},'%') + and sarInfo.STAND_CODE LIKE CONCAT('%',#{pageVo.lawCode},'%') - sarInfo.STAND_NAME LIKE CONCAT('%',#{pageVo.lawName},'%') + and sarInfo.STAND_NAME LIKE CONCAT('%',#{pageVo.lawName},'%') - issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%') + and issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%') - ) + From 863f355d6ff31075d673c0d8741b37a2ad97bb13 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 31 Mar 2022 09:53:49 +0800 Subject: [PATCH 28/64] feat: There is no way the, --- .../service/impl/QualityEvaluationServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index 4c2344b6..2870317a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -58,6 +58,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl tableData = form.getTableData(); tableData.forEach(item->{ + item.setCreateTime(new Date()); item.setModifyTime(new Date()); item.setId( UUIDUtils.randomUUID20()); if ("number".equals(item.getValueType()) ){ From 4cc5393108e1a34bd9c66eff73fd621cb1e7902a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 31 Mar 2022 11:15:43 +0800 Subject: [PATCH 29/64] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=96=87=E4=BB=B6=E6=98=BE=E7=A4=BA=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=20=E6=9C=80=E6=96=B0=E6=97=B6=E9=97=B4=E6=8E=92?= =?UTF-8?q?=E8=87=B3=E6=9C=80=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 2 +- .../impl/SarLawsStandInfoServiceImpl.java | 2 +- .../impl/SarStandardsInfoServiceImpl.java | 2 +- .../adc/da/att/service/IAttFileEOService.java | 2 ++ .../service/impl/AttFileEOServiceImpl.java | 34 +++++++++++++++++++ 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 1f234692..d85fc975 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -1056,7 +1056,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 0 && InitStandAttrUtil.fileFieldListBuss.contains(name)) { value = entry.getValue().toString(); if (StringUtils.isNotBlank(value)) { - List fileObj = attFileEOService.getMultiFileInfos(value); + List fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value); entry.setValue(fileObj); } }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 34fd22d0..84fb82be 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -398,7 +398,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl 0 && InitStandAttrUtil.fileFieldListLaws.contains(name)) { value = entry.getValue().toString(); if (StringUtils.isNotBlank(value)) { - List fileObj = attFileEOService.getMultiFileInfos(value); + List fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value); entry.setValue(fileObj); } }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListLaws != null && InitStandAttrUtil.selectionFieldListLaws.size() > 0 && InitStandAttrUtil.selectionFieldListLaws.contains(name)) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 031bf5b6..686a137c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -627,7 +627,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 0 && InitStandAttrUtil.fileFieldList.contains(name)) { value = entry.getValue().toString(); if (StringUtils.isNotBlank(value)) { - List fileObj = attFileEOService.getMultiFileInfos(value); + List fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value); entry.setValue(fileObj); } }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java index 15a17852..60f7922a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java @@ -22,6 +22,8 @@ public interface IAttFileEOService extends IService { public List getMultiFileInfos(String fileIds); + public List getMultiFileInfosOrderByDateDesc(String fileIds); + public String saveFileAttId(File file); public AttFileVo insertFileInfo(File file,String fileName); diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index ce08c19c..ab4bc7c9 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Comparator; import java.util.Date; import java.util.List; @@ -332,6 +333,39 @@ public class AttFileEOServiceImpl extends ServiceImpl i return attFileEO; } + /** + * @Author super_liu + * @Description 多文件查询 + * Date 2018/10/24 11:08 + * @Param [fileIds] + * @return java.util.List + **/ + public List getMultiFileInfosOrderByDateDesc(String fileIds) { + List fileObj = new ArrayList<>(); + if(StringUtils.isNotEmpty(fileIds)){ + String idList[] = fileIds.split(","); + for(int i=0;i Date: Thu, 31 Mar 2022 15:23:19 +0800 Subject: [PATCH 30/64] feat: There is no way the, --- .../service/impl/SarBussionessStandServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index d85fc975..3dec5dd6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -998,7 +998,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Thu, 31 Mar 2022 15:24:57 +0800 Subject: [PATCH 31/64] feat: There is no way the, --- .../service/impl/SarBussionessStandServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 3dec5dd6..204645aa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -998,7 +998,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Thu, 31 Mar 2022 17:25:14 +0800 Subject: [PATCH 32/64] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=20=E7=AB=8B=E9=A1=B9=20=E5=AF=BC=E5=85=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/processModel/service/impl/IExportServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java index 44452ed7..1323c101 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java @@ -69,7 +69,7 @@ public class IExportServiceImpl implements IExportService { int i = 1; for (importExcelDTO importExcelDTO : res) { if (null != importExcelDTO.getWgLeader() && !"".equals(importExcelDTO.getWgLeader())) { - importExcelDTO.setWgLeaderName(tsUserMap.get(importExcelDTO.getWgLeader())); + importExcelDTO.setWgLeaderName(tsUserMap.get(importExcelDTO.getWgLeader())+"("+importExcelDTO.getWgLeader()+")"); if (null == tsUserMap.get(importExcelDTO.getWgLeader())) { stringBuilder.append("第" + i + "行第7列工作组组长填写不符合格式要求请检查；"); } @@ -81,13 +81,13 @@ public class IExportServiceImpl implements IExportService { } } if (null != importExcelDTO.getDrafter() && !"".equals(importExcelDTO.getDrafter())) { - importExcelDTO.setDrafterName(tsUserMap.get(importExcelDTO.getDrafter())); + importExcelDTO.setDrafterName(tsUserMap.get(importExcelDTO.getDrafter())+"("+importExcelDTO.getDrafter()+")"); if (null == tsUserMap.get(importExcelDTO.getDrafter())) { stringBuilder.append("第" + i + "行第5列起草人填写不符合格式要求请检查；"); } } if (null != importExcelDTO.getResPerson() && !"".equals(importExcelDTO.getResPerson())) { - importExcelDTO.setResPersonName(tsUserMap.get(importExcelDTO.getResPerson())); + importExcelDTO.setResPersonName(tsUserMap.get(importExcelDTO.getResPerson())+"("+importExcelDTO.getResPerson()+")"); if (null == tsUserMap.get(importExcelDTO.getResPerson())) { stringBuilder.append("第" + i + "行第6列评审责任人填写不符合格式要求请检查；"); } From df75cb80b36ad03348f049bacc53cf368d4b8552 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 31 Mar 2022 17:33:43 +0800 Subject: [PATCH 33/64] feat: There is no way the, bug #52329 --- .../service/impl/SarLawsStandInfoServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 84fb82be..0cac71c7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -935,7 +935,9 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl Date: Fri, 1 Apr 2022 14:18:00 +0800 Subject: [PATCH 34/64] feat: There is no way the, --- .../service/ActSarItemsBussEOService.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 01758a31..a1624bf4 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -44,6 +44,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang.StringUtils; +import org.json.JSONTokener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -157,7 +158,7 @@ public class ActSarItemsBussEOService { String releaseTime = String.valueOf(standMap.get("releaseTime")); String YYBZ = String.valueOf(standMap.get("YYBZ")); String CYBZ = String.valueOf(standMap.get("CYBZ")); - String SYCXCLASS = String.valueOf(standMap.get("SYCXCLASS")); + String SYCXCLASS = getFieldsValue(standMap,"SYCXCLASS"); String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS")); String LXD = String.valueOf(standMap.get("LXD")); @@ -187,6 +188,19 @@ public class ActSarItemsBussEOService { } + private String getFieldsValue(Map standMap, String key){ + String str = ""; + Object json= new JSONTokener(standMap.get(key).toString()).nextValue(); + if(json instanceof org.json.JSONArray){ + str = String.join(",",JSONObject.parseArray(standMap.get(key).toString(),String.class)); + }else { + if(!json.equals("null")){ + str = standMap.get(key).toString(); + } + } + return str; + } + public void autoUpdIndex(String pid,String bussId){ List evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid); List evaluationHis = new ArrayList<>(); From 54930edea6addb9819e9386008a63df857ab03db Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 1 Apr 2022 17:36:52 +0800 Subject: [PATCH 35/64] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=94=BF=E7=AD=96=E5=BA=93=20=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=9C=BA=E6=9E=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarLawsAttrInfo/entity/SarLawsAttrInfo.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/entity/SarLawsAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/entity/SarLawsAttrInfo.java index 9e52cac7..b1f97419 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/entity/SarLawsAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/entity/SarLawsAttrInfo.java @@ -79,9 +79,6 @@ public class SarLawsAttrInfo extends BaseEntity { @TableField("JDWJLAWS") private String jdwjlaws; - @TableField("FBJGLAWS") - private String fbjglaws; - @TableField("CYSDLAWS") private String cysdlaws; From ee348fbc29aecc151c0ff357c8ce2c12c30b3be2 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sat, 2 Apr 2022 11:13:05 +0800 Subject: [PATCH 36/64] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarIssueTrack/controller/IssueTrackController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java index b8ce4322..090cf168 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java @@ -33,7 +33,7 @@ public class IssueTrackController { if (b>0){ return Result.success("200","信息已存在,更新!", true); }else{ - return Result.error("100","新增成功!", false); + return Result.success("100","新增成功!", true); } } From 8860d789e46ed1216ce9a468b9ad75d52dff14d4 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sat, 2 Apr 2022 11:26:09 +0800 Subject: [PATCH 37/64] =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 2 + .../entity/SarFindDto.java | 4 ++ .../BusinessDeptIssueController.java | 7 +++ .../ProductDeptIssueController.java | 7 +++ .../service/IProductDeptIssueService.java | 3 +- .../SarStandardsInfoController.java | 33 ++++++++++++ .../dao/SarStandardsInfoDao.java | 4 ++ .../entity/SarStandardsInfoEOPage.java | 16 ++++++ .../service/ISarStandardsInfoService.java | 2 + .../impl/SarStandardsInfoServiceImpl.java | 53 +++++++++++++++++++ .../SarLawsAttrDetailedListMapper.xml | 25 +++++++++ .../BusinessDeptIssuempaaer.xml | 32 +++++++++++ .../SarStandardsInfoMapper.xml | 30 +++++++++++ 13 files changed, 217 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 4307db71..f397a894 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -23,6 +23,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size,@Param("sar") SarFindDto sarFindDto); + + List selectHighLawsId(@Param("standId") String standId,@Param("sar") SarFindDto sarFindDto); //根据标准id查出数据 List selectLawsById(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); //根据标准id查出数据用于清单查询 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java index cc7ee987..3c885a39 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java @@ -1,7 +1,11 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; +import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import lombok.Data; +import java.util.List; +import java.util.Map; + /** * 高级检索 * diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java index b3f491c0..5c50e8dd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java @@ -40,6 +40,13 @@ public class BusinessDeptIssueController extends BaseController { return Result.success(b); } + @PostMapping("/saveBatch") + @ApiOperation("批量新增事业部重点问题") + public ResponseMessage saveBatch(@RequestBody List issue){ + boolean b = iBusinessDeptIssueService.saveBatch(issue); + return Result.success(b); + } + @DeleteMapping @ApiOperation("删除事业部重点问题") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java index 68d8d12a..a74378b2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java @@ -33,6 +33,13 @@ public class ProductDeptIssueController { return Result.success(b); } + @PostMapping("/saveBatch") + @ApiOperation("新增产品规划部重点问题") + public ResponseMessage productDeptIssueSaveBatch(@RequestBody List issue){ + boolean b = iProductDeptIssueService.saveBatch(issue); + return Result.success(b); + } + @DeleteMapping @ApiOperation("删除产品规划部重点问题") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java index a9e04a4a..3441da72 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java @@ -3,10 +3,11 @@ package com.adc.da.slrs.sarStandUnqualified.service; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssueVo; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; -public interface IProductDeptIssueService { +public interface IProductDeptIssueService extends IService { public boolean addProductDeptIssue(ProductDeptIssue obj); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 9ec7375e..75e38532 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -248,6 +248,39 @@ public class SarStandardsInfoController extends BaseController return Result.success(getPageInfo(page.getPager(), rows)); } + + + @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") + @GetMapping("/selectHighLawsById") + //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") + public ResponseMessage> selectHighLawsById(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception { + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + //不改传参强行置换 +// searchList.forEach(sarAdvanceSearchVO -> { +// if ("TXLB".equals(sarAdvanceSearchVO.getField())){ +// sarAdvanceSearchVO.setField("STAND_SYSTEM"); +// } +// }); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_stand_attr_info"); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } + List rows = sarStandardsInfoEOService.selectHighLawsById(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + @ApiOperation(value = "|SarStandardsInfoEO|新增") @PostMapping("/addarStandardsInfo") //401问题2021-03-31暂时注释掉 liuhuiwen diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index b5a26655..a59045c9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -23,8 +23,12 @@ public interface SarStandardsInfoDao extends BaseMapper { List getSarStandardsInfoPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark); + List selectHighLawsPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark,@Param("list") List lawsIds); + int getSarStandardsInfoCount(@Param("page") SarStandardsInfoEOPage page); + int selectHighLawsCount(@Param("page") SarStandardsInfoEOPage page); + int getSarStandardsInfoCountWk1(SarStandardsInfoEOPage page); int insertSelective(SarStandardsInfo page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java index 4afc427c..06d58413 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java @@ -116,4 +116,20 @@ public class SarStandardsInfoEOPage extends BasePage { * 标准号 */ private String standCode; + + private String qdFlag; + + + private String qdid; +// private String standName; +// private String standEnName; + private String typeApplicable; + private String nylx; + private String zrbm; + private String sycpx; +// private String standSort; +// private String standType; +// private String standNumber; + private String types; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 4caf6161..62383c9f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -27,6 +27,8 @@ public interface ISarStandardsInfoService extends IService { List getSarStandardsInfoPageBak1(SarStandardsInfoEOPage page) throws Exception; + List selectHighLawsById(SarStandardsInfoEOPage page) throws Exception; + void createSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception; int updateSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 686a137c..b5a95c20 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarStandardsInfo.service.impl; import com.adc.da.att.entity.AttFileEO; import com.adc.da.person.entity.StandInfo; import com.adc.da.person.entity.TsPersonCollect; +import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto; import com.adc.da.slrs.sarPosition.entity.TsPosition; import com.adc.da.slrs.sarPosition.service.ITsPositionService; import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao; @@ -128,6 +130,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl selectHighLawsById(SarStandardsInfoEOPage page) throws Exception { + //查询当前登录人角色拥有权限的菜单 + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + } + List lawsIds=new ArrayList<>(); + if ("1".equals(page.getQdFlag())){ + + SarFindDto sarFindDto=new SarFindDto(); + sarFindDto.setId(page.getQdid()); + sarFindDto.setStandEnName(page.getStandEnName()); + sarFindDto.setStandName(page.getStandName()); + sarFindDto.setTypeApplicable(page.getTypeApplicable()); + sarFindDto.setSycpx(page.getSycpx()); + sarFindDto.setNylx(page.getNylx()); + sarFindDto.setTypes(page.getTypes()); + sarFindDto.setStandSort(page.getStandSort()); + sarFindDto.setZrbm(page.getZrbm()); + sarFindDto.setStandNumber(page.getStandNumber()); + sarFindDto.setStandType(page.getStandType()); + + lawsIds = sarLawsAttrDetailedListDao.selectHighLawsId(sarFindDto.getId(),sarFindDto); + + } + + Integer rowCount = dao.selectHighLawsCount(page); + page.getPager().setRowCount(rowCount); + List sarlist = dao.selectHighLawsPage(page,"0",lawsIds); + attrInfo(sarlist); + return sarlist; + } + public void attrInfo(List sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 2fdcaa54..7ec47008 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -169,6 +169,31 @@ LIMIT #{param3} , #{param2}; + + + select t.* from ( SELECT issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME FROM @@ -28,5 +29,36 @@ LEFT JOIN sar_laws_stand_info AS laws ON issue.law_id = laws.ID ${ew.customSqlSegment} + + UNION ALL + SELECT + issue.*, + laws.STAND_CODE AS lawNumber, + laws.STAND_NAME AS lawName + FROM + business_dept_issue AS issue + LEFT JOIN sar_bussioness_stand AS laws + ON issue.law_id = laws.ID + ${ew.customSqlSegment} + + UNION ALL + SELECT + issue.*, CONCAT( + laws.STAND_SORT, + ' ', + laws.STAND_NUMBER, + '-', + laws.STAND_YEAR + ) AS lawNumber, + laws.STAND_NAME AS lawName + FROM + business_dept_issue AS issue + LEFT JOIN sar_standards_info AS laws + ON issue.law_id = laws.ID + ${ew.customSqlSegment} + ) t + where t.LAWS_NAME is not null and t.LAWS_NUMBER is not null + + 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 58ea160b..9b506342 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 @@ -1394,6 +1394,8 @@ + + + + @@ -1422,6 +1443,15 @@ GROUP BY SAR_STANDARDS_INFO.id) a + + From a094dc5c386f324c464710b85b247a12ca58f545 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 2 Apr 2022 15:29:37 +0800 Subject: [PATCH 39/64] feat: There is no way the, bug #52376 --- .../impl/QualityEvaluationServiceImpl.java | 79 +++++++++++++------ 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index 2870317a..dc5e076a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections.IterableMap; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,30 +44,61 @@ public class QualityEvaluationServiceImpl extends ServiceImpl{ - if ("dynamic".equals(form.getEvaluationType())){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("law_id",form.getLawId()) //清除此用户在动态评分中已存在的评分 - .eq("user_id",form.getUserId()) - .eq("evaluation_type","dynamic"); - this.remove(queryWrapper); - } - }); +// Optional.ofNullable(form.getEvaluationType()) +// .ifPresent( item->{ +// if ("dynamic".equals(form.getEvaluationType())){ +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.eq("law_id",form.getLawId()) //清除此用户在动态评分中已存在的评分 +// .eq("user_id",form.getUserId()) +// .eq("evaluation_type","dynamic"); +// this.remove(queryWrapper); +// } +// }); + QueryWrapper qw = new QueryWrapper(); + qw.eq("law_id",form.getLawId()); + qw.eq("evaluation_type","dynamic"); + List list = this.baseMapper.selectList(qw); + List tableData = form.getTableData(); - tableData.forEach(item->{ - item.setCreateTime(new Date()); - item.setModifyTime(new Date()); - item.setId( UUIDUtils.randomUUID20()); - if ("number".equals(item.getValueType()) ){ - item.setScore(String.valueOf (Double.valueOf(item.getScore()) * 2) ); + if(!list.isEmpty()){ + List updSetList = tableData.stream() + .map(upObj -> list.stream() + .filter(stateQueryObj -> upObj.getEvaluationIndex().equals(stateQueryObj.getEvaluationIndex())) + .findFirst() + .map(stateQueryObj -> { + // 集合交集 stream 重新赋值更新字段 + upObj.setId(stateQueryObj.getId()); + upObj.setCreateTime(new Date()); + upObj.setModifyTime(new Date()); + if ("number".equals(upObj.getValueType()) ){ + upObj.setScore(String.valueOf (Double.parseDouble(upObj.getScore()) * 2) ); + } + if(StringUtils.isNotBlank(upObj.getReason())){ + upObj.setReason(upObj.getReason()); + }else { + upObj.setReason("-"); + } + return upObj; + }).orElse(null)) + .collect(Collectors.toList()); - } - }); - return this.saveBatch(tableData); + return this.updateBatchById(updSetList); + }else { + tableData.forEach(item->{ + + item.setCreateTime(new Date()); + item.setModifyTime(new Date()); + item.setId( UUIDUtils.randomUUID20()); + if ("number".equals(item.getValueType()) ){ + item.setScore(String.valueOf (Double.parseDouble(item.getScore()) * 2) ); + + } + }); + return this.saveBatch(tableData); + } } @Override @@ -170,13 +202,16 @@ public class QualityEvaluationServiceImpl extends ServiceImpl Date: Sat, 2 Apr 2022 16:34:47 +0800 Subject: [PATCH 40/64] =?UTF-8?q?=E4=B8=93=E9=97=A8=E7=94=A8=E6=9D=A5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=98=E5=9C=A8=E5=88=86=E8=A7=A3=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 8 ++++++++ .../da/slrs/sarStandItems/dao/SarStandItemsDao.java | 2 ++ .../service/impl/SarStandItemsServiceImpl.java | 13 +++++++++++++ .../mapper/SarStandItems/SarStandItemsMapper.xml | 5 +++++ 4 files changed, 28 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index f28a5e80..a870eb5f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -137,5 +137,13 @@ public class SarStandItemsController extends BaseController { return Result.success(fileType); } + @ApiOperation(value = "|SarFileSplitInfoEO|根据标准id查询分解单的文本类型用在合规评估的") + @GetMapping("getFileTypeHG") + public ResponseMessage>> getFileTypeHG(String standId){ + List> fileType = ServiceImpl.getFileTypeHG(standId); + + return Result.success(fileType); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 19cc2890..4f66254b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -80,4 +80,6 @@ public interface SarStandItemsDao extends BaseMapper { * @return */ List getFileType(@Param("standId") String standId); + + List getFileTypeHG(@Param("standId") String standId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index b6b8aa56..f16e9c4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -294,6 +294,19 @@ public class SarStandItemsServiceImpl extends ServiceImpl> getFileTypeHG(String standId){ + List fileType = dao.getFileTypeHG(standId); + Map typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() + .collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); + + List> collect = fileType.stream() + .map(item -> new HashMap(){ { put("label", typeNameMap.get(item));put("value", item);} } + ).collect(Collectors.toList()); + + return collect; } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 09d36ed4..dd4fbf5c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -806,4 +806,9 @@ SELECT FILE_type from sar_file_split_info WHERE STAND_ID = #{standId} AND VALID_FLAG = '0' GROUP BY FILE_TYPE + + From 31774254b618180d7f2a0e916965151679279a3f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 2 Apr 2022 16:59:25 +0800 Subject: [PATCH 41/64] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=BA=93=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsLawsEOService.java | 53 +++++++++---------- .../impl/SarLawsStandInfoServiceImpl.java | 24 +++++++++ 2 files changed, 50 insertions(+), 27 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java index 9509383b..ce514f49 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java @@ -36,6 +36,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import org.apache.commons.lang.StringUtils; +import org.json.JSONTokener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -117,48 +118,33 @@ public class ActSarItemsLawsEOService { // } Map attInfoMap = new HashMap<>(); - List jsonArray = new ArrayList<>(); - Object breakVal = null; - Object itemList = null; for (Map.Entry entry : standMap.entrySet()) { String field = entry.getKey().toUpperCase(); - Object value = entry.getValue(); - if (InitStandAttrUtil.queryFieldListLaws.contains(field)) { - if (value != null && value instanceof JSONArray) { - String valStr = String.valueOf(value); - List valueArr = JSONArray.parseArray(valStr,String.class); - if (valueArr != null && !valueArr.isEmpty()) { - String newValue = ""; - for (String val : valueArr) { - newValue += val + ","; - } - newValue = newValue.substring(0,newValue.length()-1); - value = newValue; + String result = ""; + if(StringUtils.isNotBlank(standMap.get(entry.getKey()).toString())){ + Object value= new JSONTokener(standMap.get(entry.getKey()).toString()).nextValue(); + if(value instanceof org.json.JSONArray){ + result = String.join(",",JSONObject.parseArray(value.toString(),String.class)); + }else { + if(!value.equals("null")){ + result =value.toString(); } } - attInfoMap.put(field,value); + } + if (InitStandAttrUtil.queryFieldListLaws.contains(field)) { + attInfoMap.put(field,result); } else { - createStandBaseField(sarLawsStandInfo,entry.getKey(),value); + createStandBaseField(sarLawsStandInfo,entry.getKey(),result); } } - //处理文件 - //此处需要处理之前的文件信息，防止文件丢失 -// attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarLawsStandInfo.setSarStandAttrEOStr(resData); // 根据标准号判断数据是否已存在 - //2021年4月9日 此处检查当前是否存在standId String lawsNumber = ""; if(StringUtils.isNotBlank(sarLawsStandInfo.getLawsNumber()) && !"null".equals(sarLawsStandInfo.getLawsNumber())){ lawsNumber = sarLawsStandInfo.getLawsNumber(); } List lawsList = sarLawsStandInfoService.selectStandardsByStandNumber(lawsNumber); -// if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { -// sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2"); -// sarStandardsInfoEO.setCountry("CN"); -// } else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) { -// sarStandardsInfoEO.setMenuId("22179d54d4e640098e29"); -// } //此处判断是否是带入的标准 if(StringUtils.isNotBlank(sarLawsStandInfo.getId())) { SarLawsStandInfo query = new SarLawsStandInfo(); @@ -239,6 +225,19 @@ public class ActSarItemsLawsEOService { } } + private String getFieldsValue(Map standMap, String key){ + String str = ""; + Object json= new JSONTokener(standMap.get(key).toString()).nextValue(); + if(json instanceof org.json.JSONArray){ + str = String.join(",",JSONObject.parseArray(standMap.get(key).toString(),String.class)); + }else { + if(!json.equals("null")){ + str = standMap.get(key).toString(); + } + } + return str; + } + /*** * 标准法规入库流程中技术评估结果入库归档操作 * @param sarStandardsInfoEO diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 0cac71c7..4d6d8e86 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -51,6 +51,7 @@ import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.sys.constant.ValueStateEnum; import com.adc.da.sys.dao.DicTypeEODao; +import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.sys.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.FieldConvertUtil; @@ -388,8 +389,18 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl sarlist) throws Exception { + //查询字典表,形成Hash映射提升速度 + List dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); + Map dicMap = dicInfo.stream() + .filter(item-> !item.getDicTypeCode().isEmpty()) + .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2)); + for (SarLawsStandInfo row : sarlist) { attrInfoDetails(row); + row.setLawsSyqy(filterValue(dicMap,row.getLawsSyqy())); + row.setLawsSycx(filterValue(dicMap,row.getLawsSycx())); + row.setLawsLabel(filterValue(dicMap,row.getLawsLabel())); + row.setLawsYear(filterValue(dicMap,row.getLawsYear())); Map getAttrMap = row.getAttrInfoMap(); if (getAttrMap != null && getAttrMap.size() > 0) { for (Map.Entry entry : getAttrMap.entrySet()) { @@ -412,6 +423,19 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl dicMap,String value){ + List list = new ArrayList<>(); + if(StringUtils.isNotBlank(value)){ + String[] valArr = value.split(","); + for (String s : valArr) { + if (dicMap.containsKey(s)){ + list.add(dicMap.get(s)); + } + } + } + return String.join(",",list); + } + @Override public List getExportData(String exportType, String exportContent,String userId) throws Exception { SarLawsStandInfoPage page = new SarLawsStandInfoPage(); From ce25b3be789502120f43b3354e840771fab4590f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 3 Apr 2022 20:47:28 +0800 Subject: [PATCH 42/64] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=BA=93=20=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarLawsStandInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 4d6d8e86..13582396 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -674,7 +674,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl Date: Mon, 4 Apr 2022 21:49:56 +0800 Subject: [PATCH 43/64] feat: There is no way the, bug #52391 --- .../adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java index 9a388dc4..4b6117db 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java @@ -258,4 +258,8 @@ public class SarLawsStandInfo extends BaseEntity { @TableField(exist = false) private Map mapItems = new TreeMap<>(); + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String XCXSSRQLAWS; // 新车实施日期 + } From 3af9d8bb7d1184aec86973e089235d254333a602 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 5 Apr 2022 09:20:29 +0800 Subject: [PATCH 44/64] feat: There is no way the, bug #52303 --- .../controller/SarLawsStandInfoController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java index 90b7e98d..34a6d875 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java @@ -247,6 +247,18 @@ public class SarLawsStandInfoController extends BaseController return result; } + @ApiOperation(value = "|SarStandardsInfoEO|根据标准号查询") + @GetMapping("/queryInfoByStandNum") + //@RequiresPermissions("lawss:sarStandardsInfo:list") + public ResponseMessage queryInfoByStandNum(SarLawsStandInfoPage page) throws Exception { + page.setLawsNumber(page.getLawsNumber()); + List sarLawsStandInfoList = sarLawsInfoEOService.selectStandardsByStandNumber(page.getLawsNumber()); + if(!sarLawsStandInfoList.isEmpty()){ + return Result.success(sarLawsStandInfoList.get(0)); + } + return Result.success("0","政策已不存在"); + } + /** * 新增过程中验证标准号 * From 2f86d09ef392c90f9f100fb30bc1314edce97331 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 5 Apr 2022 17:04:12 +0800 Subject: [PATCH 45/64] feat: There is no way the, bug #52287 --- .../java/com/adc/da/common/SarTypeEnum.java | 2 +- .../impl/SarLawsStandInfoServiceImpl.java | 2 +- .../service/impl/SarUpdLogServiceImpl.java | 20 ++++++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/common/SarTypeEnum.java b/adc-da-slrs/src/main/java/com/adc/da/common/SarTypeEnum.java index d41522ac..ccf9bb73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/common/SarTypeEnum.java +++ b/adc-da-slrs/src/main/java/com/adc/da/common/SarTypeEnum.java @@ -8,7 +8,7 @@ package com.adc.da.common; public enum SarTypeEnum { INLAND_STAND("INLAND_STAND","国内标准法规"),INLAND_LAWS("INLAND_LAWS","国内政策"), - FOREIGN_STAND("FOREIGN_STAND","国外标准法规"),FOREIGN_LAWS("FOREIGN_LAWS","国外政策"), + FOREIGN_STAND("FOREIGN_STAND","国外标准法规"),FOREIGN_LAWS("FOREIGN_LAWS","国内外政策"), STAND("STAND","国内外标准法规"), LAWS("LAWS","国内外政策"), LAWS_STAND("LAWS_STAND","国内外政策"), diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 13582396..0cacdd48 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -759,7 +759,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl changeMap (SarLawsStandInfo sarStandardsInfoEO,Map map) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java index e3c5eaeb..e84b5393 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java @@ -220,14 +220,20 @@ public class SarUpdLogServiceImpl extends ServiceImpl i public String changeLawsName (String field,String sarType) throws Exception{ switch (field) { - case "country": return "适用区域"; - case "isRelateAccess": return "重要度"; - case "issueTime": return "发布日期"; - case "standEnName": return "英文名称"; + case "lawsType": return "政策分类"; + case "lawsNumber": return "政策编号"; + case "lawsName": return "政策名称"; + case "lawsEnName": return "英文名称"; case "standName": return "中文名称"; - case "standNumber": return "政策编号"; - case "standState": return "政策状态"; - case "replaceStandNum": return "代替政策编号"; + case "lawsNo": return "政策文号"; + case "issueTime": return "发文日期"; + case "issueCompany": return "发文单位"; + case "lawsTextState": return "文本状态"; + case "lawsSyqy": return "适用区域"; + case "lawsSycx": return "适用车型"; + case "lawsYear": return "年度"; + case "lawsNotisyncNum": return "福田转发通知文号"; + case "lawsBulletin": return "信息简报"; default: String name = sarStandAttrDetailsEODao.selectNameByField(field,sarType); return name; From 57f550c0bf5b8db82c36ed6ba5b55eee9a949c02 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 5 Apr 2022 20:31:35 +0800 Subject: [PATCH 46/64] feat: There is no way the, bug #52284 #52278 --- .../entity/SarLawsStandInfoExport.java | 298 ++++++++++++++++++ .../entity/SarLawsStandInfoPage.java | 5 + .../impl/SarLawsStandInfoServiceImpl.java | 21 +- .../SarLawsStandInfoMapper.xml | 55 +++- .../impl/PersonCollectEOServiceImpl.java | 6 +- 5 files changed, 372 insertions(+), 13 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoExport.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoExport.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoExport.java new file mode 100644 index 00000000..ab53c4bc --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoExport.java @@ -0,0 +1,298 @@ +package com.adc.da.slrs.sarLawsStandInfo.entity; + +import com.adc.da.att.vo.AttFileVo; +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.slrs.sarStandItems.entity.SarStandItems; +import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO; +import com.adc.da.sys.entity.DicTypeEO; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.*; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-10-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarLawsStandInfo对象", description="") +public class SarLawsStandInfoExport extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + @ApiModelProperty(value = "政策分类 共四级，逐级选择-配置管理中维护") + @TableField("LAWS_TYPE") + private String lawsType; + + @ApiModelProperty(value = "政策编号") + @TableField("LAWS_NUMBER") + private String lawsNumber; + + @ApiModelProperty(value = "中文名称") + @TableField("LAWS_NAME") + private String lawsName; + + @ApiModelProperty(value = "英文名称") + @TableField("LAWS_EN_NAME") + private String lawsEnName; + + @ApiModelProperty(value = "政策文号") + @TableField("LAWS_NO") + private String lawsNo; + + @ApiModelProperty(value = "发文日期") + @TableField("ISSUE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String issueTime; + + @ApiModelProperty(value = "发文单位") + @TableField("ISSUE_COMPANY") + private String issueCompany; + + @ApiModelProperty(value = "征集意见周期-起始时间") + @TableField("COMMENT_CYCLE_START") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String commentCycleStart; + + @ApiModelProperty(value = "征集意见周期-结束时间") + @TableField("COMMENT_CYCLE_END") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String commentCycleEnd; + + @ApiModelProperty(value = "文件状态-配置管理中维护") + @TableField("LAWS_TEXT_STATE") + private String lawsTextState; + + @ApiModelProperty(value = "适用区域-配置管理中维护") + @TableField("LAWS_SYQY") + private String lawsSyqy; + + @ApiModelProperty(value = "适用车型-配置管理中维护") + @TableField("LAWS_SYCX") + private String lawsSycx; + + @ApiModelProperty(value = "是/否（选择否，只有政策、政策中文名称是必填项目）") + @TableField("IS_RELATE_ACCESS") + private String isRelateAccess; + + @ApiModelProperty(value = "年度-可在配置管理中维护，根据发布日期自动带入可手动修改") + @TableField("LAWS_YEAR") + private String lawsYear; + + @ApiModelProperty(value = "福田转发通知文号") + @TableField("LAWS_NOTISYNC_NUM") + private String lawsNotisyncNum; + + @ApiModelProperty(value = "信息简报 xxx期次xxx板块") + @TableField("LAWS_BULLETIN") + private String lawsBulletin; + + @ApiModelProperty(value = "标签-可在配置管理中维护") + @TableField("LAWS_LABEL") + private String lawsLabel; + + @ApiModelProperty(value = "备注") + @TableField("LAWS_REMARK") + private String lawsRemark; + + @ApiModelProperty(value = "国家地区") + @TableField("COUNTRY") + private String country; + + @TableField("CREATION_USER") + private String creationUser; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private Integer validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + @ApiModelProperty(value = "参数1") + @TableField("PARAM1") + private Long param1; + + @ApiModelProperty(value = "参数2") + @TableField("PARAM2") + private String param2; + + // 非表字段 + @ApiModelProperty(value = "代替文件号") + @TableField(exist = false) + private String replaceFileNum; + + @ApiModelProperty(value = "被代替文件号") + @TableField(exist = false) + private String replacedFileNum; + + @TableField(exist = false) + private String processNum;//流程编号 + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String firstPutTime; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String putTimeShow; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String issueTimeShow; + + @TableField(exist = false) + private String issueTimeStr; + + @TableField(exist = false) + private String putTimeStr; + + //目录ID 非标准信息表中的字段 + @TableField(exist = false) + private String menuId; + + @TableField(exist = false) + private String menuParentId; + + @TableField(exist = false) + private String standStatusShow; // 标准状态下拉框 --单选 + + @TableField(exist = false) + private String standNatrueShow; + + @TableField(exist = false) + private String standSortShow; + + @TableField(exist = false) + private String applyCountryShow; + + @TableField(exist = false) + private List standFileList = new ArrayList(); + + @TableField(exist = false) + private List opinionFilesList = new ArrayList(); + + @TableField(exist = false) + private List relevanceFileList = new ArrayList(); + + @TableField(exist = false) + private String collectId; + + //文件的类型 + @TableField(exist = false) + private String standFileClassify; + + //文件的下载id + @TableField(exist = false) + private String attId; + + //记录是否修改了替代文件号 + @TableField(exist = false) + private int upReplaceNumFlag; + //记录是否修改了文件号 + @TableField(exist = false) + private int upNumFlag; + // 数据库新加的字段 + + @TableField(exist = false) + private String remark;//备注 + + @TableField(exist = false) + private Map attrInfoMap = new LinkedHashMap<>(); //属性表字段与值 + + @TableField(exist = false) + private Map attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染 + + @TableField(exist = false) + private String sarStandAttrEOStr; //新增修改时属性表信息 + + @TableField(exist = false) + private String fileIds; //全部文件ID + + @TableField(exist = false) + private List attrInfoList = new ArrayList<>(); + + @TableField(exist = false) + private String standTextStatusShow; // 标准文本状态显示名称 + // 以下为非表中字段 + @TableField(exist = false) + private String countryShow; //国家地区显示名称 + @TableField(exist = false) + private String standStateShow; // 标准状态显示名称 + @TableField(exist = false) + private String standNatureShow; // 标准性质显示名称 + @TableField(exist = false) + private List dicTypeList = new ArrayList(); // 记录标准涉及到的所有数据字典数据 + + @TableField(exist = false) + private List itemsList = new ArrayList<>(); + @ApiModelProperty(value = "分解单条款内容") + @TableField(exist = false) + private Map mapItems = new TreeMap<>(); + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String XCXSSRQLAWS; // 新车实施日期 + + @TableField(exist = false) + private String SSRQLAWS; + @TableField(exist = false) + private String ZCXSSRQLAWS; + @TableField(exist = false) + private String ZCWBLAWS; + @TableField(exist = false) + private String GCWBLAWS; + @TableField(exist = false) + private String JDWJLAWS; + @TableField(exist = false) + private String CYSDLAWS; + @TableField(exist = false) + private String TGRLAWS; + @TableField(exist = false) + private String TGDWLAWS; + @TableField(exist = false) + private String NYLXLAWS; + @TableField(exist = false) + private String YYRZLAWS; + @TableField(exist = false) + private String ZRBMLAWS; + @TableField(exist = false) + private String ZRGCSLAWS; + @TableField(exist = false) + private String DTWJHLAWS; + @TableField(exist = false) + private String BDTWJHLAWS; + @TableField(exist = false) + private String YYBZZCLAWS; + @TableField(exist = false) + private String XGLC; + @TableField(exist = false) + private String CHJLLAWS; + @TableField(exist = false) + private String GLWJLAWS; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java index c75c082d..0753b998 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java @@ -274,4 +274,9 @@ public class SarLawsStandInfoPage extends BasePage { @TableField(exist = false) private String order1 = ""; + @TableField(exist = false) + private String exportAllAttrInfo; + @TableField(exist = false) + private String exportAllResult; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 0cacdd48..58c6c954 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -145,8 +145,11 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl getSarStandardsInfoPage(SarLawsStandInfoPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 - String userId = UserUtils.getUserId(); - if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(userId)){ + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } + + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ QueryWrapper qw = new QueryWrapper<>(); qw.eq("ID",page.getMenuId()); qw.isNull("PARENT_ID"); @@ -486,6 +489,20 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl list = Arrays.asList(fieldInfo.split(",")).stream().map(s -> String.format("SAR_BUSS_STAND_ATTR_INFO."+s.trim())).collect(Collectors.toList()); + List listSelect = Arrays.asList(fieldInfo.split(",")).stream().map(s -> String.format("tmp_tb."+s.trim())).collect(Collectors.toList()); + String exportAllAttrInfo = list.stream().collect(Collectors.joining(",")); + String exportAllResult = listSelect.stream().collect(Collectors.joining(",")); + if(StringUtils.isNotBlank(exportAllAttrInfo)){ + page.setExportAllAttrInfo(exportAllAttrInfo); + } + + if(StringUtils.isNotBlank(exportAllResult)){ + page.setExportAllResult(exportAllResult); + } + List rows = this.baseMapper.getSarStandardsExportInfo(page); attrInfoShowExport(rows); return rows; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml index 459621b6..d7a181a3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml @@ -6,7 +6,7 @@ - + @@ -178,7 +178,7 @@ and SAR_LAWS_STAND_INFO.id in ( select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0 - and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND') + and (collect_type='FOREIGN_LAWS') and TS_PERSON_COLLECT.user_id=#{userId} ) @@ -280,9 +280,7 @@ GROUP BY SAR_LAWS_STAND_INFO.id) a - + SELECT + + , ${exportAllResult} + + FROM ( + select + + , ${exportAllAttrInfo} + + from SAR_LAWS_STAND_INFO + + ) tmp_tb order by ${orderByA} ${order1}, - SAR_LAWS_STAND_INFO.id + tmp_tb.issue_time is null,tmp_tb.issue_time desc,tmp_tb.id @@ -433,7 +470,7 @@ and SAR_LAWS_STAND_INFO.id in ( select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0 - and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND') + and (collect_type='FOREIGN_LAWS') and TS_PERSON_COLLECT.user_id=#{userId} ) diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java index bb0cd153..7b96410a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -137,8 +138,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl ids = new ArrayList<>(Arrays.asList(modeType.split(","))); + wrapper.in("collect_type",ids); } if (pageNo != null) { From 9540bb31929d9d6335f471c50dac279f1a27465a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 6 Apr 2022 01:01:33 +0800 Subject: [PATCH 47/64] feat: There is no way the, bug #52285 --- .../SarLawsStandInfoController.java | 3 +- .../dao/SarLawsStandInfoDao.java | 3 +- .../service/ISarLawsStandInfoService.java | 3 +- .../impl/SarLawsStandInfoServiceImpl.java | 59 ++++++++++--- .../adc/da/utils/util/FieldConvertUtil.java | 4 +- .../da/utils/util/LawsStandExportUtil.java | 49 ++++++++--- .../SarLawsStandInfoMapper.xml | 85 +++++++++++++------ 7 files changed, 148 insertions(+), 58 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java index 34a6d875..9620fbbb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarLawsStandInfo.controller; import com.adc.da.common.ReadExcel; import com.adc.da.exception.AdcDaBaseException; import com.adc.da.person.service.IPersonCollectEOService; +import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoExport; import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage; import com.adc.da.slrs.sarLawsStandInfo.service.ISarLawsStandInfoService; import com.adc.da.slrs.sarResource.service.ITsResourceService; @@ -191,7 +192,7 @@ public class SarLawsStandInfoController extends BaseController @GetMapping(value = "/exportStandardsInfoExcel") public void exportStandardsInfoExcel(String exportContent, String exportType, String exportName,String userId, HttpServletResponse response, HttpServletRequest request) throws Exception { - List data = sarLawsInfoEOService.getExportData(exportType,exportContent,userId); + List data = sarLawsInfoEOService.getExportData(exportType,exportContent,userId); OutputStream os = null; Workbook workbook = null; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/dao/SarLawsStandInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/dao/SarLawsStandInfoDao.java index 8ca5a2a3..12f498f7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/dao/SarLawsStandInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/dao/SarLawsStandInfoDao.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarLawsStandInfo.dao; import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo; +import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoExport; import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Repository; @@ -24,7 +25,7 @@ public interface SarLawsStandInfoDao extends BaseMapper { List selectStandardsInfoByKey(String id); - List getSarStandardsExportInfo(SarLawsStandInfoPage page); + List getSarStandardsExportInfo(SarLawsStandInfoPage page); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java index a4a7b022..70a7fd55 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarLawsStandInfo.service; import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo; +import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoExport; import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; @@ -32,7 +33,7 @@ public interface ISarLawsStandInfoService extends IService { SarLawsStandInfoPage updateStandardsMenu(SarLawsStandInfoPage standardsInfoEO); - List getExportData(String exportType, String exportContent,String userId) throws Exception; + List getExportData(String exportType, String exportContent, String userId) throws Exception; List getSarStandardsInfoPage(SarLawsStandInfoPage page) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 58c6c954..da5cafee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -36,6 +36,7 @@ import com.adc.da.slrs.sarLawsMenu.dao.SarLawsMenuDao; import com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu; import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo; import com.adc.da.slrs.sarLawsStandInfo.dao.SarLawsStandInfoDao; +import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoExport; import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage; import com.adc.da.slrs.sarLawsStandInfo.service.ISarLawsStandInfoService; import com.adc.da.slrs.sarLawsVal.dao.SarLawsValDao; @@ -60,6 +61,7 @@ import com.adc.da.utils.util.SarAdvanceSearchUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang.StringUtils; import org.json.JSONTokener; import org.springframework.beans.factory.annotation.Autowired; @@ -323,11 +325,13 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl getAttrMap = sarLawsAttrInfoDao.selectLawsFieldAndData(fieldInfo,row.getId()); + List list = Arrays.asList(fieldInfo.split(",")).stream().map(s -> String.format(s.trim())).collect(Collectors.toList()); + + Map getAttrMap = BeanUtils.describe(row); if (InitStandAttrUtil.clobFieldListLaws != null && !InitStandAttrUtil.clobFieldListLaws.isEmpty()) { // 遍历修改所有clob类型的值 for (String clobField : InitStandAttrUtil.clobFieldListLaws) { @@ -341,7 +345,13 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl entry : getAttrMap.entrySet()) { String name = entry.getKey(); + List filterList = list.stream().filter(a -> name.equals(a)).collect(Collectors.toList()); + if(filterList.isEmpty()){ + newMap.remove(name); + continue; + } Object value1 = entry.getValue(); + if (value1 != null && value1.toString().equals("\"null\"")){ entry.setValue(""); } @@ -440,7 +450,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl getExportData(String exportType, String exportContent,String userId) throws Exception { + public List getExportData(String exportType, String exportContent,String userId) throws Exception { SarLawsStandInfoPage page = new SarLawsStandInfoPage(); if ("apart".equals(exportType)) { page.setIdlist(exportContent.split(",")); @@ -489,9 +499,9 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl list = Arrays.asList(fieldInfo.split(",")).stream().map(s -> String.format("SAR_BUSS_STAND_ATTR_INFO."+s.trim())).collect(Collectors.toList()); + List list = Arrays.asList(fieldInfo.split(",")).stream().map(s -> String.format("SAR_LAWS_ATTR_INFO."+s.trim())).collect(Collectors.toList()); List listSelect = Arrays.asList(fieldInfo.split(",")).stream().map(s -> String.format("tmp_tb."+s.trim())).collect(Collectors.toList()); String exportAllAttrInfo = list.stream().collect(Collectors.joining(",")); String exportAllResult = listSelect.stream().collect(Collectors.joining(",")); @@ -503,7 +513,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl rows = this.baseMapper.getSarStandardsExportInfo(page); + List rows = this.baseMapper.getSarStandardsExportInfo(page); attrInfoShowExport(rows); return rows; } @@ -577,8 +587,15 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl sarlist) throws Exception { - for(SarLawsStandInfo row : sarlist){ + public void attrInfoShowExport (List sarlist) throws Exception { + + //查询字典表,形成Hash映射提升速度 + List dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); + Map dicMap = dicInfo.stream() + .filter(item-> !item.getDicTypeCode().isEmpty()) + .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2)); + + for(SarLawsStandInfoExport row : sarlist){ attrInfoDetailsExport(row); Map getAttrMap = row.getAttrInfoMap(); Map getNewMap = new LinkedHashMap<>(); @@ -588,11 +605,11 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl 0 && InitStandAttrUtil.fileFieldListLaws.contains(name)) { - value = entry.getValue().toString(); - if (StringUtils.isNotBlank(value)) { - List fileObj = attFileEOService.getMultiFileInfos(value); - entry.setValue(fileObj); - } +// value = entry.getValue().toString(); +// if (StringUtils.isNotBlank(value)) { +// List fileObj = attFileEOService.getMultiFileInfos(value); +// entry.setValue(fileObj); +// } } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListLaws != null && InitStandAttrUtil.selectionFieldListLaws.size() > 0 && InitStandAttrUtil.selectionFieldListLaws.contains(name)) { value = entry.getValue().toString(); String selVal = InitStandAttrUtil.selectFieldMapLaws.get(name); @@ -606,7 +623,21 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl valArr = Arrays.asList(value.split(",")); - value = dicTypeEODao.getDicNamesByCodes(valArr,""); + if(entry.getValue()!=null) { + StringBuilder builder = new StringBuilder(""); + for (String s : valArr) { + if (dicMap.containsKey(s) && !"ZRBM".equals(name)){ + builder.append(dicMap.get(s)+","); + } + + } + + if (builder.toString().isEmpty()){ + value = entry.getValue().toString(); + }else { + value = builder.toString(); + } + } } entry.setValue(value); } 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 8541ab3b..18a5bf30 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 @@ -47,8 +47,8 @@ public class FieldConvertUtil { "EOP实施日期（文本）,责任部门,相关部门,SVPPS,FO,项目评估角色,法规维护人,代替标准编号," + "对应其他标准,文字描述,等效标准,引用标准,被引用标准,覆盖关系"; - public static String exportBaseFieldNamesLaws = "政策分类,政策编号,中文名称,英文名称,政策文号,发文日期,发文单位,征集意见周期-起始时间,征集意见周期-结束时间,文本状态," + - "适用区域,适用车型,是否纳入认证清单,年度,福田转发通知文号,信息简报,标签,备注"; + public static String exportBaseFieldNamesLaws = "政策分类,政策编号,政策名称,英文名称,政策文号,发文日期,发文单位,征集意见周期-起始时间,征集意见周期-结束时间,文本状态," + + "适用区域,适用车型,是否纳入认证清单,年度,福田转发通知文号,信息简报,标签,备注（最终政策发布）"; public static String exportAttrFieldNamesLaws = "适用车辆类型,要求类型," + "个性化标签,政策文本,过程稿件,新车型实施日期（文本）,在产车实施日期（文本）,EOP实施日期（文本）,SVPPS," + diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/LawsStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/LawsStandExportUtil.java index e7c63cfa..bd2845cf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/LawsStandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/LawsStandExportUtil.java @@ -2,6 +2,7 @@ package com.adc.da.utils.util; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo; +import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoExport; import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails; import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.usermodel.*; @@ -10,10 +11,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * @Description: 标准导出工具 @@ -24,11 +23,11 @@ public class LawsStandExportUtil { private static final Logger logger = LoggerFactory.getLogger(LawsStandExportUtil.class); - public static Workbook exportDatas (List datas) { + public static Workbook exportDatas (List datas) { Workbook workbook = new XSSFWorkbook(); try { StringBuilder attrBud = new StringBuilder(); - List detailsEOList = InitStandAttrUtil.lawsStandAttrFieldList; + List detailsEOList = InitStandAttrUtil.lawsForeignAttrFieldList; Map attrInfoMap = new HashMap<>(); for (SarStandAttrDetails detailsEO : detailsEOList) { if (!InitStandAttrUtil.fileFieldListLaws.contains(detailsEO.getAttrField())) { @@ -62,13 +61,13 @@ public class LawsStandExportUtil { } } - public static void createDatas(Workbook workbook,Sheet sheet,List datas, + public static void createDatas(Workbook workbook,Sheet sheet,List datas, String header,Map attrInfoMap) throws Exception{ CellStyle cellStyle = workbook.createCellStyle();//初始化单元格格式对象 cellStyle.setAlignment(HorizontalAlignment.CENTER); if (datas != null && !datas.isEmpty()) { for (int i=0;i < datas.size(); i++) { - SarLawsStandInfo sarStandardsInfoEO = datas.get(i); + SarLawsStandInfoExport sarStandardsInfoEO = datas.get(i); Row row = sheet.createRow(i+1); String[] headerArr = header.split(","); int sheetNum = 0; @@ -85,7 +84,7 @@ public class LawsStandExportUtil { } // 根据表头返回相应值 - public static String getValueByName (String name,SarLawsStandInfo sarStandardsInfoEO,Map attrInfoMap) throws Exception{ + public static String getValueByName (String name,SarLawsStandInfoExport sarStandardsInfoEO,Map attrInfoMap) throws Exception{ String value = ""; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map attrValueMap = sarStandardsInfoEO.getAttrInfoMap(); @@ -96,7 +95,7 @@ public class LawsStandExportUtil { case "政策编号": value = verifyBean(sarStandardsInfoEO.getLawsNumber()); break; - case "中文名称": + case "政策名称": value = verifyBean(sarStandardsInfoEO.getLawsName()); break; case "英文名称": @@ -114,6 +113,11 @@ public class LawsStandExportUtil { issueTime=sarStandardsInfoEO.getIssueTime(); } value = issueTime; + if(StringUtils.isNotBlank(value)){ + if (value.length()>10){ + value = value.substring(0,10); + } + } break; case "发文单位": value = verifyBean(sarStandardsInfoEO.getIssueCompany()); @@ -126,6 +130,11 @@ public class LawsStandExportUtil { commentCycleStart=sarStandardsInfoEO.getCommentCycleStart(); } value = commentCycleStart; + if(StringUtils.isNotBlank(value)){ + if (value.length()>10){ + value = value.substring(0,10); + } + } break; case "征集意见周期-结束时间": String commentCycleEnd=""; @@ -135,6 +144,11 @@ public class LawsStandExportUtil { commentCycleEnd=sarStandardsInfoEO.getCommentCycleEnd(); } value = commentCycleEnd; + if(StringUtils.isNotBlank(value)){ + if (value.length()>10){ + value = value.substring(0,10); + } + } break; case "文本状态": value = verifyBean(sarStandardsInfoEO.getStandStatusShow()); @@ -160,14 +174,25 @@ public class LawsStandExportUtil { case "标签": value = verifyBean(sarStandardsInfoEO.getLawsLabel()); break; - case "备注": + case "备注（最终政策发布）": value = verifyBean(sarStandardsInfoEO.getLawsRemark()); break; default: + List list = new ArrayList<>(); + List dateList = InitStandAttrUtil.timeFieldListLaws; + List dateList2 = InitStandAttrUtil.multiTimeFieldListLaws; + list.addAll(dateList); + list.addAll(dateList2); String field = attrInfoMap.get(name); if (attrValueMap != null) { + List finalData = list.stream().filter(field::contains).collect(Collectors.toList()); value = String.valueOf(attrValueMap.get(field)); - } + if (!finalData.isEmpty()) { + if (value.length()>10){ + value = value.substring(0,10); + } + } + } break; } return value; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml index d7a181a3..9ebd7e9a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml @@ -295,10 +295,10 @@ laws_sycx_show.DIC_TYPE_NAME as LAWS_SYCX, laws_syqy_show.DIC_TYPE_NAME as LAWS_SYQY, SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS, - SAR_LAWS_STAND_INFO.LAWS_YEAR, + laws_year_show.DIC_TYPE_NAME as LAWS_YEAR, SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM, SAR_LAWS_STAND_INFO.LAWS_BULLETIN, - SAR_LAWS_STAND_INFO.LAWS_LABEL, + laws_label_show.DIC_TYPE_NAME as LAWS_LABEL, SAR_LAWS_STAND_INFO.LAWS_REMARK, SAR_LAWS_STAND_INFO.COUNTRY, SAR_LAWS_STAND_INFO.MODIFY_TIME, @@ -306,28 +306,47 @@ - DISTINCT SAR_LAWS_STAND_INFO.ID, - laws_type_show.DIC_TYPE_NAME as LAWS_TYPE, - SAR_LAWS_STAND_INFO.LAWS_NUMBER, - SAR_LAWS_STAND_INFO.LAWS_NAME, - SAR_LAWS_STAND_INFO.LAWS_EN_NAME, - SAR_LAWS_STAND_INFO.LAWS_NO, - SAR_LAWS_STAND_INFO.ISSUE_TIME, - SAR_LAWS_STAND_INFO.ISSUE_COMPANY, - SAR_LAWS_STAND_INFO.COMMENT_CYCLE_START, - SAR_LAWS_STAND_INFO.COMMENT_CYCLE_END, - SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE, - laws_sycx_show.DIC_TYPE_NAME as LAWS_SYCX, - laws_syqy_show.DIC_TYPE_NAME as LAWS_SYQY, - SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS, - SAR_LAWS_STAND_INFO.LAWS_YEAR, - SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM, - SAR_LAWS_STAND_INFO.LAWS_BULLETIN, - SAR_LAWS_STAND_INFO.LAWS_LABEL, - SAR_LAWS_STAND_INFO.LAWS_REMARK, - SAR_LAWS_STAND_INFO.COUNTRY, - SAR_LAWS_STAND_INFO.MODIFY_TIME, - dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow + DISTINCT tmp_tb.ID, + tmp_tb.LAWS_TYPE, + tmp_tb.LAWS_NUMBER, + tmp_tb.LAWS_NAME, + tmp_tb.LAWS_EN_NAME, + tmp_tb.LAWS_NO, + tmp_tb.ISSUE_TIME, + tmp_tb.ISSUE_COMPANY, + tmp_tb.COMMENT_CYCLE_START, + tmp_tb.COMMENT_CYCLE_END, + tmp_tb.LAWS_TEXT_STATE, + tmp_tb.LAWS_SYCX, + tmp_tb.LAWS_SYQY, + tmp_tb.IS_RELATE_ACCESS, + tmp_tb.LAWS_YEAR, + tmp_tb.LAWS_NOTISYNC_NUM, + tmp_tb.LAWS_BULLETIN, + tmp_tb.LAWS_LABEL, + tmp_tb.LAWS_REMARK, + tmp_tb.COUNTRY, + tmp_tb.MODIFY_TIME, + tmp_tb.standStatusShow, + tmp_tb.SSRQLAWS, + tmp_tb.XCXSSRQLAWS, + tmp_tb.ZCXSSRQLAWS, + tmp_tb.ZCWBLAWS, + tmp_tb.GCWBLAWS, + tmp_tb.JDWJLAWS, + tmp_tb.CYSDLAWS, + tmp_tb.TGRLAWS, + tmp_tb.TGDWLAWS, + tmp_tb.NYLXLAWS, + tmp_tb.YYRZLAWS, + tmp_tb.ZRBMLAWS, + tmp_tb.ZRGCSLAWS, + tmp_tb.DTWJHLAWS, + tmp_tb.BDTWJHLAWS, + tmp_tb.YYBZZCLAWS, + tmp_tb.XGLC, + tmp_tb.CHJLLAWS, + tmp_tb.GLWJLAWS + + From f5f693863c7753c613172b264c012486279e97c4 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 11 Apr 2022 16:27:00 +0800 Subject: [PATCH 53/64] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=A7=84=E5=88=92?= =?UTF-8?q?=E9=83=A8=E5=AE=A1=E6=9F=A5=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProductDeptIssueService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java index ea9ba0c4..29f1be0d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java @@ -40,6 +40,7 @@ public class ProductDeptIssueService extends ServiceImpl page=new Page<>(objVo.getPage(),objVo.getPage()); QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("is_close","0"); if (objVo.getLawsNumber()!=null){ wrapper.like("laws.LAWS_NAME",objVo.getLawsName()) From 9c0326c7226d1decc2f4345b84b289ee22110b6e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 11 Apr 2022 16:56:02 +0800 Subject: [PATCH 54/64] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=A7=84=E5=88=92?= =?UTF-8?q?=E9=83=A8=20=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProductDeptIssueService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java index 29f1be0d..154f8928 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java @@ -40,7 +40,11 @@ public class ProductDeptIssueService extends ServiceImpl page=new Page<>(objVo.getPage(),objVo.getPage()); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("is_close","0"); + //查询条件 + if (objVo.getIsClose()!=null){ + wrapper.like("is_close",objVo.getIsClose()); + } + if (objVo.getLawsNumber()!=null){ wrapper.like("laws.LAWS_NAME",objVo.getLawsName()) From bbaab05b58794bbbadc6dcfebb53957d3ba3b78f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 11 Apr 2022 17:36:52 +0800 Subject: [PATCH 55/64] feat: There is no way the, bug #52285 --- .../impl/SarLawsStandInfoServiceImpl.java | 11 ++++++-- .../SarLawsStandInfoMapper.xml | 28 ++++--------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 91dfa614..01d9e28d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -373,9 +373,9 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl getAttrMap = row.getAttrInfoMap(); Map getNewMap = new LinkedHashMap<>(); if (getAttrMap != null && getAttrMap.size() > 0) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml index 9ebd7e9a..84cce101 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml @@ -282,7 +282,7 @@ DISTINCT SAR_LAWS_STAND_INFO.ID, - laws_type_show.DIC_TYPE_NAME as LAWS_TYPE, + SAR_LAWS_STAND_INFO.LAWS_TYPE, SAR_LAWS_STAND_INFO.LAWS_NUMBER, SAR_LAWS_STAND_INFO.LAWS_NAME, SAR_LAWS_STAND_INFO.LAWS_EN_NAME, @@ -292,13 +292,13 @@ SAR_LAWS_STAND_INFO.COMMENT_CYCLE_START, SAR_LAWS_STAND_INFO.COMMENT_CYCLE_END, SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE, - laws_sycx_show.DIC_TYPE_NAME as LAWS_SYCX, - laws_syqy_show.DIC_TYPE_NAME as LAWS_SYQY, + SAR_LAWS_STAND_INFO.LAWS_SYCX, + SAR_LAWS_STAND_INFO.LAWS_SYQY, SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS, - laws_year_show.DIC_TYPE_NAME as LAWS_YEAR, + SAR_LAWS_STAND_INFO.LAWS_YEAR, SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM, SAR_LAWS_STAND_INFO.LAWS_BULLETIN, - laws_label_show.DIC_TYPE_NAME as LAWS_LABEL, + SAR_LAWS_STAND_INFO.LAWS_LABEL, SAR_LAWS_STAND_INFO.LAWS_REMARK, SAR_LAWS_STAND_INFO.COUNTRY, SAR_LAWS_STAND_INFO.MODIFY_TIME, @@ -384,24 +384,6 @@ AND dicstandTextStatus.dic_id IS NOT NULL AND dicstandTextStatus.valid_flag = 0 ) - - LEFT JOIN TS_DICTYPE laws_label_show ON ( - laws_label_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_LABEL - AND dicstandTextStatus.dic_id IS NOT NULL - AND dicstandTextStatus.valid_flag = 0 - ) - - LEFT JOIN TS_DICTYPE laws_sycx_show ON ( - laws_sycx_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_SYCX - AND dicstandTextStatus.dic_id IS NOT NULL - AND dicstandTextStatus.valid_flag = 0 - ) - - LEFT JOIN TS_DICTYPE laws_syqy_show ON ( - laws_syqy_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_SYQY - AND dicstandTextStatus.dic_id IS NOT NULL - AND dicstandTextStatus.valid_flag = 0 - ) LEFT JOIN TS_DICTYPE laws_type_show ON ( laws_type_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_TYPE From f96714b0d2961312b78734df108aa5426a0cb041 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 12 Apr 2022 17:40:20 +0800 Subject: [PATCH 56/64] =?UTF-8?q?4-12=20=E5=AE=A1=E6=9F=A5=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=85=A5=E5=BA=93=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/login/rest/LoginRestController.java | 34 ++++- .../ProductDeptIssueController.java | 5 +- .../dao/BusinessDeptIssueDao.java | 3 +- .../dao/ProductDeptIssueDao.java | 4 +- .../entity/BusinessDeptIssue.java | 129 ++++++++++-------- .../entity/ProductDeptIssue.java | 85 ++++++------ .../impl/BusinessDeptIssueService.java | 8 +- .../service/impl/ProductDeptIssueService.java | 44 +++--- .../BusinessDeptIssuempaaer.xml | 25 +++- .../ProductDeptIssuempaaer.xml | 70 +++++++++- 10 files changed, 266 insertions(+), 141 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java index 7ec36fb3..d4867481 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -8,6 +8,7 @@ import com.adc.da.login.util.IDMUtil; import com.adc.da.login.util.JwtUtils; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; +import com.adc.da.util.Encodes; import com.adc.da.util.PasswordUtils; import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; @@ -17,10 +18,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import sun.misc.BASE64Encoder; import javax.servlet.http.Cookie; @@ -29,6 +27,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.List; @@ -78,6 +77,33 @@ public class LoginRestController { } } + @ApiOperation(value = "登录") +// @GetMapping(value = "/login") + @GetMapping(value = "/checkPage") + @ResponseBody + public ResponseMessage checkPage(@RequestParam @NotNull(message = "请输入用户名") String username) throws UnsupportedEncodingException { + username =new String(Encodes.decodeBase64(username), StandardCharsets.UTF_8); + UserEO userEO = userService.getUserByLoginNameNotDeleted(username); + if (null == userEO) { + log.info("用户[{}]身份验证失败", username); + return Result.error("r0011", "您输入的帐号不存在"); + } + if(userEO.getDisableFlag()==1){ + log.info("用户[{}]身份验证失败", username); + return Result.error("r0011", "您输入的帐号已禁用"); + } + + String token = jwtUtils.generateToken(userEO.getUsid()); + // 加密重要信息 + BASE64Encoder encoder = new BASE64Encoder(); + userEO.setToken(token); + String userStr = JSON.toJSONString(userEO); + String userStr2 = URLEncoder.encode(userStr,"UTF-8"); + userStr = encoder.encode(userStr2.getBytes()); + return Result.success(userStr); + + } + @ApiOperation(value = "登录") @PostMapping(value = "/loginIdm") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java index 2153a48b..87df8d40 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java @@ -53,7 +53,7 @@ public class ProductDeptIssueController { @GetMapping @ApiOperation("查询产品规划部重点问题") - public ResponseMessage> getProductDeptIssue(@RequestParam ProductDeptIssueVo wrapper){ + public ResponseMessage> getProductDeptIssue(ProductDeptIssueVo wrapper){ IPage issueList = iProductDeptIssueService.getProductDeptIssue(wrapper); return Result.success(issueList); } @@ -64,7 +64,8 @@ public class ProductDeptIssueController { boolean b = iProductDeptIssueService.updateProductDeptIssue(issue); return Result.success(b); } - +// 多态对接口具有可替换性接口 灵活性简化性易拓展 可替换的概念可以理解伟方法可以被同类重用 +// 可扩充性可以理解为该方法可以添加子类而不影响现有代码，接口性就是指的是向子类提供一个公用的高级接口子类来集成完善这个接口中的方法来实现要求。 @PostMapping("/closeProductIssue") @ApiOperation("关闭产品规划部重点问题") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java index 7ceffc8f..7416fb46 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java @@ -15,5 +15,6 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface BusinessDeptIssueDao extends BaseMapper { - IPage findPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage findPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper + ,@Param("dept") String dept); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java index ccef897d..1ddac4bf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandUnqualified.dao; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; +import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssueVo; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,5 +12,6 @@ import org.apache.ibatis.annotations.Param; public interface ProductDeptIssueDao extends BaseMapper { - public IPage findPage(IPage page,@Param(Constants.WRAPPER) QueryWrapper wrapper); + public IPage findPage1(IPage page,@Param(Constants.WRAPPER) QueryWrapper wrapper); + public IPage findPage(IPage page, @Param("ew") ProductDeptIssueVo objVo); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java index 3f4d6a3b..a10bce66 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java @@ -19,82 +19,91 @@ import java.util.Date; public class BusinessDeptIssue { - @ExcelIgnore - @TableId - private String id; + @ExcelIgnore + @TableId + private String id; - @ExcelIgnore - @TableField("law_id") - private String lawId; + @ExcelIgnore + @TableField("law_id") + private String lawId; - @ExcelProperty("标准号") - @TableField(exist = false) - private String lawNumber; + @ExcelProperty("标准号") + @TableField(exist = false) + private String lawNumber; - @ExcelProperty("标准名称") - @TableField(exist = false) - private String lawName; + @ExcelProperty("标准名称") + @TableField(exist = false) + private String lawName; - @ExcelProperty("产品类别") - @TableField("product_type") - private String productType; + @ExcelProperty("产品类别") + @TableField("product_type") + private String productType; - @ExcelProperty("实施实践") - @TableField("impl_time") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") - private Date implTime; + @ExcelProperty("实施实践") + @TableField("impl_time") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") + private Date implTime; - @ExcelProperty("实施要求") - @TableField("impl_require") - private String implRequire; + @ExcelProperty("实施要求") + @TableField("impl_require") + private String implRequire; - @ExcelProperty("资源符合状态") - @TableField("conform_situation") - private String conformSituation; + @ExcelProperty("资源符合状态") + @TableField("conform_situation") + private String conformSituation; - @ExcelProperty("开发情况") - @TableField("dev_scheme") - private String devScheme; + @ExcelProperty("开发情况") + @TableField("dev_scheme") + private String devScheme; - @ExcelProperty("sop时间") - @TableField("sop_time") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") - private Date sopTime; + @ExcelProperty("sop时间") + @TableField("sop_time") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") + private Date sopTime; - @ExcelProperty("完成情况") - @TableField("complete_situation") - private String completeSituation; + @ExcelProperty("完成情况") + @TableField("complete_situation") + private String completeSituation; - @ExcelProperty("超出sop时限后计划") - @TableField("timeout_situation") - private String timeoutSituation; + @ExcelProperty("超出sop时限后计划") + @TableField("timeout_situation") + private String timeoutSituation; - @ExcelIgnore - @TableLogic(value = "0",delval = "1") - @TableField("del_flag") - private String delFlag; + @ExcelIgnore + @TableLogic(value = "0", delval = "1") + @TableField("del_flag") + private String delFlag; - @ExcelProperty("责任部门") - @TableField("response_dept") - private String responseDept; + @ExcelProperty("责任部门") + @TableField("response_dept") + private String responseDept; - @ExcelProperty("责任人") - @TableField("response_people") - private String responsePeople; + @ExcelProperty("责任人") + @TableField("response_people") + private String responsePeople; - @ExcelIgnore - @TableField("is_close") - private String isClose; + @ExcelIgnore + @TableField("is_close") + private String isClose; - @ExcelIgnore - @TableField("is_risk") - private String isRisk; + @ExcelIgnore + @TableField("is_risk") + private String isRisk; - @ExcelIgnore - @TableField(exist = false) - private Integer page; + @ExcelIgnore + @TableField(exist = false) + private Integer page; - @ExcelIgnore - @TableField(exist = false) - private Integer pageSize; + @ExcelIgnore + @TableField(exist = false) + private Integer pageSize; + + @TableField(exist = false) + private String responseInsId; + + @TableField(exist = false) + private String responseInsName; + + @TableField(exist = false) + private String responseUserName; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java index 2acb71ee..5642c802 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java @@ -15,60 +15,69 @@ import java.util.Date; @TableName("product_dept_issue") public class ProductDeptIssue { - @TableId - private String id; + @TableId + private String id; - @TableField("law_id") - private String lawId; + @TableField("law_id") + private String lawId; - @TableField(exist = false) - private String lawsNumber; + @TableField(exist = false) + private String lawsNumber; - @TableField(exist = false) - private String lawsName; + @TableField(exist = false) + private String lawsName; - @TableField("product_business") - private String productBusiness; + @TableField("product_business") + private String productBusiness; - @TableField("platform") - private String platform; + @TableField("platform") + private String platform; - @TableField("poj_name") - private String pojName; + @TableField("poj_name") + private String pojName; - @TableField("poj_description") - private String pojDescription; + @TableField("poj_description") + private String pojDescription; - @TableField("current_node") - private String currentNode; + @TableField("current_node") + private String currentNode; - @TableField("conceptual_state") - private String conceptualState; + @TableField("conceptual_state") + private String conceptualState; - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") - @TableField("scheduled_issuance_time") - private Date scheduledIssuanceTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") + @TableField("scheduled_issuance_time") + private Date scheduledIssuanceTime; - @TableField("revised_plan") - private String revisedPlan; + @TableField("revised_plan") + private String revisedPlan; - @TableField("explanation") - private String explanation; + @TableField("explanation") + private String explanation; - @TableField("response_dept") - private String responseDept; + @TableField("response_dept") + private String responseDept; - @TableLogic(value = "0",delval = "1") - @TableField("del_flag") - private String delFlag; + @TableLogic(value = "0", delval = "1") + @TableField("del_flag") + private String delFlag; - @TableField("is_close") - private String isClose; + @TableField("is_close") + private String isClose; - @TableField(exist = false) - private Integer page; + @TableField(exist = false) + private Integer page; - @TableField(exist = false) - private Integer pageSize; + @TableField(exist = false) + private Integer pageSize; + + @TableField(exist = false) + private String responseInsId; + + @TableField(exist = false) + private String responseInsName; + + @TableField(exist = false) + private String responseUserName; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java index b807d0c6..cc5a153b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java @@ -63,9 +63,9 @@ public class BusinessDeptIssueService extends ServiceImpl getProductDeptIssue(ProductDeptIssueVo objVo) { - IPage page=new Page<>(objVo.getPage(),objVo.getPage()); + IPage page=new Page<>(objVo.getPage(),objVo.getPageSize()); - QueryWrapper wrapper = new QueryWrapper<>(); - //查询条件 - if (objVo.getIsClose()!=null){ - wrapper.like("is_close",objVo.getIsClose()); - } - - - if (objVo.getLawsNumber()!=null){ - wrapper.like("laws.LAWS_NAME",objVo.getLawsName()) - .or() - .like("laws.LAWS_NUMBER",objVo.getLawsNumber()); - } - - if (objVo.getPojName()!=null){ - wrapper.like("poj_name",objVo.getPojName()); - } - - if (objVo.getResponseDept()!=null){ - wrapper.like("response_dept",objVo.getResponseDept()); - } - productDeptIssueDao.findPage(page,wrapper); +// QueryWrapper wrapper = new QueryWrapper<>(); +// //查询条件 +// if (objVo.getIsClose()!=null){ +// wrapper.like("is_close",objVo.getIsClose()); +// } +// +// +// if (objVo.getLawsNumber()!=null){ +// wrapper.like("laws.LAWS_NAME",objVo.getLawsName()) +// .or() +// .like("laws.LAWS_NUMBER",objVo.getLawsNumber()); +// } +// +// if (objVo.getPojName()!=null){ +// wrapper.like("poj_name",objVo.getPojName()); +// } +// +// if (objVo.getResponseDept()!=null){ +// wrapper.like("response_dept",objVo.getResponseDept()); +// } + productDeptIssueDao.findPage(page,objVo); return page; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml index 5ae76e9d..12aec4cc 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml @@ -23,22 +23,32 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml index fca51789..4130cd2c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml @@ -21,12 +21,72 @@ From 666480ff8645ba45f60a3bbbfddaca1b2f31baac Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 13 Apr 2022 10:01:46 +0800 Subject: [PATCH 57/64] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83=20=E4=B8=80=E8=88=AC?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=20=E6=96=B0=E5=A2=9E=E6=9D=83=E9=87=8D?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=A0=87=E5=87=86=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SearchCenterController.java | 6 +- .../service/impl/SearchCenterServiceImpl.java | 105 ++++++++++++++---- 2 files changed, 91 insertions(+), 20 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java index f3db7cf5..0f0047c5 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java +++ b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java @@ -86,7 +86,11 @@ public class SearchCenterController extends BaseController> if("fulltextserch".equals(searchInfoEO.getSelectIndex()) || "fulltextserch"== searchInfoEO.getSelectIndex()){ Pattern pattern = Pattern.compile("^[0-9a-zA-Z\\.\\(\\（\\）\\)\\s\\/\\-]+$"); if (null != searchInfoEO.getSelectValue() && StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { - result = searchCenterService.searchSarBykeyAndHighLight(searchInfoEO); + if (pattern.matcher(searchInfoEO.getSelectValue()).matches()) { + result = searchCenterService.searchSarBykeyAndHighLightNumber(searchInfoEO); + }else { + result = searchCenterService.searchSarBykeyAndHighLight(searchInfoEO); + } } else { result = searchCenterService.searchSarBykeyAndHighLight(searchInfoEO); } diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index ecd82781..56a7e230 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -760,7 +760,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { String[] standStr = {"content","standSort","standNumber","standYear","stand_name","standEnName","standNatureName", "textStatusName","isRelateAccessName","numbershow","standSystem","NYLXCLASS","CLLX"}; String[] lawsStr = {"content","lawsType","lawsNumber","lawsName","lawsEnName","lawsNo","issueCompany","lawsTextState","lawsSyqy","lawsSycx","isRelateAccess","lawsYear","lawsNotisyncNum","lawsBulletin","lawsLabel","lawsRemark"}; - String[] bussstandStr = {"content","standSort","stand_code","standYear","stand_name","standEnName","nameshow","standstateshow","numbershow","textStatusBuss","NYLXCLASS","CLLX"}; + String[] bussstandStr = {"content","standSort","stand_code","standYear","stand_name","standEnName","nameshow","standstateshow","numbershow","textStatusBuss","textStatusBussName","NYLXCLASS","CLLX"}; for (String field : fieldList) { // 关键字查询属性字段 String keyWordField2 = field + "Name"; @@ -1287,17 +1287,17 @@ public class SearchCenterServiceImpl implements SearchCenterService { @Override public List> searchSarBykeyAndHighLightNumber(SeniorSearchInfoEO searchInfoEO) throws Exception { String real = searchInfoEO.getSelectValue(); - String[] values = searchInfoEO.getSelectValue().split(" "); + boolean isReal = false; + int num = searchInfoEO.getSelectValue().indexOf(" "); String value = ""; String select = ""; - int i = 0; - for (String v: values){ - if(i==0) { - value = v; - }else{ - select = select + " " + v; - } - i++; + if (-1 != num) { + value = searchInfoEO.getSelectValue().substring(0, num).trim(); + select = searchInfoEO.getSelectValue().substring(num + 1).trim(); + real = value + " " + select; + }else{ + value = real; + select = ""; } searchInfoEO.setSelectValue(select); List> result = new ArrayList<>(); @@ -1307,12 +1307,79 @@ public class SearchCenterServiceImpl implements SearchCenterService { BoolQueryBuilder boolQueryShould = QueryBuilders.boolQuery(); BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); QueryBuilder multiQueryBuilder; - multiQueryBuilder = QueryBuilders.multiMatchQuery(value, - "title.keyword","textContent.keyword").minimumShouldMatch("100%").field("title.keyword",1f); - boolQueryMust.must(multiQueryBuilder); - boolQueryShould.should(QueryBuilders.wildcardQuery("title.keyword", "*"+searchInfoEO.getSelectValue()+"*").boost(10f)) - .should(QueryBuilders.wildcardQuery("textContent.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(multiQueryBuilder); + String[] selects = null; + if (StringUtils.isNotBlank(select)) { + //判断标准号是否企标SMTC ，标准列别 （），/,字母 + Pattern pattern = Pattern.compile("^[a-zA-Z\\/\\(\\)\\（\\）]+$"); + if (pattern.matcher(value).matches()) { + //符合标准类别 + if ("SMTC".equals(value)) { + //符合标准SMTC + //判断是否带有年份 + Pattern patternbianhao = Pattern.compile("^[0-9a-zA-Z\\.\\(\\（\\）\\)\\-\\s]+$"); + if (patternbianhao.matcher(select).matches()) { +// 拆分年份，当无“-”时，也生成selects + selects = select.replace(" ","-").replace("（","-\\（-").replace("）","-\\）-").replace("(","-\\(-").replace(")","-\\)-").split("-"); + }else{ + //wildcard查询real + selects = select.replace(" ","-").replace("（","-\\（-").replace("）","-\\）-").replace("(","-\\(-").replace(")","-\\)-").split("-"); +// isReal = true; +// value = null; +// selects = null; + } + } else { + //不符合标准SMTC + Pattern patternbianhao = Pattern.compile("^[0-9a-zA-Z\\.\\(\\（\\）\\)\\-\\s]+$"); + if (patternbianhao.matcher(select).matches()) { + //符合标准编号 + selects = select.replace(" ","-").split("-"); + } else { + //不符合标准编号 使用wildcard查询 编号 + selects = select.replace(" ","-").split("-"); + } + } + } else { + //不符合标准类别，wildcard 查询整体 real 6/23 解决搜索DRE的问题 + selects = null; + value = real; +// isReal = true; + } + }else{ + //没有空格，存在问题，使用wildcard查询 real + selects = null; + value = real; +// isReal = true; + } + + if (isReal){ + //查询real + value = null; + selects = null; + } + + if (null != value) { + multiQueryBuilder = QueryBuilders.multiMatchQuery(value, + "title.keyword", "textContent", "issue_time").minimumShouldMatch("100%").field("title.keyword", 1000f).field("textContent.keyword", 0.0000000000000000000000000000000001f); +// boolQueryMust.must(multiQueryBuilder); + boolQueryShould.should(multiQueryBuilder); + } +// searchInfoEO.setSelectValue(searchInfoEO.getSelectValue().replace("-","\\-")); + if (null != selects) { + boolQueryShould.should(QueryBuilders.wildcardQuery("title.keyword", "*" + real + "*").boost(1000f)); + for (String se : selects) { + if (StringUtils.isNotBlank(se)) { + boolQueryShould +// .should(QueryBuilders.wildcardQuery("title.keyword", "*" + real + "*").boost(10f)) + .should(QueryBuilders.wildcardQuery("textContent.keyword", "*" + se + "*").boost(0.0000000000000000000000000000000001f)) + .should(QueryBuilders.wildcardQuery("issue_time", "*" + se + "*")); + } + } + } + if (isReal){ + boolQueryShould.should(QueryBuilders.wildcardQuery("title.keyword", "*" + real + "*").boost(1000f)) + .should(QueryBuilders.wildcardQuery("textContent.keyword", "*" + real + "*").boost(0.0000000000000000000000000000000001f)) + .should(QueryBuilders.wildcardQuery("issue_time", "*" + real + "*")); + } boolQueryBuilder.should(boolQueryShould); //在结果中检索 // boolQueryBuilder.must(multiQueryBuilder); @@ -1347,11 +1414,11 @@ public class SearchCenterServiceImpl implements SearchCenterService { n_field += fragment; } //高亮标题覆盖原标题 - sourceAsMap.put("title.keyword",n_field); + sourceAsMap.put("title",n_field); } Map highlightFieldsnameshowStr = searchHit.getHighlightFields(); - HighlightField fieldnameshowStr= highlightFieldsnameshowStr.get("textContent.keyword"); + HighlightField fieldnameshowStr= highlightFieldsnameshowStr.get("textContent"); if(fieldnameshowStr!= null){ Text[] fragments = fieldnameshowStr.fragments(); String n_field = ""; @@ -1359,7 +1426,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { n_field += fragment; } //高亮标题覆盖原标题 - sourceAsMap.put("textContent.keyword",n_field); + sourceAsMap.put("textContent",n_field); } result.add(sourceAsMap); } From 5a950b7faa8438a2f2bfb604d66013c84496cfdb Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 13 Apr 2022 15:23:23 +0800 Subject: [PATCH 58/64] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=AF=94=E5=AF=B9=20?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BA=A7=E5=93=81=E8=A7=84=E5=88=92=E9=83=A8?= =?UTF-8?q?=20=E6=89=B9=E9=87=8F=E5=85=B3=E9=97=AD=20=E5=8A=A0=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductDeptIssueController.java | 44 ++++++++- .../dao/ProductDeptIssueDao.java | 4 +- .../entity/ProductDeptIssueVo.java | 22 +++++ .../service/IProductDeptIssueService.java | 2 + .../service/impl/ProductDeptIssueService.java | 6 ++ .../impl/SarStandCompareHisEOServiceImpl.java | 4 + .../ProductDeptIssuempaaer.xml | 90 +++++++++++++++++++ doc/sql/数据库改动.sql | 2 + 8 files changed, 171 insertions(+), 3 deletions(-) create mode 100644 doc/sql/数据库改动.sql diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java index 87df8d40..cd1b1405 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java @@ -8,6 +8,8 @@ import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssueVo; import com.adc.da.slrs.sarStandUnqualified.service.IBusinessDeptIssueService; import com.adc.da.slrs.sarStandUnqualified.service.IProductDeptIssueService; +import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -15,6 +17,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; import java.util.Arrays; import java.util.List; @@ -64,8 +69,6 @@ public class ProductDeptIssueController { boolean b = iProductDeptIssueService.updateProductDeptIssue(issue); return Result.success(b); } -// 多态对接口具有可替换性接口 灵活性简化性易拓展 可替换的概念可以理解伟方法可以被同类重用 -// 可扩充性可以理解为该方法可以添加子类而不影响现有代码，接口性就是指的是向子类提供一个公用的高级接口子类来集成完善这个接口中的方法来实现要求。 @PostMapping("/closeProductIssue") @ApiOperation("关闭产品规划部重点问题") @@ -75,4 +78,41 @@ public class ProductDeptIssueController { return Result.success(b); } + + @GetMapping("/exportIssue") + @ApiOperation("导出产品规划部重点问题") + public void exportIssue(HttpServletResponse response, ProductDeptIssueVo issue ) throws IOException { + try { + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + + if(issue.getFileName()==null || issue.getFileName()==""){ + issue.setFileName("事业部重点问题信息"); + } + String fileName = URLEncoder.encode(issue.getFileName(), "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + + /** + * 重写了get方法,无法使用net.sf.json.JSONObject转换对象 + */ +// net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(issue.getExportContent()); +// BusinessDeptIssueVo businessDeptIssueVo = (BusinessDeptIssueVo) net.sf.json.JSONObject.toBean(jsonObject, BusinessDeptIssueVo.class); + + JSONObject jsonObject = JSONObject.parseObject(issue.getExportContent()); + ProductDeptIssueVo businessDeptIssueVo = JSONObject.toJavaObject(jsonObject, ProductDeptIssueVo.class); + List page = iProductDeptIssueService.getExportData(businessDeptIssueVo,businessDeptIssueVo.getIdList()); + + + // 这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), BusinessDeptIssue.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(page); + } catch (Exception e) { + e.printStackTrace(); + // 重置response + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().println(JSONObject.toJSONString(Result.error())); + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java index 1ddac4bf..4faf0dc2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java @@ -10,8 +10,10 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface ProductDeptIssueDao extends BaseMapper { - public IPage findPage1(IPage page,@Param(Constants.WRAPPER) QueryWrapper wrapper); public IPage findPage(IPage page, @Param("ew") ProductDeptIssueVo objVo); + public List findExportData(@Param("ew") ProductDeptIssueVo objVo, @Param("ids") List ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssueVo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssueVo.java index b508e813..4e3f40bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssueVo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssueVo.java @@ -1,4 +1,26 @@ package com.adc.da.slrs.sarStandUnqualified.entity; +import lombok.Data; + +import java.util.Arrays; +import java.util.List; + +@Data public class ProductDeptIssueVo extends ProductDeptIssue { + + private String numberOrName; + + private String fileName; + + private String idList; + + private String exportContent; + + public List getIdList(){ + if (this.idList!=null){ + return Arrays.asList(this.idList.split(",")); + }else { + return null; + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java index 3441da72..40380aa4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java @@ -16,6 +16,8 @@ public interface IProductDeptIssueService extends IService { public IPage getProductDeptIssue(ProductDeptIssueVo objVo); + public List getExportData(ProductDeptIssueVo objVo,List ids); + public boolean updateProductDeptIssue(ProductDeptIssue obj); public boolean closeProductDeptIssue(List idList); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java index 3b6c76ce..5b233d4c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java @@ -64,6 +64,12 @@ public class ProductDeptIssueService extends ServiceImpl getExportData(ProductDeptIssueVo objVo, List ids) { + + return productDeptIssueDao.findExportData(objVo,ids); + } + @Override public boolean updateProductDeptIssue(ProductDeptIssue obj) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java index 296adee2..af0184e9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java @@ -247,6 +247,10 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ sarStandCompareHisEO.setId(standHisId); sarStandCompareHisEO.setCompareStatus("比对完成"); sarStandCompareHisEODao.updateByPrimaryKeySelective(sarStandCompareHisEO); + if (oldList.size()==0 || newList.size()==0){ + resultMap.put("error","比对数据已删除"); + } + return resultMap; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml index 4130cd2c..3ba4f34e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml @@ -88,5 +88,95 @@ + + + diff --git a/doc/sql/数据库改动.sql b/doc/sql/数据库改动.sql new file mode 100644 index 00000000..d8068724 --- /dev/null +++ b/doc/sql/数据库改动.sql @@ -0,0 +1,2 @@ +4.13------------------ +INSERT INTO `foton_slrs_test2`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('asdzcfgk', NULL, '政策法规库', NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL); From 4ff24628da29c7c2a8b955bfac1b2758a1708b44 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 14 Apr 2022 09:54:53 +0800 Subject: [PATCH 59/64] feat: There is no way the, --- .../mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index 019d4437..22191d0c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -111,7 +111,7 @@ and DATE_FORMAT(release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d') - and unit like concat('%',#{unit},'%') + and (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) like concat('%',#{unit},'%') From cc8dd6d4587aebc895f0b8c6460bf3bbdd3b20aa Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 14 Apr 2022 10:26:49 +0800 Subject: [PATCH 60/64] feat: There is no way the, checkPageNoEncryption --- .../da/login/rest/LoginRestController.java | 26 +++++++++++++++++++ .../adc/da/login/security/WebMvcConfig.java | 5 ++++ 2 files changed, 31 insertions(+) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java index d4867481..b143f21f 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -104,6 +104,32 @@ public class LoginRestController { } + @ApiOperation(value = "登录") +// @GetMapping(value = "/login") + @GetMapping(value = "/checkPageNoEncryption") + @ResponseBody + public ResponseMessage checkPageNoEncryption(@RequestParam @NotNull(message = "请输入用户名") String username) throws UnsupportedEncodingException { + UserEO userEO = userService.getUserByLoginNameNotDeleted(username); + if (null == userEO) { + log.info("用户[{}]身份验证失败", username); + return Result.error("r0011", "您输入的帐号不存在"); + } + if(userEO.getDisableFlag()==1){ + log.info("用户[{}]身份验证失败", username); + return Result.error("r0011", "您输入的帐号已禁用"); + } + + String token = jwtUtils.generateToken(userEO.getUsid()); + // 加密重要信息 + BASE64Encoder encoder = new BASE64Encoder(); + userEO.setToken(token); + String userStr = JSON.toJSONString(userEO); + String userStr2 = URLEncoder.encode(userStr,"UTF-8"); + userStr = encoder.encode(userStr2.getBytes()); + return Result.success(userStr); + + } + @ApiOperation(value = "登录") @PostMapping(value = "/loginIdm") 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 cf1358f1..fb8db2d2 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 @@ -25,7 +25,12 @@ public class WebMvcConfig implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { InterceptorRegistration addInterceptor = registry.addInterceptor(getSecurityInterceptor()); + /** + * 登录三大金刚 + */ addInterceptor.excludePathPatterns("/api/loginIdm"); + addInterceptor.excludePathPatterns("/api/checkPage"); + addInterceptor.excludePathPatterns("/api/checkPageNoEncryption"); /** * TODO 测试流程 开放 login 接口 正式环境 关闭 */ From d466d96b91ab595b6b5bb0573d1b596778577c49 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 14 Apr 2022 11:25:30 +0800 Subject: [PATCH 61/64] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=20=E5=AD=97=E6=AE=B5=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java | 3 +++ .../service/impl/SarStandProjectLibraryServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java index 0385647a..f81b285f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -50,6 +50,9 @@ public class StandAttrInfoDto { //责任部门 @ExcelProperty("责任部门") private String ZRBM; + + @ExcelProperty("文本状态") + private String textStatus; // //关联模块--卡车VPPS编码 // @ExcelProperty("关联模块--卡车VPPS编码") // private String KCCVPPSBM; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 74fd0673..941d0cbb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -427,7 +427,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE","(select count(*) from sar_stand_unqualified" + + wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","TEXT_STATUS","STAND_TYPE","(select count(*) from sar_stand_unqualified " + " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ","(select count(*) from sar_stand_unqualified" + " where STAND_ID = r.stand_id and CLOSE_STATE = '2' ) as counts ", "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME ) from sar_stand_unqualified where " + @@ -458,6 +458,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl0L) { p.setUnCount(s.getUnCount()); }else if (s.getUnCount() == 0L && s.getCounts()==0L){ From aab8023f1a8f572f206788b6b6ed96055697f932 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 14 Apr 2022 14:56:03 +0800 Subject: [PATCH 62/64] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=87=E6=9C=AC=E7=B1=BB=E5=9E=8B=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E5=AE=8C=E5=96=84=20=E8=A1=A5=E5=85=85=E6=B5=B7?= =?UTF-8?q?=E5=A4=96=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=88=E5=8E=9F=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=8F=AA=E6=9C=89=E5=9B=BD=E5=86=85=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandItemsServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index f16e9c4e..ea7ad48e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -286,7 +287,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl> getFileType(String standId){ List fileType = dao.getFileType(standId); - Map typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() + List res=new ArrayList<>(); + res= (List) CollectionUtils.union(InitStandAttrUtil.standInlandAttrFieldList, InitStandAttrUtil.standForeignAttrFieldList); + Map typeNameMap = res.stream() .collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); List> collect = fileType.stream() @@ -299,7 +302,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl> getFileTypeHG(String standId){ List fileType = dao.getFileTypeHG(standId); - Map typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() + List res=new ArrayList<>(); + res= (List) CollectionUtils.union(InitStandAttrUtil.standInlandAttrFieldList, InitStandAttrUtil.standForeignAttrFieldList); + Map typeNameMap = res.stream() .collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); List> collect = fileType.stream() From 3e4adf43686fb9fc18f873ed137fb503f704d82b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 14 Apr 2022 16:45:33 +0800 Subject: [PATCH 63/64] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java index f81b285f..361e245d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -51,7 +51,7 @@ public class StandAttrInfoDto { @ExcelProperty("责任部门") private String ZRBM; - @ExcelProperty("文本状态") +// @ExcelProperty("文本状态") private String textStatus; // //关联模块--卡车VPPS编码 // @ExcelProperty("关联模块--卡车VPPS编码") From 9bcead777b60d3644b71da048e892861cfee5d03 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 15 Apr 2022 10:37:15 +0800 Subject: [PATCH 64/64] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=AF=94=E5=AF=B9=20?= =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E6=95=B0=E6=8D=AE=E9=A1=BA=E5=BA=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandCompareHisEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java index af0184e9..d46b5142 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java @@ -544,6 +544,7 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ sarFileSplitItemsValEOPage.setItemId(sarFileSplitItemsEO.getId()); sarFileSplitItemsValEOPage.setValidFlag(String.valueOf(ValidFlagEnum.VALID_TRUE.getValue())); sarFileSplitItemsValEOPage.setType("TEXT"); + sarFileSplitItemsValEOPage.setOrderBy("DISPLAY_SEQ"); List leftValList = sarFileSplitItemsValEOService.queryByList(sarFileSplitItemsValEOPage); if(leftValList != null && !leftValList.isEmpty()){ for(SarFileSplitItemsValEO sarFileSplitItemsValEO : leftValList){