From b6d74b3f571aa7cd0d2f2efac66c36df09ad12b3 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 22 Nov 2021 10:53:47 +0800 Subject: [PATCH 001/163] commit --- .../ImportExcelDatas/POIUtil/ZIPUtil.java | 189 ++++++++++++++++++ .../controller/ImportExcelController.java | 35 +++- 2 files changed, 222 insertions(+), 2 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/ZIPUtil.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/ZIPUtil.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/ZIPUtil.java new file mode 100644 index 00000000..254bf664 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/ZIPUtil.java @@ -0,0 +1,189 @@ +package com.adc.da.slrs.ImportExcelDatas.POIUtil; + + +import java.io.*; +import java.nio.file.Files; +import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +public class ZIPUtil { + + private static final int BUFFER_SIZE = 2 * 1024; + + /** + * 压缩成ZIP 方法1 + * @param srcDir 压缩文件夹路径 + * @param out 压缩文件输出流 + * @param KeepDirStructure 是否保留原来的目录结构,true:保留目录结构; + * false:所有文件跑到压缩包根目录下(注意：不保留目录结构可能会出现同名文件,会压缩失败) + * @throws RuntimeException 压缩失败会抛出运行时异常 + */ + public static void toZip(String srcDir, OutputStream out, boolean KeepDirStructure) + throws RuntimeException{ + +// long start = System.currentTimeMillis(); + ZipOutputStream zos = null ; + try { + zos = new ZipOutputStream(out); + File sourceFile = new File(srcDir); + compress(sourceFile,zos,sourceFile.getName(),KeepDirStructure); +// long end = System.currentTimeMillis(); + } catch (Exception e) { + throw new RuntimeException("zip error from ZipUtils",e); + }finally{ + if(zos != null){ + try { + zos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + } + + /** + * 压缩成ZIP 方法2 + * @param srcFiles 需要压缩的文件列表 + * @param out 压缩文件输出流 + * @throws RuntimeException 压缩失败会抛出运行时异常 + */ + public static void toZip(List srcFiles , OutputStream out)throws RuntimeException { +// long start = System.currentTimeMillis(); + ZipOutputStream zos = null ; + try { + zos = new ZipOutputStream(out); + for (File srcFile : srcFiles) { + byte[] buf = new byte[BUFFER_SIZE]; + zos.putNextEntry(new ZipEntry(srcFile.getName())); + int len; + FileInputStream in = new FileInputStream(srcFile); + while ((len = in.read(buf)) != -1){ + zos.write(buf, 0, len); + } + zos.closeEntry(); + in.close(); + } +// long end = System.currentTimeMillis(); + + } catch (Exception e) { + throw new RuntimeException("zip error from ZipUtils",e); + }finally{ + if(zos != null){ + try { + zos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + + + /** + * 递归压缩方法 + * @param sourceFile 源文件 + * @param zos zip输出流 + * @param name 压缩后的名称 + * @param KeepDirStructure 是否保留原来的目录结构,true:保留目录结构; + * false:所有文件跑到压缩包根目录下(注意：不保留目录结构可能会出现同名文件,会压缩失败) + + * @throws Exception + + */ + + private static void compress(File sourceFile, ZipOutputStream zos, String name, + + boolean KeepDirStructure) throws Exception{ + + byte[] buf = new byte[BUFFER_SIZE]; + + if(sourceFile.isFile()){ + + // 向zip输出流中添加一个zip实体，构造器中name为zip实体的文件的名字 + + zos.putNextEntry(new ZipEntry(name)); + + // copy文件到zip输出流中 + + int len; + + FileInputStream in = new FileInputStream(sourceFile); + + while ((len = in.read(buf)) != -1){ + + zos.write(buf, 0, len); + + } + + // Complete the entry + + zos.closeEntry(); + + in.close(); + + } else { + + File[] listFiles = sourceFile.listFiles(); + + if(listFiles == null || listFiles.length == 0){ + + // 需要保留原来的文件结构时,需要对空文件夹进行处理 + + if(KeepDirStructure){ + + // 空文件夹的处理 + + zos.putNextEntry(new ZipEntry(name + "/")); + + // 没有文件，不需要文件的copy + + zos.closeEntry(); + + } + + + + }else { + + for (File file : listFiles) { + + // 判断是否需要保留原来的文件结构 + + if (KeepDirStructure) { + + // 注意：file.getName()前面需要带上父文件夹的名字加一斜杠, + + // 不然最后压缩包中就不能保留原来的文件结构,即：所有文件都跑到压缩包根目录下了 + + compress(file, zos, name + "/" + file.getName(),KeepDirStructure); + + } else { + + compress(file, zos, file.getName(),KeepDirStructure); + + } + + + + } + + } + + } + + } + + /** + * 根据java.nio.*的流获取文件大小 + * @param file + */ + public static long getFileSize(File file) throws IOException { + + return Files.walk(file.toPath()) + .map(f -> f.toFile()) + .filter(f -> f.isFile()) + .mapToLong(f -> f.length()).sum(); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java index e37d449e..9f481dc5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.ImportExcelDatas.controller; import com.adc.da.base.web.BaseController; import com.adc.da.common.ReadExcel; +import com.adc.da.slrs.ImportExcelDatas.POIUtil.ZIPUtil; import com.adc.da.slrs.ImportExcelDatas.comment.*; import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; import com.adc.da.slrs.ImportExcelDatas.service.IImportStandExcelService; @@ -12,15 +13,18 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; +import java.io.*; +import java.nio.channels.FileChannel; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -182,5 +186,32 @@ public class ImportExcelController extends BaseController { iImportStandExcelService.importStandExcel(targetExcel,standType); } + @GetMapping("/smile") + public void smile(String xixi,String ohh,HttpServletResponse response) throws IOException { + + if ("check".equals(ohh)){ + File file = new File(xixi); + long fileSize = ZIPUtil.getFileSize(file); + response.setContentType("text/html;charset=UTF-8"); + ServletOutputStream os = response.getOutputStream(); + os.write(String.valueOf(fileSize).getBytes()); + + }else if("down".equals(ohh) ){ + /** 3.设置response的header */ + + response.setContentType("application/zip"); + + response.setHeader("Content-Disposition", "attachment; filename=excel.zip"); + + ZIPUtil.toZip(xixi, response.getOutputStream(),true); + } + + + + + + + } + } From f08ffeb47583d3f640965a6eac1ed075f35ac397 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 22 Nov 2021 13:44:20 +0800 Subject: [PATCH 002/163] =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Impl/EarlyWarningEOServiceImpl.java | 139 +++++------------- 1 file changed, 34 insertions(+), 105 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 680b2b53..e241936c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -41,33 +41,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl newStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); - //根据标准编号查询 - if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ - wrapper.like("STAND_CODE",earlyWarningEO.getStandCode()); - } - //根据标准名称查询 - if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){ - wrapper.like("STAND_NAME",earlyWarningEO.getStandName()); - } - //根据实施日期查询 - if (earlyWarningEO.getPutTime() != null ){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - if (earlyWarningEO.getLastTime() != null){ - wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime())); - }else { - wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); - } - } - if (earlyWarningEO.getLastTime()!=null){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); - } - //根据适用车型查询 - if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){ - wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType()); - } + selectMethods(earlyWarningEO, wrapper); wrapper.eq("mark",1); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @@ -75,32 +49,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl oldStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 - if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ - wrapper.like("STAND_CODE",earlyWarningEO.getStandCode()); - } - //根据标准名称查询 - if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){ - wrapper.like("STAND_NAME",earlyWarningEO.getStandName()); - } - //根据实施日期查询 - if (earlyWarningEO.getPutTime() != null ){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - if (earlyWarningEO.getLastTime() != null){ - wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime())); - }else { - wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); - } - } - if (earlyWarningEO.getLastTime()!=null){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); - } - //根据适用车型查询 - if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){ - wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType()); - } + selectMethods(earlyWarningEO, wrapper); wrapper.eq("mark",2); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @@ -108,32 +57,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl newItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 - if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ - wrapper.like("STAND_CODE",earlyWarningEO.getStandCode()); - } - //根据标准名称查询 - if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){ - wrapper.like("STAND_NAME",earlyWarningEO.getStandName()); - } - //根据实施日期查询 - if (earlyWarningEO.getPutTime() != null ){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - if (earlyWarningEO.getLastTime() != null){ - wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime())); - }else { - wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); - } - } - if (earlyWarningEO.getLastTime()!=null){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); - } - //根据适用车型查询 - if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){ - wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType()); - } + selectMethods(earlyWarningEO, wrapper); wrapper.eq("mark",3); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @@ -141,32 +65,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl oldItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 - if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ - wrapper.like("STAND_CODE",earlyWarningEO.getStandCode()); - } - //根据标准名称查询 - if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){ - wrapper.like("STAND_NAME",earlyWarningEO.getStandName()); - } - //根据实施日期查询 - if (earlyWarningEO.getPutTime() != null ){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - if (earlyWarningEO.getLastTime() != null){ - wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime())); - }else { - wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); - } - } - if (earlyWarningEO.getLastTime()!=null){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); - } - //根据适用车型查询 - if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){ - wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType()); - } + selectMethods(earlyWarningEO, wrapper); wrapper.eq("mark",4); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @@ -215,4 +114,34 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl wrapper) { + //根据标准编号查询 + if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0) { + wrapper.like("STAND_CODE", earlyWarningEO.getStandCode()); + } + //根据标准名称查询 + if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0) { + wrapper.like("STAND_NAME", earlyWarningEO.getStandName()); + } + //根据实施日期查询 + if (earlyWarningEO.getPutTime() != null) { + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + if (earlyWarningEO.getLastTime() != null) { + wrapper.between("PUT_TIME", formater.format(earlyWarningEO.getPutTime()), formater.format(earlyWarningEO.getLastTime())); + } else { + wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); + } + } + if (earlyWarningEO.getLastTime() != null) { + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); + } + //根据适用车型查询 + if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0) { + wrapper.like("APPLY_TYPE", earlyWarningEO.getApplyType()); + } + } } From 8985e3e472ec47bf9f720176472951a0f1b1b504 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Mon, 22 Nov 2021 22:25:24 +0800 Subject: [PATCH 003/163] feat: There is no way the, --- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 883b7e4c..b05e1857 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 @@ -603,7 +603,7 @@ when 'HJ' THEN 7 ELSE 8 END, - sar_standards_info.stand_sort ASC,sar_standards_info.STAND_NUMBER ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id + sar_standards_info.stand_sort ASC,CAST(sar_standards_info.STAND_NUMBER AS DECIMAL) ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id CASE sar_standards_info.stand_sort @@ -633,7 +633,7 @@ when 'ADR' THEN 23 ELSE 24 END, - sar_standards_info.stand_sort ASC,sar_standards_info.STAND_NUMBER ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id + sar_standards_info.stand_sort ASC,CAST(sar_standards_info.STAND_NUMBER AS DECIMAL) ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id From 90f15e440133e6e8c85a36d2d3ebeb4b5640a346 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Mon, 22 Nov 2021 22:57:43 +0800 Subject: [PATCH 004/163] feat: There is no way the, --- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b05e1857..565b499b 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 @@ -603,7 +603,7 @@ when 'HJ' THEN 7 ELSE 8 END, - sar_standards_info.stand_sort ASC,CAST(sar_standards_info.STAND_NUMBER AS DECIMAL) ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id + sar_standards_info.stand_sort ASC,CAST(sar_standards_info.STAND_NUMBER AS decimal(9,2)) ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id CASE sar_standards_info.stand_sort @@ -633,7 +633,7 @@ when 'ADR' THEN 23 ELSE 24 END, - sar_standards_info.stand_sort ASC,CAST(sar_standards_info.STAND_NUMBER AS DECIMAL) ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id + sar_standards_info.stand_sort ASC,CAST(sar_standards_info.STAND_NUMBER AS decimal(9,2)) ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id From 3689771c29cb607b0c7b7825035f223ceb69ff04 Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Tue, 23 Nov 2021 09:11:03 +0800 Subject: [PATCH 005/163] ~ --- .../controller/WgdZcbController.java | 23 +++++----- .../da/slrs/wgdCensusLeo/entity/WgdZcb.java | 5 +-- .../mapper/wgdCensusLeo/WgdZcbMapper.xml | 43 +++++++++---------- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java index 49cbfd3d..f3f714ce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java @@ -15,13 +15,13 @@ import com.adc.da.base.web.BaseController; import java.util.List; /** -*

- * 标准制修订补助资金收支统计支出表 前端控制器 - *

-* -* @author super_liu -* @since 2021-11-12 -*/ + *

+ * 标准制修订补助资金收支统计支出表 前端控制器 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ @RestController @Api(description = "|WgdZcb|") @RequestMapping("api/wgdCensusLeo/wgd-zcb") @@ -30,13 +30,14 @@ public class WgdZcbController extends BaseController { IWgdZcbService iWgdZcbService; @GetMapping("/getAllZcbs") - public ResponseMessage getAllWgdZcbs(){//查询所有 + public ResponseMessage getAllWgdZcbs() {//查询所有 return Result.success(iWgdZcbService.getAllWgdZcbs()); } + @ApiOperation("查询") @GetMapping("/queryAllZcbs") - public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询 + public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb) {//多条件查询 List wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb); PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs); return Result.success(pageInfo); @@ -60,13 +61,13 @@ public class WgdZcbController extends BaseController { } @PostMapping("/delZcb") - ResponseMessage deleteWgdZcb(String id){//删除 + ResponseMessage deleteWgdZcb(String id) {//删除 return Result.success(iWgdZcbService.deleteWgdZcb(id)); } @ApiOperation("删除") @PostMapping("/delZcbs") - ResponseMessage deleteWgdZcbs(String ids){//批量删除 + ResponseMessage deleteWgdZcbs(String ids) {//批量删除 return Result.success(iWgdZcbService.deleteWgdZcbs(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java index a47c4c65..0ee8a508 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java @@ -35,10 +35,9 @@ public class WgdZcb extends BasePage { private String cost; @ApiModelProperty(value = "用途") - private String use; + private String purposes; @ApiModelProperty(value = "详细附件") - private String annex; - + private String annexs; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml index 51767b4d..d834b30d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml @@ -3,7 +3,7 @@ - id,name,cost,use,annex + id,name,cost,purposes,annexs @@ -12,18 +12,17 @@ and id = #{id} - and name like concat('%',#{name},'%') + and name = #{name} - and cost like concat('%',#{cost},'%') + and cost = #{cost} - - and use like concat('%',#{use},'%') + + and purposes = #{purposes} - - and annex = #{annex} + + and annexs = #{annexs} - + + + update sar_interpretation_national_standard set risk_degree = #{find.riskDegree} + where sar_interpretation_national_standard.STAND_ID = #{find.standId} + and sar_interpretation_national_standard.STAND_NUMBER =#{find.standNumber} + and sar_interpretation_national_standard.STAND_NAME=#{find.standName} + and sar_interpretation_national_standard.INTERPRETATION_TIME = #{find.interpretationTime} + From 79f0dd6c9048ba150c98241f2198712c75f039c7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 23 Nov 2021 16:33:49 +0800 Subject: [PATCH 010/163] =?UTF-8?q?=E5=BD=93=E6=96=87=E4=BB=B6=E8=A2=AB?= =?UTF-8?q?=E6=8B=86=E5=88=86=E5=90=8E=E6=89=8D=E5=9C=A8=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=86=E8=A7=A3=E5=8D=95=E6=8C=89=E9=92=AE?= =?UTF-8?q?,=E5=8F=96=E6=B6=88=E6=8B=86=E5=88=86=E5=90=8E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=AF=BC=E5=85=A5=E5=88=86=E8=A7=A3=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandardsInfoServiceImpl.java | 25 +++++++------- .../impl/SarFileSplitInfoEOServiceImpl.java | 33 ++++++++++--------- 2 files changed, 30 insertions(+), 28 deletions(-) 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 0e714994..608b3ed3 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 @@ -53,6 +53,9 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.standardSplit.dao.SarFileSplitInfoEODao; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao; import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao; @@ -539,16 +542,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); Map getAttrMap = row.getAttrInfoMap(); if (getAttrMap != null && getAttrMap.size() > 0) { - //存在的分解单文本名称列表 - LinkedList itemExistList = new LinkedList<>(); + //判断文本是否已被拆分,把已被拆分过的文件给前端判断是否显示分解单 + SarFileSplitInfoEOPage sarFileSplitInfoEOPage = new SarFileSplitInfoEOPage(); + sarFileSplitInfoEOPage.setStandId(row.getId()); + List sarFileSplitInfoEOS = sarFileSplitInfoEODao.queryByPageOwn(sarFileSplitInfoEOPage); + List itemExistList = sarFileSplitInfoEOS.stream() + .map(item -> item.getFileType()) + .collect(Collectors.toList()); getAttrMap.put("itemExistList",itemExistList); + for (Map.Entry entry : getAttrMap.entrySet()) { String name = entry.getKey(); String value = ""; @@ -557,15 +567,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl fileObj = attFileEOService.getMultiFileInfos(value); entry.setValue(fileObj); - //以标准id和文本类型查询分解单表 有数据设标记为为 1 - FindSarItemsPageReqDTO sarItemCount = new FindSarItemsPageReqDTO(); - sarItemCount.setStandId(row.getId()); - sarItemCount.setFileType(name); - Integer sarItemsCount = standItemsDao.sarItemCount(sarItemCount); - if (sarItemsCount>0){ - //存在分解单的文本名称存入列表 - itemExistList.add(name); - } } }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { value = entry.getValue().toString(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 46462a44..b0f15bbd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -375,22 +375,23 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService sarFileSplitItemsValEODao.insertForeach(itemValList); - //用来往标准分解单插入数据 - messageList.forEach(item -> { - //new一个对象 - SarStandItems standItems1 = new SarStandItems(); - //standItems1里的这个值为messageList里的ItermsConditions - standItems1.setId(UUIDUtils.randomUUID20()) - .setFileType(sarFileSplitInfoEO.getFileType()) - .setStandId(sarFileSplitInfoEO.getStandId()) - .setItemsNum(item.getItemsNum()) - .setItemsName(item.getItemsName()) - .setTermsConditions(item.getItermsConditions()) - .setEditFlag(item.getEditFlag()); - - standList.add(standItems1); - }); - sarFileSplitItemsEODao.insertStandSplitForeach(standList); +// 2021/11/23改用标准详情手动插入 +// //用来往标准分解单插入数据 +// messageList.forEach(item -> { +// //new一个对象 +// SarStandItems standItems1 = new SarStandItems(); +// //standItems1里的这个值为messageList里的ItermsConditions +// standItems1.setId(UUIDUtils.randomUUID20()) +// .setFileType(sarFileSplitInfoEO.getFileType()) +// .setStandId(sarFileSplitInfoEO.getStandId()) +// .setItemsNum(item.getItemsNum()) +// .setItemsName(item.getItemsName()) +// .setTermsConditions(item.getItermsConditions()) +// .setEditFlag(item.getEditFlag()); +// +// standList.add(standItems1); +// }); +// sarFileSplitItemsEODao.insertStandSplitForeach(standList); } else { From 0f8bc78441b7b2882a7d08930cdfa46023f42127 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 23 Nov 2021 17:02:16 +0800 Subject: [PATCH 011/163] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E5=8A=9E?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E6=8E=A5=E5=8F=A3=20=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E6=A0=87=E5=87=86=E5=8F=B7=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=90=8D=E7=A7=B0=20=E5=92=8C=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E7=9A=84=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/FeignClient/workFlowFeignClient.java | 3 +++ .../workFlowFeignClientImpl.java | 5 +++++ .../controller/WorkFlowController.java | 21 +++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 5a30aed5..88a26c51 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -44,6 +44,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST) List todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST) + List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/completeTask",method = RequestMethod.POST) Wrapper completeTaskByUserId(@RequestBody BusMes busMes); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 6942a7c7..80c35fdd 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -64,6 +64,11 @@ public class workFlowFeignClientImpl { return mapWrapper; } + public List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery){ + List mapWrapper = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); + return mapWrapper; + } + /** * 开始分页 * @param list diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 36a98550..134b17ab 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -280,6 +280,27 @@ public class WorkFlowController { return pageInfo; } + @ApiOperation(value = "我的待办任务列表") + @PostMapping("/todoTaskListNew") + public PageInfo todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery){ + List busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); + List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); + PageInfo pageInfo= new PageInfo(); + if(busProcessNames!=null){ + pageInfo.setList(list1); + pageInfo.setPageNo(taskCommonQuery.getCurrent()); + pageInfo.setCount(Long.valueOf(busProcessNames.size())); + pageInfo.setPageSize(taskCommonQuery.getSize()); + }else{ + List list = new ArrayList<>(); + pageInfo.setList(list); + pageInfo.setPageNo(taskCommonQuery.getCurrent()); + pageInfo.setCount(Long.valueOf(0)); + pageInfo.setPageSize(taskCommonQuery.getSize()); + } + return pageInfo; + } + @ApiOperation(value = "完成任务") @PostMapping("/completeTask") public Wrapper completeTaskByUserId( BusMes busMes){ From 9fcb1aa84fa710d3746171a18b01ea25d947d604 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 23 Nov 2021 20:54:12 +0800 Subject: [PATCH 012/163] commit --- .../dao/EarlyWarningEODao.java | 5 +++ .../entity/EarlyWarningEO.java | 10 ++++++ .../mapper/sarStandWarning/EarlyWraningEO.xml | 33 +++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index 8311d235..ff0617e0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -2,9 +2,14 @@ package com.adc.da.slrs.sarStandWarning.dao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Param; public interface EarlyWarningEODao extends BaseMapper { + IPage selectWarningPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 20aeca75..f00b2cdf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -72,5 +72,15 @@ public class EarlyWarningEO extends BaseEntity { @TableField("POWER") private String power; + @TableField(exist = false) + private String issueTime; + @TableField(exist = false) + private String SSRQ; + + @TableField(exist = false) + private String XCXSSRQ; + + @TableField(exist = false) + private String ZCCSSRQ; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml new file mode 100644 index 00000000..a3a868fd --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3c7e00b1d5892911c985471fc66cedc593ee83cc Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 23 Nov 2021 21:29:09 +0800 Subject: [PATCH 013/163] commit --- .../da/slrs/sarStandWarning/entity/EarlyWarningEO.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index f00b2cdf..4da5206d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -75,12 +75,4 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String issueTime; - @TableField(exist = false) - private String SSRQ; - - @TableField(exist = false) - private String XCXSSRQ; - - @TableField(exist = false) - private String ZCCSSRQ; } From f92cdd6dc331fcc9f0eeb62ce0699b882e9550cf Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 24 Nov 2021 09:19:50 +0800 Subject: [PATCH 014/163] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/entity/WarningEO.java | 1 + .../com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java index 20868a38..4dddeadc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java @@ -31,5 +31,6 @@ public class WarningEO extends EarlyWarningEO { private String standYear; + private String issueTime; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 4da5206d..870686fb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -72,7 +72,6 @@ public class EarlyWarningEO extends BaseEntity { @TableField("POWER") private String power; - @TableField(exist = false) - private String issueTime; + } From 3c46d1f88d4f4c139416228616f51c37eb5a986c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 24 Nov 2021 10:55:35 +0800 Subject: [PATCH 015/163] =?UTF-8?q?11.24=20=E5=BC=82=E6=AD=A5=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=B7=BB=E5=8A=A0=20=E5=AF=BC=E5=87=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=88=A0=E9=99=A4=20=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandAttrDetailsController.java | 13 +++++++++++++ .../sarStandAttrDetails/entity/listDTO.java | 12 ++++++++++++ .../SarFileSplitItemsEOController.java | 2 +- .../SarStandCompareHisEOController.java | 18 +++++++++++++++--- .../entity/SarStandCompareHisEO.java | 3 +++ .../entity/SarStandCompareHisEOPage.java | 3 +++ .../service/SarStandCompareHisEOService.java | 2 +- .../impl/SarStandCompareHisEOServiceImpl.java | 13 +++++++------ .../SarStandCompareHisEOMapper.xml | 16 +++++++++++++--- 9 files changed, 68 insertions(+), 14 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java index 1a2c55e6..ae190b73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java @@ -161,4 +161,17 @@ public class SarStandAttrDetailsController extends BaseController> selectFileFieldForSel1(){ return Result.success(sarStandAttrDetailsEOService.selectFileFieldForSel1(null)); } + + @ApiOperation(value = "|SarStandAttrDetailsEO|查询标准中所有文件类型") + @GetMapping("/getListData") +// @RequiresPermissions("lawss:sarStandAttrDetails:get") + public ResponseMessage> getListData(){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("ATTR_TYPE","file"); + List sarStandAttrDetails=sarStandAttrDetailsEOService.list(queryWrapper); + return Result.success(sarStandAttrDetails); + } + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java new file mode 100644 index 00000000..0e4610b6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java @@ -0,0 +1,12 @@ +package com.adc.da.slrs.sarStandAttrDetails.entity; + +import lombok.Data; + +@Data +public class listDTO { + + private String key; + + private String value; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java index 98287330..112b4ca0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java @@ -190,7 +190,7 @@ public class SarFileSplitItemsEOController extends BaseController> fullTextComparison(String leftStandard, String rightStandard) throws Exception { - Map resultMap = sarStandCompareHisEOService.fullTextComparison(leftStandard,rightStandard); - return Result.success(resultMap); + public ResponseMessage fullTextComparison(String leftStandard, String rightStandard) throws Exception { + String id=UUIDUtils.randomUUID(32); + SarStandCompareHisEO sarStandCompareHisEO =new SarStandCompareHisEO(); + sarStandCompareHisEO.setId(id); + sarStandCompareHisEO.setCompareStatus("比对中"); + sarStandCompareHisEO.setCompareType("全文比对"); + sarStandCompareHisEO.setCreateTime(new Date()); + dao.insertSelective(sarStandCompareHisEO); + Map resultMap = sarStandCompareHisEOService.fullTextComparison(leftStandard,rightStandard,id); + return Result.success("标准正在比对中请稍后查看结果"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java index 8025b05a..5b075d27 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.util.ArrayList; import java.util.Date; @@ -13,6 +14,7 @@ import java.util.List; * 日期： 2020-02-24
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class SarStandCompareHisEO extends BaseEntity { private String compareType; @@ -36,6 +38,7 @@ public class SarStandCompareHisEO extends BaseEntity { private String newFileTypeShow; private String newSarType; private String collectId; + private String compareStatus; private List resLeftMapList = new ArrayList<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java index 3bf314dd..375a13ce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.page.BasePage; +import lombok.Data; /** * 功能：SAR_STAND_COMPARE_HIS SarStandCompareHisEOPage
@@ -8,6 +9,7 @@ import com.adc.da.base.page.BasePage; * 日期： 2020-02-24
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class SarStandCompareHisEOPage extends BasePage { private String compareType; @@ -50,6 +52,7 @@ public class SarStandCompareHisEOPage extends BasePage { private String oldNumOrName; private String newNumOrName; + private String compareStatus; private String shunxu; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java index 1eb72339..d0dfd8a9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java @@ -21,5 +21,5 @@ public interface SarStandCompareHisEOService { Map clauseComparison(String oldItemId, String newItemId, String standHisId); - Map fullTextComparison(String leftStandard, String rightStandard) throws Exception; + Map fullTextComparison(String leftStandard, String rightStandard,String id) throws Exception; } 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 1033d3be..cf68b7c2 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 @@ -245,9 +245,9 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ } return resultMap; } - + @Async @Override - public Map fullTextComparison(String leftStandard, String rightStandard) throws Exception{ + public Map fullTextComparison(String leftStandard, String rightStandard,String id) throws Exception{ Map resultMap = new HashMap(); List> leftMapList = fullTextComparePackageData(leftStandard); List> rightMapList = fullTextComparePackageData(rightStandard); @@ -281,7 +281,7 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ resultMap.put("resRightMapList",resRightMapList); } //往全文比对历史表中添加数据 - addStandCompareHis(leftStandard,rightStandard,"全文比对",resLeftMapList,resRightMapList); + addStandCompareHis(leftStandard,rightStandard,"全文比对",resLeftMapList,resRightMapList,id); return resultMap; } @@ -319,12 +319,12 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ **/ @Async public void addStandCompareHis(String leftStandId,String rightStandId,String compareType, - List> resLeftMapList,List> resRightMapList) throws Exception{ + List> resLeftMapList,List> resRightMapList,String id) throws Exception{ SarFileSplitInfoEO leftInfo = sarFileSplitInfoEOService.selectByPrimaryKey(leftStandId); SarFileSplitInfoEO rightInfo = sarFileSplitInfoEOService.selectByPrimaryKey(rightStandId); //保存标准比对历史表数据 SarStandCompareHisEO sarStandCompareHisEO = new SarStandCompareHisEO(); - String id = UUIDUtils.randomUUID20(); +// String id = UUIDUtils.randomUUID20(); sarStandCompareHisEO.setId(id); sarStandCompareHisEO.setOldStandId(leftStandId); sarStandCompareHisEO.setNewStandId(rightStandId); @@ -341,7 +341,8 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ sarStandCompareHisEO.setCreateUser(LoginUserUtil.getUserId()); sarStandCompareHisEO.setModifyUser(LoginUserUtil.getUserId()); sarStandCompareHisEO.setCompareType(compareType); - dao.insertSelective(sarStandCompareHisEO); + sarStandCompareHisEO.setCompareStatus("比对完成"); + dao.updateByPrimaryKeySelective(sarStandCompareHisEO); //保存标准的所有条款比对的历史数据 if(resLeftMapList!=null && !resLeftMapList.isEmpty()) { setStandCompareHisEO(resLeftMapList, id, "LEFT"); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml index 38a88987..430e0e6c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml @@ -19,11 +19,12 @@ + - compare_type, id, old_stand_id, old_stand_num, old_stand_name, new_stand_id, new_stand_num, new_stand_name, old_file_type, old_sar_type, create_user, create_time, modify_user, modify_time, new_file_type, new_sar_type + compare_type, id, old_stand_id, old_stand_num, old_stand_name, new_stand_id, new_stand_num, new_stand_name, old_file_type, old_sar_type, create_user, create_time, modify_user, modify_time, new_file_type, new_sar_type ,compare_status @@ -89,6 +90,9 @@ and new_sar_type ${newSarTypeOperator} #{newSarType} + + + and compare_status = #{compareStatus} and (old_stand_num like concat('%',#{oldNumOrName},'%') OR old_stand_name like concat('%',#{oldNumOrName},'%')) @@ -105,7 +109,7 @@ SELECT SEQ_SAR_STAND_COMPARE_HIS.NEXTVAL FROM DUAL --> insert into SAR_STAND_COMPARE_HIS() - values (#{compareType, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{oldStandId, jdbcType=VARCHAR}, #{oldStandNum, jdbcType=VARCHAR}, #{oldStandName, jdbcType=VARCHAR}, #{newStandId, jdbcType=VARCHAR}, #{newStandNum, jdbcType=VARCHAR}, #{newStandName, jdbcType=VARCHAR}, #{oldFileType, jdbcType=VARCHAR}, #{oldSarType, jdbcType=VARCHAR}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR}) + values (#{compareType, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{oldStandId, jdbcType=VARCHAR}, #{oldStandNum, jdbcType=VARCHAR}, #{oldStandName, jdbcType=VARCHAR}, #{newStandId, jdbcType=VARCHAR}, #{newStandNum, jdbcType=VARCHAR}, #{newStandName, jdbcType=VARCHAR}, #{oldFileType, jdbcType=VARCHAR}, #{oldSarType, jdbcType=VARCHAR}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR},#{compareStatus, jdbcType=VARCHAR}) @@ -131,6 +135,7 @@ modify_time, new_file_type, new_sar_type, + compare_status, #{compareType, jdbcType=VARCHAR}, @@ -149,6 +154,7 @@ #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR}, + #{compareStatus, jdbcType=VARCHAR}, @@ -169,7 +175,8 @@ modify_user = #{modifyUser}, modify_time = #{modifyTime}, new_file_type = #{newFileType}, - new_sar_type = #{newSarType} + new_sar_type = #{newSarType}, + compare_status = #{compareStatus} where id = #{id} @@ -222,6 +229,9 @@ new_sar_type = #{newSarType}, + + compare_status = #{compareStatus}, + where id = #{id} From 6178ba696c3b8e1e59460cf9b16903bad9fa803c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 24 Nov 2021 11:50:17 +0800 Subject: [PATCH 016/163] =?UTF-8?q?ocr=E6=8C=89=E9=92=AE=20=E5=92=8C=20?= =?UTF-8?q?=E6=8B=86=E5=88=86=E6=8C=89=E9=92=AE=20=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandFileEOController.java | 6 +++- .../service/SarStandFileEOService.java | 2 +- .../impl/SarStandFileEOServiceImpl.java | 34 +++++++++++++++++-- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java index bcedaae0..b1027836 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java @@ -3,6 +3,10 @@ package com.adc.da.slrs.standardSplit.controller; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.base.web.BaseController; import com.adc.da.http.PageInfo; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; @@ -146,7 +150,7 @@ public class SarStandFileEOController extends BaseController { @ApiOperation(value = "查询文本信息") @GetMapping("/queryFileInfoNew") - public ResponseMessage> queryFileInfoNew(@RequestParam("standId") String standId,@RequestParam("type") String type){ + public ResponseMessage> queryFileInfoNew(@RequestParam("standId") String standId,@RequestParam("type") String type) throws Exception { List sarStandFileEOS = sarStandFileEOService.selectFileByStandIdOCR(standId,type); return Result.success(sarStandFileEOS); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java index 4811a744..acd0004b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java @@ -25,6 +25,6 @@ public interface SarStandFileEOService { List selectFileByStandId(String standId); - List selectFileByStandIdOCR(String standId,String type); + List selectFileByStandIdOCR(String standId,String type) throws Exception; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 1d2c9d55..3713a30a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -1,5 +1,9 @@ package com.adc.da.slrs.standardSplit.service.impl; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.standardSplit.dao.SarStandFileEODao; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; @@ -13,6 +17,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.Map; @Service @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) @@ -20,6 +25,10 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { @Autowired private SarStandFileEODao sarStandFileEODao; + @Autowired + private ISarStandardsInfoService sarStandardsInfoEOService; + @Autowired + private ISarBussionessStandService sarBussionessStandEOService; @Override @@ -81,10 +90,30 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { } //type == 0 是pdf type==1 是doc @Override - public List selectFileByStandIdOCR(String standId , String type) { + public List selectFileByStandIdOCR(String standId , String type) throws Exception { QueryWrapper queryWrapper= new QueryWrapper<>(); + List choose=new ArrayList<>(); + SarStandardsInfo result = sarStandardsInfoEOService.selectStandardsInfoByKey(standId); + SarBussionessStand result2 = sarBussionessStandEOService.selectStandardsInfoUpdateByKey(standId); + if (null!=result.getAttrInfoCaseMap()){ + Map map=result.getAttrInfoCaseMap(); + for (String key:result.getAttrInfoCaseMap().keySet()) { + if (null!=result.getAttrInfoCaseMap().get(key) && !"".equals(result.getAttrInfoCaseMap().get(key))){ + if (result.getAttrInfoCaseMap().get(key).toString().contains(",")){ + choose.add(result.getAttrInfoCaseMap().get(key).toString().replace(",","")); + }else { + choose.add(result.getAttrInfoCaseMap().get(key).toString()); + } + } + } + } + if (null!=result2){ + + } queryWrapper.eq("STAND_ID",standId); + queryWrapper.eq("USE_MODEL","SOURCE_FILE"); + queryWrapper.in("ATT_ID",choose); List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); if ("0".equals(type)){ @@ -98,7 +127,8 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { }else { List remove=new ArrayList<>(); sarStandFileEOS.forEach(sarStandFileEO -> { - if (!sarStandFileEO.getFileName().contains(".DOC") && !sarStandFileEO.getFileName().contains(".doc") ){ + if (!sarStandFileEO.getFileName().contains(".DOC") && !sarStandFileEO.getFileName().contains(".doc") && + !sarStandFileEO.getFileName().contains(".DOCX") && !sarStandFileEO.getFileName().contains(".docx")){ remove.add(sarStandFileEO); } }); From cb06a54a3d3415c433979a07f2e2c26fb1667a28 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 24 Nov 2021 13:19:12 +0800 Subject: [PATCH 017/163] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 13 +- .../dao/EarlyWarningEODao.java | 5 +- .../entity/EarlyWarningEO.java | 13 ++ .../entity/StandWarningEO.java | 35 ++++ .../service/EarlyWarningEOService.java | 4 + .../Impl/EarlyWarningEOServiceImpl.java | 16 ++ .../mapper/sarStandWarning/EarlyWraningEO.xml | 156 +++++++++++++++--- 7 files changed, 217 insertions(+), 25 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index c364e76e..cbdf44e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -5,6 +5,7 @@ import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.service.Impl.EarlyWarningEOServiceImpl; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -53,6 +54,16 @@ public class EarlyWarningEOController extends BaseController { IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警 return getResponseMessage(list1, list2, list3, list4); } + + @GetMapping("/StandWarning") + @ApiOperation("标准预警查询") + public ResponseMessage> getStandWaring(StandWarningEO queryPageEO){ + IPage standWarning = earlyWarningEOService.getStandWarning(queryPageEO); + return Result.success(standWarning); + } + + + private ResponseMessage getResponseMessage(IPage list1, IPage list2, IPage list3, IPage list4) { List> listMap = new ArrayList>(); Map map = new HashMap(); @@ -71,7 +82,7 @@ public class EarlyWarningEOController extends BaseController { * date 2021-06-15 **/ @GetMapping("/ChangePermissions") - @ApiOperation("更改权限") + @ApiOperation("取消预警") public ResponseMessage ChangePermissions(String id) { String power = earlyWarningEOService.ChangePermissions(id); return Result.success("200",power); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index ff0617e0..853cf4d4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -2,14 +2,13 @@ package com.adc.da.slrs.sarStandWarning.dao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; public interface EarlyWarningEODao extends BaseMapper { - IPage selectWarningPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 870686fb..ca8060a4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.Tag; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -23,21 +25,27 @@ public class EarlyWarningEO extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("id") @TableId("ID") private String id; + @ApiModelProperty("标准id") @TableField("STAND_ID") private String standId; + @ApiModelProperty("标准类别") @TableField("STAND_TYPE") private String standType; + @ApiModelProperty("标准编号") @TableField("STAND_CODE") private String standCode; + @ApiModelProperty("标准名称") @TableField("STAND_NAME") private String standName; + @ApiModelProperty("发布日期") @TableField("PUT_TIME") @DateTimeFormat(pattern="yyyy-MM-dd") private Date putTime; @@ -45,18 +53,23 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private Date lastTime; + @ApiModelProperty("适用车型") @TableField("APPLY_TYPE") private String applyType; + @ApiModelProperty("责任工程师") @TableField("DUTY_ENGINEER") private String dutyEngineer; + @ApiModelProperty("条款（分解单）id") @TableField("ITEMS_ID") private String itemsId; + @ApiModelProperty("条款（分解单）编号") @TableField("ITEMS_NUM") private String itemsNum; + @ApiModelProperty("条款（分解单）名称") @TableField("ITEMS_NAME") private String itemsName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java new file mode 100644 index 00000000..d560a113 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.sarStandWarning.entity; + +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@Accessors(chain = true) +public class StandWarningEO extends EarlyWarningEO { + private static final long serialVersionUID = 1L; + + @DateTimeFormat(pattern = "YYYY-MM-dd") + private Date XCXSSRQ; + + @DateTimeFormat(pattern = "YYYY-MM-dd") + private Date ZCCSSRQ; + + @DateTimeFormat(pattern = "YYYY-MM-dd") + private Date SSRQ; + + private String standNum; + + private String standSort; + + private String standYear; + + private String issueTime; + + private Integer page; + + private Integer pageSize; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java index c037a64c..89ce035e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandWarning.service; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -16,4 +17,7 @@ public interface EarlyWarningEOService extends IService { IPage oldPolicyQuery(int current,int pageSize); String batchSave(List earlyWarningEOS); String ChangePermissions(String id); + + + IPage getStandWarning(StandWarningEO queryPage); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index e241936c..7ddabbbc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandWarning.service.Impl; import com.adc.da.scheduled.entity.DataDTO; import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService; import com.adc.da.sys.util.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -106,6 +107,17 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getStandWarning(StandWarningEO queryPage) { + IPage iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize()); + return earlyWarningEODao.selectWarningPage(iPage,queryPage); + } + private IPage getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper wrapper) { wrapper.eq("power",1); Page page = new Page<>(current, pageSize); @@ -144,4 +156,8 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + sarInfo.ID, + sarInfo.STAND_TYPE, + CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, + sarInfo.STAND_NAME, + sarInfo.PUT_TIME, + attr.SSRQ as SSRQ + + + + trim(replace(CONCAT( + sarInfo.STAND_SORT, + ' ', + sarInfo.STAND_NUMBER, + '-', + sarInfo.STAND_YEAR + ),' ','')) LIKE trim(replace(CONCAT('%',#{waringEO.standCode},'%'),' ','')) + + + sarInfo.STAND_NAME = #{waringEO.standName} + + + + DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') = DATE_FORMAT( + #{waringEO.putTime}, + '%Y-%m-%d' + ) + + + DATE_FORMAT(attr.SSRQ, '%Y-%m-%d') = DATE_FORMAT( + #{waringEO.SSRQ}, + '%Y-%m-%d' + ) + + + + + From 81f4444164ed580e1751670dbab47751d80204b8 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 24 Nov 2021 17:08:25 +0800 Subject: [PATCH 018/163] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=8C=E5=85=A8=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 4 +- .../entity/EarlyWarningEO.java | 2 +- .../mapper/sarStandWarning/EarlyWraningEO.xml | 147 -------------- .../sarStandWarning/EarlyWraningEOMapper.xml | 185 ++++++++++++++++++ 4 files changed, 188 insertions(+), 150 deletions(-) delete mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index cbdf44e1..3b034a1f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -42,7 +42,7 @@ public class EarlyWarningEOController extends BaseController { * @author zj * date 2021-06-15 **/ - @GetMapping("/StandWarning") + @GetMapping("/${restPath}/StandWarning") @ApiOperation("标准预警查询") public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize, @RequestParam(defaultValue = "1", value = "oldStandPage")int oldStandPage, @RequestParam(defaultValue = "10", value = "oldStandPageSize") int oldStandPageSize, @@ -55,7 +55,7 @@ public class EarlyWarningEOController extends BaseController { return getResponseMessage(list1, list2, list3, list4); } - @GetMapping("/StandWarning") + @GetMapping("/getStandWarning") @ApiOperation("标准预警查询") public ResponseMessage> getStandWaring(StandWarningEO queryPageEO){ IPage standWarning = earlyWarningEOService.getStandWarning(queryPageEO); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index ca8060a4..d8e1839b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -37,7 +37,7 @@ public class EarlyWarningEO extends BaseEntity { @TableField("STAND_TYPE") private String standType; - @ApiModelProperty("标准编号") + @ApiModelProperty("标准号") @TableField("STAND_CODE") private String standCode; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml deleted file mode 100644 index fa5f78e7..00000000 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sarInfo.ID, - sarInfo.STAND_TYPE, - CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, - sarInfo.STAND_NAME, - sarInfo.PUT_TIME, - attr.SSRQ as SSRQ - - - - - - trim(replace(CONCAT( - sarInfo.STAND_SORT, - ' ', - sarInfo.STAND_NUMBER, - '-', - sarInfo.STAND_YEAR - ),' ','')) LIKE trim(replace(CONCAT('%',#{waringEO.standCode},'%'),' ','')) - - - sarInfo.STAND_NAME = #{waringEO.standName} - - - - DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') = DATE_FORMAT( - #{waringEO.putTime}, - '%Y-%m-%d' - ) - - - DATE_FORMAT(attr.SSRQ, '%Y-%m-%d') = DATE_FORMAT( - #{waringEO.SSRQ}, - '%Y-%m-%d' - ) - - - - - - - diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml new file mode 100644 index 00000000..aa0032a4 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sarInfo.ID, + sarInfo.STAND_TYPE, + CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, + sarInfo.STAND_NAME, + sarInfo.PUT_TIME, + attr.SSRQ as SSRQ + + + + + + AND trim(replace(CONCAT( + sarInfo.STAND_SORT, + ' ', + sarInfo.STAND_NUMBER, + '-', + sarInfo.STAND_YEAR + ),' ','')) LIKE trim(replace(CONCAT('%',#{waringEO.standCode},'%'),' ','')) + + + AND sarInfo.STAND_NAME = #{waringEO.standName} + + + AND ( + DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') >= DATE_FORMAT( + #{waringEO.endPutTime}, + '%Y-%m-%d' + ) + + AND + DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') <= DATE_FORMAT( + #{waringEO.endPutTime}, + '%Y-%m-%d' + ) + ) + + + AND ( + DATE_FORMAT( attr.SSRQ, '%Y-%m-%d') >= DATE_FORMAT( + #{waringEO.startSSRQ}, + '%Y-%m-%d' + ) + + AND + DATE_FORMAT( attr.SSRQ, '%Y-%m-%d') <= DATE_FORMAT( + #{waringEO.endSSRQ}, + '%Y-%m-%d' + ) + ) + + + + + + + From 496ab17d731a2d0e8c60f41472cfc4277937bd02 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 24 Nov 2021 17:09:10 +0800 Subject: [PATCH 019/163] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=8C=E5=85=A8=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/StandWarningEO.java | 46 +++++++++++++++++-- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java index d560a113..b4c77336 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarStandWarning.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; @@ -10,15 +11,18 @@ import java.util.Date; @Accessors(chain = true) public class StandWarningEO extends EarlyWarningEO { private static final long serialVersionUID = 1L; - + @ApiModelProperty("新车型实施日期") @DateTimeFormat(pattern = "YYYY-MM-dd") - private Date XCXSSRQ; + private String XCXSSRQ; + @ApiModelProperty("在产车实施日期") @DateTimeFormat(pattern = "YYYY-MM-dd") - private Date ZCCSSRQ; + private String ZCCSSRQ; + @ApiModelProperty("实施日期") @DateTimeFormat(pattern = "YYYY-MM-dd") - private Date SSRQ; + private String SSRQ; + private String standNum; @@ -32,4 +36,38 @@ public class StandWarningEO extends EarlyWarningEO { private Integer pageSize; + @ApiModelProperty("范围查询新车型实施日期开始") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String startXCXSSRQ; + + @ApiModelProperty("范围查询新车型实施日期结束") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String endXCXSSRQ; + + @ApiModelProperty("范围查询在产车实施日期开始") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String startZCCSSRQ; + + @ApiModelProperty("范围查询在产车实施日期结束") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String endZCCSSRQ; + + @ApiModelProperty("范围查询实施日期开始") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String startSSRQ; + + + @ApiModelProperty("范围查询实施日期结束") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String endSSRQ; + + + @ApiModelProperty("范围查询发布日期开始") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String startPutTime; + + + @ApiModelProperty("范围查询发布日期结束") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String endPutTime; } From d220eb2f0754e7ce9397f37db92992d9fb517159 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 24 Nov 2021 17:44:42 +0800 Subject: [PATCH 020/163] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E5=AE=8C?= =?UTF-8?q?=E5=85=A8=E4=BD=93=E7=9A=84=E5=B0=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index aa0032a4..82229446 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -26,7 +26,8 @@ - sarInfo.ID, + warning.id AS ID, + sarInfo.ID AS STAND_ID, sarInfo.STAND_TYPE, CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, sarInfo.STAND_NAME, From 08853080db7dd5574206ea46dbb94a0dc4f6d9e4 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 25 Nov 2021 17:24:45 +0800 Subject: [PATCH 021/163] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=20-=E6=96=B0=E5=A2=9E=E5=92=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandUnqualifiedController.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java index a0994984..c63c1e8d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java @@ -56,6 +56,29 @@ public class SarStandUnqualifiedController extends BaseController add(@RequestBody SarStandUnqualified sarStandUnqualified){ + sarStandUnqualified.setCreateTime(new Date()); + if (sarStandUnqualifiedService.save(sarStandUnqualified)) { + return Result.success("新增成功"); + } + else{ + return Result.error("新增失败"); + } + } + + @ApiOperation("未符合项整改新增") + @PostMapping("/updateOne") + public ResponseMessage update(@RequestBody SarStandUnqualified sarStandUnqualified){ + if (sarStandUnqualifiedService.updateById(sarStandUnqualified)) { + return Result.success("新增成功"); + } + else{ + return Result.error("新增失败"); + } + } + /** * 分页查询未符合项 * @param sarStandUnqualifiedPage：筛选、分页信息 From 9818f55eca2e5517f96984f30b13cc2a1a226bfc Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 25 Nov 2021 18:06:42 +0800 Subject: [PATCH 022/163] =?UTF-8?q?vpps=E6=87=92=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarVppsTreeController.java | 8 ++++---- .../da/slrs/sarVppsTree/entity/SarVppsTree.java | 11 ++++++++++- .../service/impl/SarVppsTreeServiceImpl.java | 16 +++++++++++----- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java index ccd79b39..6865fbd8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java @@ -40,10 +40,10 @@ public class SarVppsTreeController extends BaseController { @ApiOperation("根据父ID查询子所有资源") @GetMapping("/childByList") - public ResponseMessage> childByList(String ids){ - SarVppsTree tree = new SarVppsTree(); - tree.setId(ids); - List tsResources = iSarVppsTreeService.recursionGetChildren(tree); + public ResponseMessage> childByList(SarVppsTree parent){ +// SarVppsTree tree = new SarVppsTree(); +// tree.setId(ids); + List tsResources = iSarVppsTreeService.recursionGetChildren(parent); return Result.success(tsResources); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java index e9fb22cf..a05e6b92 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java @@ -13,7 +13,7 @@ import java.util.List; /** *

- * + * *

* * @author super_liu @@ -66,6 +66,15 @@ public class SarVppsTree extends BaseEntity { @TableField(exist = false) private String parentIdsName; + @ApiModelProperty("层级") + @TableField("LEVEL") + private Integer level; + + @ApiModelProperty("类型") + @TableField("TYPE") + private String type; + + @TableField(exist=false) private List roleIds; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java index 32c8c76d..7f9f4028 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java @@ -27,8 +27,11 @@ public class SarVppsTreeServiceImpl extends ServiceImpl getAll(SarVppsTree sarVppsTree) { QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); - tsResourceQueryWrapper.isNull("PID"); + tsResourceQueryWrapper.eq("TYPE",sarVppsTree.getType()) + .eq("LEVEL",0); List list = this.baseMapper.selectList(tsResourceQueryWrapper); + + list.forEach(item->item.setVppsCode("10")); // for(SarVppsTree tree:list){ // tree.setChildren(recursionGetChildren((tree))); // } @@ -44,11 +47,14 @@ public class SarVppsTreeServiceImpl extends ServiceImpl recursionGetChildren(SarVppsTree parent){ QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); sarMenuQueryWrapper.orderByAsc("SORT"); - sarMenuQueryWrapper.in("PID",parent.getId()); +// sarMenuQueryWrapper.in("PID",parent.getId()); + sarMenuQueryWrapper.eq("LEVEL", parent.getLevel()+1) + .eq("TYPE",parent.getType()) + .like("VPPS_CODE",parent.getVppsCode()); List children=this.baseMapper.selectList(sarMenuQueryWrapper); - for(SarVppsTree sarMenu:children){ - sarMenu.setChildren(recursionGetChildren((sarMenu))); - } +// for(SarVppsTree sarMenu:children){ +// sarMenu.setChildren(recursionGetChildren((sarMenu))); +// } return children; } } From 9000a6e3fee6cb8e83ba95cd5a7c8747c64366ed Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 26 Nov 2021 10:57:58 +0800 Subject: [PATCH 023/163] =?UTF-8?q?vpps=E6=95=B0=E6=8D=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarVppsTree/service/impl/SarVppsTreeServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java index 7f9f4028..19131d39 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java @@ -31,7 +31,10 @@ public class SarVppsTreeServiceImpl extends ServiceImpl list = this.baseMapper.selectList(tsResourceQueryWrapper); - list.forEach(item->item.setVppsCode("10")); + list.forEach(item->{ + item.setCode(item.getVppsCode()+item.getChineseName()); + item.setVppsCode("10"); + }); // for(SarVppsTree tree:list){ // tree.setChildren(recursionGetChildren((tree))); // } @@ -55,6 +58,9 @@ public class SarVppsTreeServiceImpl extends ServiceImpl{ + item.setCode(item.getVppsCode()+item.getChineseName()); + }); return children; } } From b49935bbe845033620c810770bb19a318b1f4c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=B6=85=E7=84=B6?= Date: Fri, 26 Nov 2021 14:45:38 +0800 Subject: [PATCH 024/163] =?UTF-8?q?zcr:=E7=BB=9F=E8=AE=A1=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml | 4 ++-- .../mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml | 4 ++-- .../mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml index 6c61b91c..16b4556c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml @@ -19,8 +19,8 @@ and ( - sc_name like concat('%',#{scName} ,'%') - ssc_name like concat('%',#{scName} ,'%') + sc_name like concat('%',#{scName} ,'%') or + ssc_name like concat('%',#{scName} ,'%') or wg_name like concat('%',#{scName} ,'%') ) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml index 5d81cb64..b50c7e47 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml @@ -20,8 +20,8 @@ and ( - sc_name like concat('%',#{scName} ,'%') - ssc_name like concat('%',#{scName} ,'%') + sc_name like concat('%',#{scName} ,'%') or + ssc_name like concat('%',#{scName} ,'%') or wg_name like concat('%',#{scName} ,'%') ) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml index d3708885..5062508b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml @@ -20,10 +20,10 @@ and ( - sc_name like concat('%',#{scName} ,'%') - ssc_name like concat('%',#{scName} ,'%') - wg_name like concat('%',#{scName} ,'%') - ) + sc_name like concat('%',#{scName} ,'%') or + ssc_name like concat('%',#{scName} ,'%') or + wg_name like concat('%',#{scName} ,'%') + ) and role = #{role} From 4c31f54a5e77be2ff36212e9f218a79c5eff7ec3 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 26 Nov 2021 16:41:50 +0800 Subject: [PATCH 025/163] =?UTF-8?q?11.26=20=E9=A1=B9=E7=9B=AE=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=20=E6=9F=A5=E8=AF=A2=E6=A0=87=E5=87=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandItemsServiceImpl.java | 51 +++--- .../SarLawsAttrDetailedListMapper.xml | 165 +++++++++--------- 2 files changed, 115 insertions(+), 101 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 1d823c88..e71dcf59 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 @@ -155,24 +155,24 @@ public class SarStandItemsServiceImpl extends ServiceImpl pageInfo = null; - try { - pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page); - } catch (Exception e) { - e.printStackTrace(); - } +// try { +// pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page); +// } catch (Exception e) { +// e.printStackTrace(); +// } List standId = new ArrayList<>(); - for (SarStandardsInfo standardsInfo : pageInfo){ - if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){ - standId.add(standardsInfo.getId()); - } - } +// for (SarStandardsInfo standardsInfo : pageInfo){ +//// if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){ +// standId.add(standardsInfo.getId()); +//// } +// } List list=new ArrayList<>(); - if (standId==null || standId.size()==0){ - list = null; - }else { +// if (standId==null || standId.size()==0){ +// list = null; +// }else { list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType()); - } +// } IPage page1=new Page<>(); page1.setRecords(list); page1.setTotal(sarLawsAttrDetailedListDao.selectLawsByIdCount(standId,findStandDto.getStandName(),findStandDto.getStandType(),findStandDto.getFileType()).size()); @@ -195,6 +195,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl findAllItems(String type,String[] ids){ List list=dao.selectAllItemsByIds(type,ids); List res=new ArrayList<>(); + List chinese=new ArrayList<>(); if (null == list || list.isEmpty()){ return list; }else { @@ -206,20 +207,24 @@ public class SarStandItemsServiceImpl extends ServiceImpl0){ mark=mark.substring(0,a); } - if (null != map.get(Integer.valueOf(mark))){ - map.get(Integer.valueOf(mark)).add(sarStandItemsDto); - }else { - integerList.add(Integer.valueOf(mark)); - List middle=new ArrayList<>(); - middle.add(sarStandItemsDto); - map.put(Integer.valueOf(mark),middle); - } + try { + if (null != map.get(Integer.valueOf(mark))) { + map.get(Integer.valueOf(mark)).add(sarStandItemsDto); + } else { + integerList.add(Integer.valueOf(mark)); + List middle = new ArrayList<>(); + middle.add(sarStandItemsDto); + map.put(Integer.valueOf(mark), middle); + } + }catch (Exception e){ + chinese.add(sarStandItemsDto); + } }); Collections.sort(integerList); integerList.forEach(integer -> { res.addAll(map.get(integer)); }); - + res.addAll(chinese); return res; } } 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 0984ff19..17fe6030 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 @@ -99,95 +99,43 @@ order by number - - + + + + + + SELECT + law_id, + '-1' AS itemsId, + 'stand' AS mark + FROM + warning_date AS warning + WHERE + DATE_FORMAT(warning.SSRQ,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m-%d') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d') + UNION + SELECT + STAND_ID, + ID AS itemsId, + 'item' AS mark + FROM + sar_stand_items AS item + WHERE + DATE_FORMAT(item.XCXSSRQ,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m-%d') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d') + OR + DATE_FORMAT(item.ZCCSSRQ,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m-%d') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d') + + + From c27beedaa2c2bbeb3b5bf7603ae00b48f2960c09 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Wed, 1 Dec 2021 15:41:11 +0800 Subject: [PATCH 045/163] feat: There is no way the, buss sort --- .../mapper/sarBussionessStand/SarBussionessStandMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 02383949..982af830 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 @@ -382,7 +382,7 @@ when tmp_tb.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16 ELSE 17 END, - tmp_tb.stand_sort ASC + tmp_tb.stand_sort ASC,CAST(tmp_tb.STAND_NUMBER AS decimal(9,2)) ASC,tmp_tb.STAND_YEAR DESC,tmp_tb.id ORDER BY From f76e0aabe54fdb969073391e4c9c26968df6e139 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 1 Dec 2021 16:49:45 +0800 Subject: [PATCH 046/163] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BA=8B=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 1 - 1 file changed, 1 deletion(-) 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 8984d362..91c7ebed 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 @@ -819,7 +819,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Wed, 1 Dec 2021 17:59:17 +0800 Subject: [PATCH 047/163] =?UTF-8?q?12.1bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 25 +++++- .../SarStandProjectLibraryController.java | 37 +++++++++ .../dao/SarStandProjectLibraryDao.java | 2 + .../entity/StandAttrInfoDto.java | 2 + .../SarStandProjectLibraryService.java | 3 + .../SarStandProjectLibraryServiceImpl.java | 78 +++++++++++++++++++ .../entity/SarStandUnqualified.java | 3 + ...ndardComplianceAssessResultController.java | 43 +++++++++- ...SarStandardComplianceProductAssessDao.java | 11 +++ .../SarStandardComplianceProductAssess.java | 17 +++- .../entity/unCountDTO.java | 35 +++++++++ ...tandardComplianceProductAssessService.java | 7 ++ ...ardComplianceProductAssessServiceImpl.java | 28 +++++++ .../entity/SarStandardsInfo.java | 4 + .../SarStandProjectLibraryMapper.xml | 19 +++++ ...rStandardComplianceProductAssessMapper.xml | 51 ++++++++++++ 16 files changed, 361 insertions(+), 4 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java 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 88bf5c29..59229967 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 @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; -import java.util.List; +import java.util.*; /** *

@@ -53,6 +53,29 @@ public class SarStandItemsController extends BaseController { } } + @ApiOperation(value = "项目评估流程分解单查询") + @GetMapping("/workflowFindItems") + public ResponseMessage workflowFindItems( @RequestParam("ids") String ids,@RequestParam("types") String types){ + List id=new ArrayList<>(Arrays.asList(ids.split(","))); + List type=new ArrayList<>(Arrays.asList(types.split(","))); + Map map=new HashMap<>(); + int i =0 ; + for (String s:type) { + if (null!=map.get(s)){ + map.put(s,map.get(s)+","+id.get(i)); + }else { + map.put(s,id.get(i)); + } + } + List ItemDto = new ArrayList<>(); + map.entrySet().forEach(stringStringEntry -> { + if (!"BDR".equals(stringStringEntry.getKey())){ + ItemDto.addAll(ServiceImpl.findAllItems(stringStringEntry.getKey(),stringStringEntry.getValue().split(","))); + } + }); + return Result.success("200",ItemDto); + } + @ApiOperation(value = "分解单查询") @GetMapping("/querySarItemAndInterpretation") public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index a2c3cd93..bb2ee7fc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -144,6 +144,29 @@ public class SarStandProjectLibraryController extends BaseController list = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id,cars); return Result.success("200",list); } + + /** + * + * @param current + * @param pageSize + * @param id + * @return + * @author zj + * date 2021-07-15 + **/ + @GetMapping("/queryStandInfoNew") + @ApiOperation("查询标准信息") + public ResponseMessage queryStandInfoNew(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize, + String id,String cars){ +// List list = sarStandProjectLibraryService.queryStandId(id); +// List list1 = new ArrayList(); +// for(SarStandProjectLibrary s:list){ +// list1.add(s.getStandId()); +// } +// System.out.println(list1); + IPage list = sarStandProjectLibraryService.queryStandInfoNew(current,pageSize,id,cars); + return Result.success("200",list); + } /** * * @param id @@ -192,6 +215,20 @@ public class SarStandProjectLibraryController extends BaseController list){ + sarStandProjectLibraryService.batchInsertAdd(list); + return Result.success("200","新增成功",list); + } /** * * @param standAttrInfoExcelDto diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index 73a61e1c..f5a92dab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -29,6 +29,8 @@ public interface SarStandProjectLibraryDao extends BaseMapper getAllStands(); List getAllStand(); List updateByProjectId(@Param("id")String id, @Param("version")String version); + List updateByProjectIdBath(@Param("id")List id, @Param("version")String version); void deleteByProjectId(@Param("projectId")String projectId); + List selectListByids(@Param("ids") List ids); } 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 140d8fd6..fb26f972 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 @@ -59,4 +59,6 @@ public class StandAttrInfoDto { //关联模块--乘用车vpps中文名称 @ExcelProperty("关联模块--乘用车vpps中文名称") private String CYCVPPSCN; + + private Long unCount; } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index e1487e33..85ed659b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -22,8 +22,11 @@ public interface SarStandProjectLibraryService { List queryByProductLine(String productLine); List queryStandId(String standId); IPage queryStandInfo(int current, int pageSize, String standId, String cars); + + IPage queryStandInfoNew(int current, int pageSize, String standId, String cars); void deleteByIds(List ids); void batchInsert(@Param("ids") List list); + void batchInsertAdd(@Param("ids") List list); List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); public Head AnalysisJsonAndStorage(String jsonStr); 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 ef5124ef..b427434a 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 @@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -370,6 +371,63 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryStandInfoNew(int current, int pageSize, String standId, String cars) { + + //cars传回值为1时判断是从车型项目库中调取 + + QueryWrapper 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" + + " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount "); + wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'"); + Page page1 = new Page<>(current, pageSize); + IPage userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1); + System.out.println("总条数"+userIPage1.getTotal()); + System.out.println("总页数"+userIPage1.getPages()); + + QueryWrapper wrapper2 = new QueryWrapper<>(); + wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQ","ZCCSSRQ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN"); + wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.project_id ='"+ standId+"'"); + + Page page2 = new Page<>(current, pageSize); + IPage userIPage2 = sarStandAttrInfoDao.selectPage(page2, wrapper2); + System.out.println("总条数"+userIPage2.getTotal()); + System.out.println("总页数"+userIPage2.getPages()); + List list = new ArrayList<>(); + List list1 = userIPage1.getRecords(); + List list2 = userIPage2.getRecords(); + for(SarStandardsInfo s:list1){ + StandAttrInfoDto p =new StandAttrInfoDto(); + p.setStandId(s.getId()); + p.setStandNumber(s.getStandNumber()); + p.setStandSort(s.getStandSort()); + p.setStandYear(s.getStandYear()); + p.setStandName(s.getStandName()); + p.setStandType(s.getStandType()); + p.setStandEnName(s.getStandEnName()); + p.setUnCount(s.getUnCount()); + for (SarStandAttrInfo a:list2){ + if(s.getId().equals(a.getStandId())){ + p.setCYCVPPSBM(a.getCycvppsbm()); + p.setCYCVPPSCN(a.getCycvppscn()); + p.setSSRQ(a.getSsrq()); + p.setXCXSSRQ(a.getXcxssrq()); + p.setZCCSSRQ(a.getZccssrq()); + p.setKCCVPPSBM(a.getKccvppsbm()); + p.setKCCVPPSCN(a.getKccvppscn()); + p.setZRBM(a.getZrbm()); + } + } + list.add(p); + } + IPage userIPage = new Page<>(); + userIPage.setRecords(list); + userIPage.setTotal(userIPage1.getTotal()); + System.out.println("总条数"+userIPage.getTotal()); + System.out.println("总页数"+userIPage.getPages()); + return userIPage; + } @Override public void deleteByIds(List ids) { sarStandProjectLibraryDao.deleteByIds(ids); @@ -385,6 +443,26 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list) { + List ids=new ArrayList<>(); + List projectIds=new ArrayList<>(); + list.forEach(standProjectRelationDto -> { + if (!ids.contains(standProjectRelationDto.getStandId())) { + ids.add(standProjectRelationDto.getStandId()); + }}); + List standProjectRelationDtos=sarStandProjectLibraryDao.selectListByids(ids); + List ins=new ArrayList<>(); + list.forEach(standProjectRelationDto -> { + if (!standProjectRelationDtos.contains(standProjectRelationDto.getProjectId())){ + ins.add(standProjectRelationDto); + projectIds.add(standProjectRelationDto.getProjectId()); + } + }); + sarStandProjectLibraryDao.batchInsert(ins); + sarStandProjectLibraryDao.updateByProjectIdBath(projectIds, TimeVersion()); + } + @Override public List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto ,String id) { List ids = standAttrInfoExcelDto.getIds(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index c4e954cb..5018002c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -51,6 +51,9 @@ public class SarStandUnqualified extends BaseEntity { @TableField("STAND_NAME") private String standName; + @ApiModelProperty(value = "项目编号") + @TableField("product_id") + private String productId; // @ExcelProperty("标准编号") // @ApiModelProperty(value = "标准编号") // @TableField("STAND_NUMBER") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 0c6639cd..d2be75a6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import oracle.ucp.proxy.annotation.Post; import org.apache.commons.beanutils.BeanUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,7 +59,7 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandApplicationType() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } @@ -175,6 +174,46 @@ public class SarStandardComplianceAssessResultController { return Result.success(page); } + + @ApiOperation(value = "标准涉及项目复合性详情") + @GetMapping("/productNewDetail") + public ResponseMessage>> selectProductDetail(SarStandardComplianceProductAssessEO eo) throws Exception { + IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); + Map> map=new HashMap<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("STAND_ID", eo.getStandId()); + queryWrapper.eq("product_id", eo.getProductId()); + queryWrapper.isNotNull("research_completion_time"); + queryWrapper.orderByAsc("product_name"); + queryWrapper.orderByAsc("standard_item"); + Page p1=new Page(); + IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); + BeanUtils.copyProperties(page,p1); + p1.setRecords(page.getRecords()); + p1.setTotal(page.getTotal()); + map.put("unfit",p1); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper.eq("STAND_ID", eo.getStandId()); + queryWrapper.eq("product_id", eo.getProductId()); + queryWrapper1.ne("research_compliance",""); + queryWrapper1.orderByAsc("product_name"); + queryWrapper1.orderByAsc("standard_item"); + IPage page1 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper1); + map.put("fit",page1); + return Result.success(map); + } + + @ApiOperation(value = "标准涉及项目复合性") + @GetMapping("/productNew") + public ResponseMessage> selectProduct(unCountDTO eo) throws Exception { + Page iPage = new Page<>(); + iPage.setCurrent(eo.getCurrent()); + iPage.setSize(eo.getSize()); + + IPage page = iSarStandardComplianceProductAssessService.selectPages(iPage, eo); + return Result.success(page); + } + @ApiOperation(value = "插入标准涉及项目符合性清单") @PostMapping("/add") public ResponseMessage insertProduct(@RequestBody List eo) throws Exception { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java index 93e7b580..6cf6e1b8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java @@ -1,7 +1,14 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.dao; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssessEO; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.unCountDTO; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +20,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SarStandardComplianceProductAssessDao extends BaseMapper { + List selectPages(@Param("page")Long page,@Param("pageSize")Long size,@Param("product") unCountDTO productAssess); + + List selectPagesCount(@Param("product")unCountDTO productAssess); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index c6496762..4a862f68 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -1,7 +1,6 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.entity; import com.adc.da.base.entity.BaseEntity; -import java.time.LocalDateTime; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; @@ -121,7 +120,23 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @TableField("type") private String type; + @ApiModelProperty(value = "评估时间") + @TableField("evaluation_time") + private String evaluationTime; + + @ApiModelProperty(value = "评估人") + @TableField("evaluation_people") + private String evaluationPeople; + + @ApiModelProperty(value = "评估人") + @TableField("evaluation_people_name") + private String evaluationPeopleName; + private String id; + @ApiModelProperty(value = "符合不符合") + @TableField(exist = false) + private String bfh; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java new file mode 100644 index 00000000..b4969e90 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.sarStandardComplianceAssessResult.entity; + +import lombok.Data; + +@Data +public class unCountDTO { + + private String standId; + + private String productName; + + private String productId; + + private String productNumber; + + private String productLine; + + private String projectGroup; + + private String projectManager; + + private String uName; + + private String unCount; + + private Long current; + + private Long size; + + //项目编号 + private String sarId; + + private String type; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java index f813e993..3b36bdbb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java @@ -1,7 +1,12 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.service; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.unCountDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; + /** *

@@ -13,4 +18,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ISarStandardComplianceProductAssessService extends IService { + IPage selectPages(Page page, @Param("product") unCountDTO productAssess); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java index ea8c9f44..3bd6dce7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java @@ -2,10 +2,17 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess; import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssessEO; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.unCountDTO; import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarStandardComplianceProductAssessService; +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 java.util.List; + /** *

* 服务实现类 @@ -17,4 +24,25 @@ import org.springframework.stereotype.Service; @Service public class SarStandardComplianceProductAssessServiceImpl extends ServiceImpl implements ISarStandardComplianceProductAssessService { + @Autowired + SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao; + + + @Override + public IPage selectPages(Page pages, unCountDTO productAssess) { + IPage productAssessIPage= new Page<>(); + List res=sarStandardComplianceProductAssessDao.selectPages(pages.getCurrent(),pages.getSize(),productAssess); + res.forEach(unCountDTO -> {unCountDTO.setStandId(productAssess.getStandId()); + unCountDTO.setType(productAssess.getType());}); + productAssessIPage.setRecords(res); + List a=sarStandardComplianceProductAssessDao.selectPagesCount(productAssess); + if (null!=a) { + productAssessIPage.setTotal(a.size()); + }else { + productAssessIPage.setTotal(0); + } + productAssessIPage.setCurrent(pages.getCurrent()); + productAssessIPage.setSize(pages.getSize()); + return productAssessIPage; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 0f5cdc58..b4cefc56 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -142,6 +142,10 @@ public class SarStandardsInfo extends BaseEntity { @TableField("STAND_SYSTEM") private String standSystem; + @ApiModelProperty(value = "为符合数量") + @TableField(exist = false) + private Long unCount; + // 以下为非表中字段 @TableField(exist = false) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 51417d7d..2a39e883 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -39,6 +39,17 @@ + + update sar_stand_project_library + + set detailed_list_version = #{version} where id in + + #{item} + + + + + SELECT DISTINCT ID FROM sar_standards_info where VALID_FLAG=0 + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml index b82994ed..43469b23 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml @@ -3,5 +3,56 @@ + + From 90d84a74435ceb65b95a29dce8e7d3a5caf6efd4 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 1 Dec 2021 19:00:55 +0800 Subject: [PATCH 048/163] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=8D=95=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarModelTreeServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java index faba2999..ee783e2a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** *

@@ -62,8 +64,11 @@ public class SarModelTreeServiceImpl extends ServiceImpl{ - switch (item.getHasChildren()){ + List collect = children.stream() + .filter(item -> !parent.getModel().equals(item.getModel())).collect(Collectors.toList()); + + collect.forEach(item-> { + switch (item.getHasChildren()) { case "0": item.setLeaf(true); break; @@ -73,6 +78,8 @@ public class SarModelTreeServiceImpl extends ServiceImpl Date: Wed, 1 Dec 2021 19:08:59 +0800 Subject: [PATCH 049/163] =?UTF-8?q?=E9=A2=84=E8=AD=A6=20=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 8 ++++-- .../scheduled/dao/SarStandardWarningDao.java | 2 +- .../entity/EarlyWarningEO.java | 22 ++++++--------- .../sarStandWarning/SarStandardWarningDao.xml | 28 ++++++------------- 4 files changed, 25 insertions(+), 35 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 4127374c..321aca5c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -23,6 +23,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.util.*; @@ -62,7 +63,7 @@ public class ScheduledJob { // @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 @Scheduled(cron="*/5 * * * * ?") - @Async +// @Async public void WarningSchedulingTasks() { Logger logger = LoggerFactory.getLogger(ScheduledJob.class); @@ -88,7 +89,7 @@ public class ScheduledJob { */ //删除不在预警范围的标准 - int remove = sarStandardWarningDao.cancelWarning(); + int remove = sarStandardWarningDao.autoCancelWarning(); logger.info("=========================================================================="); logger.info("取消"+remove+"条预警"); @@ -100,6 +101,9 @@ public class ScheduledJob { List warningList = sarStandardWarningDao.getWarningId(term); + warningList.forEach(item->{ + item.setId(UUIDUtils.randomUUID20()); + }); //持久化至预警表 忽略标准id和标志位都一样的数据 if (warningList.size()!=0){ //此表的STAND_ID和MARK字段以及ITEMS_ID字段需个建立唯一性约束 diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java index 89bd37f0..701d18d6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java @@ -16,7 +16,7 @@ public interface SarStandardWarningDao extends BaseMapper { public int ignoreInsert(@Param(value = "warningEOS") List warningEOS); - public int cancelWarning(); + public int autoCancelWarning(); public List getWarningId(TermDTO term); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index d8e1839b..c87af9ea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -34,19 +34,19 @@ public class EarlyWarningEO extends BaseEntity { private String standId; @ApiModelProperty("标准类别") - @TableField("STAND_TYPE") + @TableField(exist = false) private String standType; @ApiModelProperty("标准号") - @TableField("STAND_CODE") + @TableField(exist = false) private String standCode; @ApiModelProperty("标准名称") - @TableField("STAND_NAME") + @TableField(exist = false) private String standName; @ApiModelProperty("发布日期") - @TableField("PUT_TIME") + @TableField(exist = false) @DateTimeFormat(pattern="yyyy-MM-dd") private Date putTime; @@ -54,30 +54,26 @@ public class EarlyWarningEO extends BaseEntity { private Date lastTime; @ApiModelProperty("适用车型") - @TableField("APPLY_TYPE") + @TableField(exist = false) private String applyType; @ApiModelProperty("责任工程师") - @TableField("DUTY_ENGINEER") + @TableField(exist = false) private String dutyEngineer; @ApiModelProperty("条款（分解单）id") - @TableField("ITEMS_ID") + @TableField(exist = false) private String itemsId; @ApiModelProperty("条款（分解单）编号") - @TableField("ITEMS_NUM") + @TableField(exist = false) private String itemsNum; - @ApiModelProperty("条款（分解单）名称") - @TableField("ITEMS_NAME") - private String itemsName; + @TableField("POLICY_ID") private String policyId; - @TableField("POLICY_NAME") - private String policyName; @TableField("MARK") private String mark; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml index 4e664dcd..4c21182a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml @@ -4,34 +4,24 @@ - REPLACE INTO sar_stand_warning (ID,STAND_ID, STAND_TYPE, STAND_CODE,STAND_NAME,PUT_TIME,APPLY_TYPE,DUTY_ENGINEER,ITEMS_ID,ITEMS_NUM,ITEMS_NAME,POLICY_ID,POLICY_NAME,MARK,POWER) + REPLACE INTO sar_stand_warning (ID,STAND_ID,ITEMS_ID,POLICY_ID,MARK,POWER) VALUES ( #{item.id} ,#{item.standId} - ,#{item.standType} - ,#{item.standCode} - ,#{item.standName} - ,#{item.putTime} - ,#{item.applyType} - ,#{item.dutyEngineer} ,#{item.itemsId} - ,#{item.itemsNum} - ,#{item.itemsName} ,#{item.policyId} - ,#{item.policyName} ,#{item.mark} ,#{item.power} ) - - DELETE - FROM - sar_stand_warning + + UPDATE sar_stand_warning + SET POWER ='0' WHERE STAND_ID IN ( SELECT @@ -39,29 +29,29 @@ FROM warning_date WHERE - DATE_FORMAT(SSRQ, '%Y-%m-%d') lt; DATE_FORMAT(now(), '%Y-%m-%d') + DATE_FORMAT(SSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') UNION SELECT ID FROM sar_standards_info WHERE - DATE_FORMAT(PUT_TIME, '%Y-%m-%d') lt; DATE_FORMAT(now(), '%Y-%m-%d') + DATE_FORMAT(PUT_TIME, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') UNION SELECT STAND_ID FROM sar_stand_items WHERE - DATE_FORMAT(XCXSSRQ, '%Y-%m-%d') lt; DATE_FORMAT(now(), '%Y-%m-%d') - OR DATE_FORMAT(ZCCSSRQ, '%Y-%m-%d') lt; DATE_FORMAT(now(), '%Y-%m-%d') + DATE_FORMAT(XCXSSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') + OR DATE_FORMAT(ZCCSSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') ) - select count(sar_stand_unqualified.product_id) from sar_stand_unqualified - left join sar_stand_project_library on sar_stand_unqualified.product_id = sar_stand_project_library.project_number - LEFT JOIN ts_user on ts_user.USID = sar_stand_project_library.project_manager - where STAND_ID = #{product.standId} and CLOSE_STATE = '1' + select count(sar_stand_unqualified.product_id) + FROM + sar_stand_project_library + LEFT JOIN sar_stand_unqualified ON sar_stand_unqualified.product_id = sar_stand_project_library.project_number + LEFT JOIN ts_user ON ts_user.USID = sar_stand_project_library.project_manager + WHERE + sar_stand_project_library.project_number in (SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId}) + AND CLOSE_STATE = '1' group by PRODUCT_NAME, sar_stand_project_library.project_group, From a7206afc5d3e615caa8ef14dedf1d5a716c7bf64 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 2 Dec 2021 16:24:40 +0800 Subject: [PATCH 056/163] =?UTF-8?q?=E9=A2=84=E8=AD=A6=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=AD=90=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 15 +++++++-- .../scheduled/dao/SarStandardWarningDao.java | 4 +++ .../sarStandWarning/SarStandardWarningDao.xml | 31 +++++++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 7a01e536..256281d8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -9,6 +9,8 @@ import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.adc.da.slrs.sarStandWarning.service.IWarningDateService; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.util.UUIDUtils; @@ -25,6 +27,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.PostConstruct; import java.time.LocalDate; import java.util.*; import java.util.regex.Pattern; @@ -59,8 +62,10 @@ public class ScheduledJob { @Autowired private SarStandAttrInfoDao sarStandAttrInfoDao; //属性字段表 + @Autowired + private IWarningDateService iWarningDateService;// 预警日期 - +// @PostConstruct //程序启动时执行一次 @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 // @Scheduled(cron="*/5 * * * * ?") @Async @@ -98,8 +103,14 @@ public class ScheduledJob { TermDTO term = new TermDTO(); //预警期限(当前日期至3个月后) + List warningDateList = sarStandardWarningDao.getWarningDate(term); //查询符合预警期限的标准 多个 - List warningList = sarStandardWarningDao.getWarningId(term); + warningDateList.forEach(item->{ + item.setId(UUIDUtils.randomUUID20()); + }); + iWarningDateService.remove(null); //清空标准的日期子表 + iWarningDateService.saveBatch(warningDateList); // 保存进入标准的日期子表 保存标准的实施日期 新车型实施日期 在产车实施日期 多个 + List warningList = sarStandardWarningDao.getWarningId(term); //联接标准的日期子表 和分解单表 查询符合预警期限的标准和分解项 warningList.forEach(item->{ item.setId(UUIDUtils.randomUUID20()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java index 701d18d6..196b8046 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java @@ -2,6 +2,7 @@ package com.adc.da.scheduled.dao; import com.adc.da.scheduled.entity.TermDTO; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -19,4 +20,7 @@ public interface SarStandardWarningDao extends BaseMapper { public int autoCancelWarning(); public List getWarningId(TermDTO term); + + public List getWarningDate(TermDTO term); + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml index 9938db58..ded69c87 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml @@ -74,4 +74,35 @@ + + + From 235f81b35c7b686ff3efd411b42d79320ce49c60 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 2 Dec 2021 17:24:37 +0800 Subject: [PATCH 057/163] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E5=8F=AF=E4=BB=A5=E6=90=9C=E7=B4=A2=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=90=8D=E7=A7=B0=20=E6=A0=87=E5=87=86=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=90=9C=E7=B4=A2=E6=A1=86=E5=8F=AF=E4=BB=A5=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A0=87=E5=87=86=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 d8c46134..a5215c4e 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 @@ -758,15 +758,15 @@ SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR = '') - or (stand_name like concat(concat('%',#{page.standNumber}),'%')) + ) and stand_name like concat(concat('%',#{page.standName}),'%') - or STAND_NUMBER like concat(concat('%',#{page.standName}),'%') - or STAND_YEAR like concat(concat('%',#{page.standName}),'%') - or STAND_SORT like concat(concat('%',#{page.standName}),'%') + + + and stand_en_name like concat(concat('%',#{page.standEnName}),'%') From dab0c3db124c0da43b198ad117a870551150ed21 Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Fri, 3 Dec 2021 11:29:49 +0800 Subject: [PATCH 058/163] leo --- .../resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml index 3ad98715..911ee3ff 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml @@ -21,7 +21,7 @@ and name like concat('%',#{name},'%') - and project_id = #{project_id} + and project_id = #{projectId} and project_name = #{project_name} @@ -111,7 +111,7 @@ name = #{name}, - project_id = #{project_id}, + project_id = #{projectId}, project_name = #{project_name}, @@ -254,7 +254,7 @@ #{name}, - #{project_id}, + #{projectId}, #{project_name}, From 505be3cdc9d3fe2984f10c74f531610f33c0da32 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 3 Dec 2021 14:48:31 +0800 Subject: [PATCH 059/163] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97=20=E5=8D=8A?= =?UTF-8?q?=E9=87=8D=E6=9E=84o(*=EF=BF=A3=EF=B8=B6=EF=BF=A3*)o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EsRevisePlanController.java | 7 +++++ .../esRevisePlan/dao/EsRevisePlanDao.java | 1 + .../esRevisePlan/entity/EsRevisePlan.java | 15 +++++++++++ .../service/IEsRevisePlanService.java | 5 ++-- .../service/impl/EsRevisePlanServiceImpl.java | 27 ++++++++++++++++--- .../esRevisePlan/EsRevisePlanMapper.xml | 13 ++++++++- 6 files changed, 61 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 63852873..e9eee749 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -52,6 +52,13 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.getOnePlan(id)); } + + @ApiOperation(value = "获取是否存在重复名企标名称接口") + @GetMapping("getDataByName") + public ResponseMessage getDataByName(EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.getDataByName(esRevisePlan)); + } + @ApiOperation(value = "编辑企标计划") @PostMapping("modPlan") public ResponseMessage modPlan(EsRevisePlan esRevisePlan){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java index dee08a19..bb010d5e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java @@ -19,6 +19,7 @@ public interface EsRevisePlanDao extends BaseMapper { Integer getQueryTotal(EsRevisePlan esRevisePlan); List selectAll(EsRevisePlan esRevisePlan);//查询所有 List queryAll(EsRevisePlan esRevisePlan);//多条件查询 + List selectPageByName(EsRevisePlan esRevisePlan);//多条件查询 EsRevisePlan selectOne(String id);//查询详情 int updateOne(EsRevisePlan esRevisePlan);//编辑 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 93cfa32f..9625c6d4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.esRevisePlan.entity; import java.util.Date; import com.adc.da.base.page.BasePage; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -46,15 +47,29 @@ public class EsRevisePlan extends BasePage { @ApiModelProperty(value = "工作组组长") private String wgLeader; + + @ApiModelProperty(value = "起草人姓名") + private String drafterName; + + @ApiModelProperty(value = "评审责任人姓名") + private String resPersonName; + + @ApiModelProperty(value = "工作组组长姓名") + private String wgLeaderName; + @ApiModelProperty(value = "计划标准初稿完成时间") @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date draftTime; @ApiModelProperty(value = "计划标准发布时间") @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date releaseTime; @ApiModelProperty(value = "起草责任单位") private String unit; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index cc5eab90..62c17fcf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -18,8 +18,9 @@ public interface IEsRevisePlanService extends IService { List queryAllPlans(EsRevisePlan esRevisePlan);//多条件查询 EsRevisePlan getOnePlan(String id);//查询详情 - int modPlan(EsRevisePlan esRevisePlan);//编辑 - int addPlan(EsRevisePlan esRevisePlan);//插入 + String modPlan(EsRevisePlan esRevisePlan);//编辑 + String addPlan(EsRevisePlan esRevisePlan);//插入 int delPlan(String id);//删除 int delPlans(String ids);//批量删除 + List getDataByName(EsRevisePlan esRevisePlan); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 0e7a4ade..f5a1e950 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -23,6 +23,8 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getAllPlans(EsRevisePlan esRevisePlan) { @@ -46,14 +48,26 @@ public class EsRevisePlanServiceImpl extends ServiceImpl esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); + if (esRevisePlans.size()>0){ + return "企标名称不能重复,请更换新的企标名称。"; + }else { + esRevisePlanDao.updateOne(esRevisePlan); + return "操作成功"; + } } @Override - public int addPlan(EsRevisePlan esRevisePlan) { + public String addPlan(EsRevisePlan esRevisePlan) { esRevisePlan.setId(UUIDUtils.randomUUID(32)); - return esRevisePlanDao.insertOne(esRevisePlan); + List esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); + if (esRevisePlans.size()>0){ + return "企标名称不能重复,请更换新的企标名称"; + }else { + esRevisePlanDao.insertOne(esRevisePlan); + return "操作成功"; + } } @Override @@ -66,4 +80,9 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getDataByName(EsRevisePlan esRevisePlan) { + return esRevisePlanDao.selectPageByName(esRevisePlan); + } } 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 fbf42949..b35fc1d7 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 @@ -17,7 +17,10 @@ wg_leader, draft_time, release_time, - unit + unit, + (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, + (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName, + (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName @@ -206,4 +209,12 @@ #{id} + + From fb04c67b17ad11de0f6603e707831de3e69d8767 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 5 Dec 2021 09:43:31 +0800 Subject: [PATCH 060/163] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EvaluationIndexController.java | 43 +++++++++ .../QualityEvaluationController.java | 96 +++++++++++++++++++ .../dao/EvaluationIndexDao.java | 16 ++++ .../dao/QualityEvaluationDao.java | 16 ++++ .../entity/EvaluationIndex.java | 55 +++++++++++ .../entity/FormVO.java | 15 +++ .../entity/QualityEvaluation.java | 90 +++++++++++++++++ .../service/IEvaluationIndexService.java | 20 ++++ .../service/IQualityEvaluationService.java | 25 +++++ .../impl/EvaluationIndexServiceImpl.java | 40 ++++++++ .../impl/QualityEvaluationServiceImpl.java | 81 ++++++++++++++++ .../evaluationIndex/EvaluationIndexMapper.xml | 5 + .../EvaluationIndexMapper.xml | 5 + .../QualityEvaluationMapper.xml | 5 + 14 files changed, 512 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/EvaluationIndexController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/EvaluationIndexDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/EvaluationIndex.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IEvaluationIndexService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/EvaluationIndexServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/evaluationIndex/EvaluationIndexMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/EvaluationIndexMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/EvaluationIndexController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/EvaluationIndexController.java new file mode 100644 index 00000000..e34ee833 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/EvaluationIndexController.java @@ -0,0 +1,43 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IEvaluationIndexService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.EvaluationIndex; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import javax.xml.ws.Response; +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author zhaokaiyao +* @since 2021-12-03 +*/ +@RestController +@Api(description = "|EvaluationIndex|") +@RequestMapping("/${restPath}/sarEnterpriseStandardEvaluation/evaluation-index") +public class EvaluationIndexController extends BaseController { + @Autowired + private IEvaluationIndexService iEvaluationIndexService; + + + @ApiOperation("获取评价指标") + @GetMapping("getEvaluationIndex") + public ResponseMessage> getEvaluationIndex(EvaluationIndex query){ + List evaluationIndex = iEvaluationIndexService.getEvaluationIndex(query); + + return Result.success(evaluationIndex); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java new file mode 100644 index 00000000..b6a16ccb --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java @@ -0,0 +1,96 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.FormVO; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; +import java.util.Optional; + +/** +*

+ * 前端控制器 + *

+* +* @author zhaokaiyao +* @since 2021-12-03 +*/ +@RestController +@Api(description = "|QualityEvaluation|") +@RequestMapping("/${restPath}/sarEnterpriseStandardEvaluation/quality-evaluation") +public class QualityEvaluationController extends BaseController { + + + @Autowired + private IQualityEvaluationService iQualityEvaluationService; + + + @ApiOperation("提交评价表") + @PostMapping("submitEvaluationForm") + public ResponseMessage submitEvaluationForm(@RequestBody FormVO form){ + List tableData = form.getTableData(); + String standId = form.getStandId(); + String userId = form.getUserId(); + + tableData.forEach(item->{ + item.setUserId(userId); + item.setLawId(standId); + + if ( item.getEvaluationIndex()!=null && item.getScore()!=null && "3U9lb".equals( item.getEvaluationIndex() ) ){ + + switch (item.getScore()){ + case "0": + item.setScore("-1"); + case "1": + item.setScore("-2"); + } + + } + + }); + +// +// Optional.ofNullable(item.getEvaluationIndex()) +// .map(u-> { +// +// return null; +// }) +// .map(a-> { +// +// }).orElseThrow(()->new Exception("取指错误")); + + Boolean i = iQualityEvaluationService.submitEvaluationForm(tableData); + + return Result.success(i); + } + + + @ApiOperation("查询评分表") + @PostMapping("getEvaluationForm") + public ResponseMessage getEvaluationForm(@RequestBody FormVO form){ + + + + return null; + } + + + @ApiOperation("查看评分历史") + @GetMapping("getHistory") + public ResponseMessage> getHistory(QualityEvaluation query){ + IPage history = iQualityEvaluationService.getHistory(query); + + return Result.success(history); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/EvaluationIndexDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/EvaluationIndexDao.java new file mode 100644 index 00000000..1f191e7e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/EvaluationIndexDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao; + +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.EvaluationIndex; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zhaokaiyao + * @since 2021-12-03 + */ +public interface EvaluationIndexDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java new file mode 100644 index 00000000..1a1aedd5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao; + +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zhaokaiyao + * @since 2021-12-03 + */ +public interface QualityEvaluationDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/EvaluationIndex.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/EvaluationIndex.java new file mode 100644 index 00000000..d6f7cd00 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/EvaluationIndex.java @@ -0,0 +1,55 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author zhaokaiyao + * @since 2021-12-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="EvaluationIndex对象", description="") +public class EvaluationIndex extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableField("code") //评价指标编码 + private String code; + + @ApiModelProperty(value = "显示顺序") + @TableField("index_sort") + private Integer indexSort; + + @ApiModelProperty(value = "权重") + @TableField("weight") + private String weight; + + @ApiModelProperty(value = "指标类型(动态评价指标,质量评价指标") + @TableField("index_type") + private String indexType; + + @ApiModelProperty(value = "一级指标名称") + @TableField("one_index_title") + private String oneIndexTitle; + + @ApiModelProperty(value = "二级指标名称") + @TableField("two_index_title") + private String twoIndexTitle; + + @ApiModelProperty(value = "三级指标名称") + @TableField("three_index_title") + private String threeIndexTitle; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java new file mode 100644 index 00000000..f441095b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class FormVO { + + private List tableData; + + private String standId; + + private String userId; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java new file mode 100644 index 00000000..4105fc37 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java @@ -0,0 +1,90 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + *

+ * + *

+ * + * @author zhaokaiyao + * @since 2021-12-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="QualityEvaluation对象", description="") +public class QualityEvaluation extends BaseEntity { + + private static final long serialVersionUID = 1L; + + private String id; + + @TableField("law_id") + @ApiModelProperty(value = "企标id") + private String lawId; + + @TableField("user_id") + @ApiModelProperty(value = "用户id") + private String userId; + + @ApiModelProperty(value = "用户名称") + @TableField(exist = false) + private String userName; + + @TableField("is_need_revise") + @ApiModelProperty(value = "是否需要修订(废弃)") + private String isNeedRevise; + + @JsonProperty("code") //前后分离 前端字段 + @TableField("evaluation_index") + @ApiModelProperty(value = "评价指标") + private String evaluationIndex; + + @JsonProperty("indexType") //前后分离 前端字段 + @TableField("evaluation_type") + @ApiModelProperty(value = "评价类型") + private String evaluationType; + + @JsonProperty("commentReason") //前后分离 前端字段 + @TableField("reason") + @ApiModelProperty(value = "打分理由") + private String reason; + + @JsonProperty("targetScore") //前后分离 前端字段 + @TableField("score") + @ApiModelProperty(value = "打分") + private String score; + + + @TableField("process_node") + @ApiModelProperty(value = "流程节点") + private String processNode; + + @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date modifyTime; + + + @TableField(exist = false) + private Integer page; + + @TableField(exist = false) + private Integer pageSize; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IEvaluationIndexService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IEvaluationIndexService.java new file mode 100644 index 00000000..89055851 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IEvaluationIndexService.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service; + +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.EvaluationIndex; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author zhaokaiyao + * @since 2021-12-03 + */ +public interface IEvaluationIndexService extends IService { + + + public List getEvaluationIndex(EvaluationIndex query); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java new file mode 100644 index 00000000..bc120b4d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service; + +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author zhaokaiyao + * @since 2021-12-03 + */ +public interface IQualityEvaluationService extends IService { + + public Boolean submitEvaluationForm(List form); + + public IPage getHistory(QualityEvaluation query); + + + public List getEvaluationForm(QualityEvaluation query); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/EvaluationIndexServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/EvaluationIndexServiceImpl.java new file mode 100644 index 00000000..e5c84a7c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/EvaluationIndexServiceImpl.java @@ -0,0 +1,40 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.impl; + +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.EvaluationIndex; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.EvaluationIndexDao; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IEvaluationIndexService; +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 java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author zhaokaiyao + * @since 2021-12-03 + */ +@Service +public class EvaluationIndexServiceImpl extends ServiceImpl implements IEvaluationIndexService { + + +// @Autowired +// private EvaluationIndexDao evaluationIndexDao; + + @Override + public List getEvaluationIndex(EvaluationIndex query) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + if (query.getIndexType()!=null){ + queryWrapper.eq("index_type",query.getIndexType()); + } + + queryWrapper.orderByAsc("index_sort"); + + return this.baseMapper.selectList(queryWrapper); + } +} 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 new file mode 100644 index 00000000..376231ab --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -0,0 +1,81 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.impl; + +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; +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 java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.stream.Collector; +import java.util.stream.Collectors; + +/** + *

+ * 服务实现类 + *

+ * + * @author zhaokaiyao + * @since 2021-12-03 + */ +@Service +public class QualityEvaluationServiceImpl extends ServiceImpl implements IQualityEvaluationService { + + @Autowired + private QualityEvaluationDao qualityEvaluationDao; + + + + @Override + public Boolean submitEvaluationForm(List form) { + form.forEach(item->item.setId( UUIDUtils.randomUUID20())); + return this.saveBatch(form); + } + + @Override + public IPage getHistory(QualityEvaluation query) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + Page page = new Page<>(query.getPage(), query.getPageSize()); + + queryWrapper.select("UNAME as userName","score","reason","create_time","modify_time") + .eq("law_id",query.getLawId()) //企标id + .last("JOIN ts_user user ON quality_evaluation.user_id = user.USID"); + + + if (query.getUserId()!=null){ //指定用户 + queryWrapper.eq("user_id", query.getUserId()) + .orderBy(true,true, "crate_time","modify_time"); + } + + if (query.getEvaluationType()!=null){ //指定评价指标 + queryWrapper.eq("evaluation_type",query.getEvaluationType()); + } + + + + return this.baseMapper.selectPage(page,queryWrapper); + + } + + @Override + public List getEvaluationForm(QualityEvaluation query) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("law_id",query.getLawId()); + + List qualityEvaluations = this.baseMapper.selectList(queryWrapper); + Map> collect = qualityEvaluations.stream() + .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType)); + + return null; + + } + + +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/evaluationIndex/EvaluationIndexMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/evaluationIndex/EvaluationIndexMapper.xml new file mode 100644 index 00000000..bfd205dd --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/evaluationIndex/EvaluationIndexMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/EvaluationIndexMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/EvaluationIndexMapper.xml new file mode 100644 index 00000000..05dd5f85 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/EvaluationIndexMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml new file mode 100644 index 00000000..5f003c2f --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml @@ -0,0 +1,5 @@ + + + + + From 7f88babb5fa90fcdc792b6c097fe3561ef0b38ac Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 5 Dec 2021 15:09:19 +0800 Subject: [PATCH 061/163] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=20=EF=BC=81=20=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 2 ++ .../controller/EsRevisePlanController.java | 21 ++++++++++++++++++- .../entity/StandAttrInfoDto.java | 2 ++ .../SarStandProjectLibraryServiceImpl.java | 5 ++++- .../entity/SarStandardsInfo.java | 4 ++++ 5 files changed, 32 insertions(+), 2 deletions(-) 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 3bbea18e..d9051d84 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 @@ -85,6 +85,8 @@ public class WebMvcConfig implements WebMvcConfigurer { //调研流程下载接口 addInterceptor.excludePathPatterns("/api/att/attFile/downloadFile"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/exportProcessDetailInfo"); + // //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index e9eee749..d327ee5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; @@ -54,7 +55,7 @@ public class EsRevisePlanController extends BaseController { @ApiOperation(value = "获取是否存在重复名企标名称接口") - @GetMapping("getDataByName") + @GetMapping("/getDataByName") public ResponseMessage getDataByName(EsRevisePlan esRevisePlan){ return Result.success(iEsRevisePlanService.getDataByName(esRevisePlan)); } @@ -65,18 +66,36 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.modPlan(esRevisePlan)); } + @ApiOperation(value = "编辑企标计划") + @PostMapping("/modPlanByWk") + public ResponseMessage modPlanByWk(@RequestBody EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.modPlan(esRevisePlan)); + } + @ApiOperation(value = "添加企标计划") @PostMapping("addPlan") public ResponseMessage addPlan(EsRevisePlan esRevisePlan){ return Result.success(iEsRevisePlanService.addPlan(esRevisePlan)); } + @ApiOperation(value = "添加企标计划") + @PostMapping("/addPlanByWk") + public ResponseMessage addPlanByWk(@RequestBody EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.addPlan(esRevisePlan)); + } + @ApiOperation(value = "删除单个企标计划") @GetMapping("delPlan") public ResponseMessage delPlan(String id){ return Result.success(iEsRevisePlanService.delPlan(id)); } + @ApiOperation(value = "删除单个企标计划") + @GetMapping("delPlanByWk") + public ResponseMessage delPlanByWk(@RequestParam("id") String id){ + return Result.success(iEsRevisePlanService.delPlans(id)); + } + @ApiOperation(value = "批量删除企标计划") @GetMapping("delPlans") public ResponseMessage delPlans(String ids){ 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 fb26f972..e6a4db9e 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 @@ -61,4 +61,6 @@ public class StandAttrInfoDto { private String CYCVPPSCN; private Long unCount; + + private String endTimes; } \ No newline at end of file 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 b427434a..7ac6049d 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 @@ -379,7 +379,9 @@ 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" + - " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount "); + " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ", + "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME ) from sar_stand_unqualified where " + + " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes "); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'"); Page page1 = new Page<>(current, pageSize); IPage userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1); @@ -407,6 +409,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl Date: Sun, 5 Dec 2021 15:50:46 +0800 Subject: [PATCH 062/163] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20api/lawss/activiti/delCG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 3 +++ .../adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 4 ++++ .../adc/da/workFlow/controller/WorkFlowController.java | 8 ++++++++ 3 files changed, 15 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 88a26c51..1a14a949 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -408,4 +408,7 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/everyDayTenOlockSAM",method = RequestMethod.GET) List everyDayTenOlockSAM(); + + @RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.GET) + String delCG(@RequestParam("id") String id); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 80c35fdd..bd7a87ff 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -321,4 +321,8 @@ public class workFlowFeignClientImpl { public List queryBusProcessNameForEnd(@RequestBody String prcNum){ return workFlowFeignClient.queryBusProcessNameForEnd(prcNum); } + + public String delCG(@RequestParam("id") String id){ + return workFlowFeignClient.delCG(id); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 134b17ab..4e0b18f7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -687,4 +687,12 @@ public class WorkFlowController { } return Result.success("发送成功"); } + + @ApiOperation(value = "草稿删除") + @GetMapping("/delCG") + public String delCG(@RequestParam("id")String id){ + return workFlowFeignClient.delCG(id); + } + + } From a1fee557af642c8b550a3e2ff5c0271d3460f6b9 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 5 Dec 2021 18:42:51 +0800 Subject: [PATCH 063/163] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 40 ++++++++++ .../dao/EarlyWarningEODao.java | 4 +- .../entity/EarlyWarningEO.java | 19 ++++- .../entity/StandWarningEO.java | 21 ++++- .../entity/WarningExcelVO.java | 15 ++++ .../service/EarlyWarningEOService.java | 3 + .../Impl/EarlyWarningEOServiceImpl.java | 14 +++- .../sarStandWarning/EarlyWraningEOMapper.xml | 77 +++++++++++-------- 8 files changed, 156 insertions(+), 37 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExcelVO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index 3b034a1f..fa91fe23 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -4,10 +4,15 @@ package com.adc.da.slrs.sarStandWarning.controller; import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandIssueControlProduct.entity.SarStandIssueControlProduct; +import com.adc.da.slrs.sarStandIssueControlProduct.entity.StandIssueControlProductExcelVO; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; import com.adc.da.slrs.sarStandWarning.service.Impl.EarlyWarningEOServiceImpl; +import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -113,4 +120,37 @@ public class EarlyWarningEOController extends BaseController { return Result.success("200",listMap); } + + + + + @GetMapping("/exprotWarning") + @ApiOperation("导出预警") + public void exportStandardsInfoExcel(WarningExcelVO excelVO, HttpServletResponse response) throws Exception { + // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman + try { + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 + if(excelVO.getExportName()==null){ + excelVO.setExportName("标准预警"); + } + String fileName = URLEncoder.encode(excelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + + List exportExcel = earlyWarningEOService.getExportExcel(excelVO); + + + // 这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), SarStandIssueControlProduct.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(exportExcel); + } catch (Exception e) { + System.out.println(e); + // 重置response + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().println(JSON.toJSONString(Result.error())); + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index 853cf4d4..0aac00c8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface EarlyWarningEODao extends BaseMapper { - IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO); + IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO,@Param("idList") List ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 0fde3f51..0471434c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -1,6 +1,8 @@ package com.adc.da.slrs.sarStandWarning.entity; import com.adc.da.base.entity.BaseEntity; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -25,64 +27,79 @@ public class EarlyWarningEO extends BaseEntity { private static final long serialVersionUID = 1L; + @ExcelIgnore @ApiModelProperty("id") @TableId("ID") private String id; + @ExcelIgnore @ApiModelProperty("标准id") @TableField("STAND_ID") private String standId; + @ExcelIgnore @ApiModelProperty("标准类别") @TableField(exist = false) private String standType; + @ExcelProperty("标准号") @ApiModelProperty("标准号") @TableField(exist = false) private String standCode; + @ExcelProperty("标准名称") @ApiModelProperty("标准名称") @TableField(exist = false) private String standName; + @ExcelProperty("发布日期") @ApiModelProperty("发布日期") @TableField(exist = false) @DateTimeFormat(pattern="yyyy-MM-dd") private Date putTime; + @ExcelIgnore @TableField(exist = false) private Date lastTime; + @ExcelProperty("适用车型") @ApiModelProperty("适用车型") @TableField(exist = false) private String applyType; + @ExcelProperty("责任工程师") @ApiModelProperty("责任工程师") @TableField(exist = false) private String dutyEngineer; + @ExcelIgnore @ApiModelProperty("条款（分解单）id") @TableField(exist = false) private String itemsId; + @ExcelProperty("条款（分解单）编号") @ApiModelProperty("条款（分解单）编号") @TableField(exist = false) private String itemsNum; + @ExcelProperty("条款（分解单）名称") @ApiModelProperty("条款（分解单）名称") @TableField(exist = false) private String itemsName; + @ExcelIgnore @TableField("POLICY_ID") private String policyId; + @ExcelIgnore @TableField(exist = false) private String policyName; - + @ExcelIgnore @TableField("MARK") private String mark; + @ExcelIgnore @TableField("POWER") private String power; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java index b4c77336..b1604d9a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java @@ -1,5 +1,7 @@ package com.adc.da.slrs.sarStandWarning.entity; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -11,62 +13,79 @@ import java.util.Date; @Accessors(chain = true) public class StandWarningEO extends EarlyWarningEO { private static final long serialVersionUID = 1L; + + @ExcelProperty("新车型实施日期") @ApiModelProperty("新车型实施日期") @DateTimeFormat(pattern = "YYYY-MM-dd") private String XCXSSRQ; + @ExcelProperty("在产车实施日期") @ApiModelProperty("在产车实施日期") @DateTimeFormat(pattern = "YYYY-MM-dd") private String ZCCSSRQ; + @ExcelProperty("实施日期") @ApiModelProperty("实施日期") @DateTimeFormat(pattern = "YYYY-MM-dd") private String SSRQ; + @ExcelProperty("标准编号") private String standNum; + @ExcelProperty("标准类别") private String standSort; + @ExcelProperty("标准年份") private String standYear; + @ExcelProperty("发布日期") private String issueTime; + @ExcelIgnore private Integer page; + @ExcelIgnore private Integer pageSize; + @ExcelIgnore @ApiModelProperty("范围查询新车型实施日期开始") @DateTimeFormat(pattern = "YYYY-MM-dd") private String startXCXSSRQ; + @ExcelIgnore @ApiModelProperty("范围查询新车型实施日期结束") @DateTimeFormat(pattern = "YYYY-MM-dd") private String endXCXSSRQ; + @ExcelIgnore @ApiModelProperty("范围查询在产车实施日期开始") @DateTimeFormat(pattern = "YYYY-MM-dd") private String startZCCSSRQ; + @ExcelIgnore @ApiModelProperty("范围查询在产车实施日期结束") @DateTimeFormat(pattern = "YYYY-MM-dd") private String endZCCSSRQ; + @ExcelIgnore @ApiModelProperty("范围查询实施日期开始") @DateTimeFormat(pattern = "YYYY-MM-dd") private String startSSRQ; + @ExcelIgnore @ApiModelProperty("范围查询实施日期结束") @DateTimeFormat(pattern = "YYYY-MM-dd") private String endSSRQ; + @ExcelIgnore @ApiModelProperty("范围查询发布日期开始") @DateTimeFormat(pattern = "YYYY-MM-dd") private String startPutTime; - + @ExcelIgnore @ApiModelProperty("范围查询发布日期结束") @DateTimeFormat(pattern = "YYYY-MM-dd") private String endPutTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExcelVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExcelVO.java new file mode 100644 index 00000000..179e4d3f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExcelVO.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.sarStandWarning.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + + +@Data +public class WarningExcelVO { + @ApiModelProperty("文件名") + String exportName; + @ApiModelProperty("导出的ID列表") + List ids; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java index 89ce035e..fea9090f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandWarning.service; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -20,4 +21,6 @@ public interface EarlyWarningEOService extends IService { IPage getStandWarning(StandWarningEO queryPage); + + List getExportExcel(WarningExcelVO excelVO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index fa113ac5..d22a9db3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandWarning.service.Impl; import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -111,9 +112,20 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getStandWarning(StandWarningEO queryPage) { IPage iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize()); - return earlyWarningEODao.selectWarningPage(iPage,queryPage); + return earlyWarningEODao.selectWarningPage(iPage,queryPage,null); } + /** + * 导出预警 + * @return + */ + @Override + public List getExportExcel(WarningExcelVO excelVO){ + IPage standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, excelVO.getIds()); + return standWarningEOIPage.getRecords(); + } + + private IPage getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper wrapper) { wrapper.eq("power",1); Page page = new Page<>(current, pageSize); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index 539c96ec..08718b4e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -37,40 +37,51 @@ - - AND trim(replace(CONCAT( - sarInfo.STAND_SORT, - ' ', - sarInfo.STAND_NUMBER, - '-', - sarInfo.STAND_YEAR - ),' ','')) LIKE trim(replace(CONCAT('%',#{waringEO.standCode},'%'),' ','')) - - - AND sarInfo.STAND_NAME like concat('%', #{waringEO.standName},'%') - - - AND ( - DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') >= DATE_FORMAT( - #{waringEO.endPutTime}, - '%Y-%m-%d' - ) - AND - DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') <= DATE_FORMAT( - #{waringEO.endPutTime}, - '%Y-%m-%d' - ) - ) - - - AND ( - sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE - DATE_FORMAT(t.SSRQ, '%Y-%m-%d') >= DATE_FORMAT(#{waringEO.startSSRQ}, '%Y-%m-%d') - AND - DATE_FORMAT(t.SSRQ, '%Y-%m-%d') <= DATE_FORMAT(#{waringEO.endSSRQ}, '%Y-%m-%d') AND t.time_name = 'SSRQ' ) - ) - + + + warning.ID + IN + + + #{id} + + + + + + AND trim(replace(CONCAT( + sarInfo.STAND_SORT, + ' ', + sarInfo.STAND_NUMBER, + '-', + sarInfo.STAND_YEAR + ),' ','')) LIKE trim(replace(CONCAT('%',#{waringEO.standCode},'%'),' ','')) + + + AND sarInfo.STAND_NAME like concat('%', #{waringEO.standName},'%') + + + AND ( + DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') >= DATE_FORMAT( + #{waringEO.endPutTime}, + '%Y-%m-%d' + ) + AND + DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') <= DATE_FORMAT( + #{waringEO.endPutTime}, + '%Y-%m-%d' + ) + ) + + + AND ( + sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') >= DATE_FORMAT(#{waringEO.startSSRQ}, '%Y-%m-%d') + AND + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') <= DATE_FORMAT(#{waringEO.endSSRQ}, '%Y-%m-%d') AND t.time_name = 'SSRQ' ) + ) + + SELECT WARNING_RESULT.* FROM + ( + + SELECT - , - attr.CLLX AS APPLY_TYPE , - attr.ZRGCS AS DUTY_ENGINEER , - NULL AS ITEMS_ID , - NULL AS ITEMS_NUM , - NULL AS ITEMS_NAME , - NULL AS POLICY_ID , - NULL AS POLICY_NAME , - MARK , - POWER, - attr.XCXSSRQ AS XCXSSRQ , - attr.ZCCSSRQ AS ZCCSSRQ + + , + attr.CLLX AS + APPLY_TYPE , + attr + .ZRGCS AS DUTY_ENGINEER , + NULL AS ITEMS_ID , + NULL AS ITEMS_NUM , NULL AS ITEMS_NAME , + NULL AS POLICY_ID , + NULL AS POLICY_NAME , + MARK , + POWER, + attr.XCXSSRQ AS XCXSSRQ , + attr.ZCCSSRQ AS ZCCSSRQ FROM sar_stand_warning AS warning LEFT JOIN sar_standards_info AS sarInfo on sarInfo.id=warning.STAND_ID LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID @@ -105,8 +111,8 @@ POWER = '1' AND (MARK = 'stand') - - AND attr.CLLX LIKE CONCAT('%', #{waringEO.applyType},'%') + AND attr.CLLX LIKE CONCAT('%', + #{waringEO.applyType},'%') AND ( @@ -168,6 +174,15 @@ + ) + WARNING_RESULT + LEFT JOIN + ( + SELECT law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date + GROUP BY warning_date.law_id + ) warning_date + ON warning_date.law_id = WARNING_RESULT.STAND_ID + ORDER BY warning_date.SSRQ_MIN From 8ae7ed4dd97a8114eb58255e890437a81ae1203a Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 5 Dec 2021 20:23:21 +0800 Subject: [PATCH 066/163] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualityEvaluationController.java | 28 +++++-- .../dao/QualityEvaluationDao.java | 10 +++ .../entity/EvaluationIndex.java | 4 + .../entity/FormVO.java | 3 + .../service/IQualityEvaluationService.java | 4 + .../impl/QualityEvaluationServiceImpl.java | 76 ++++++++++++++++--- .../QualityEvaluationMapper.xml | 19 +++++ 7 files changed, 125 insertions(+), 19 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java index b6a16ccb..f887166c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java @@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.FormVO; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; @@ -16,6 +17,7 @@ import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import java.util.List; +import java.util.Map; import java.util.Optional; /** @@ -47,14 +49,17 @@ public class QualityEvaluationController extends BaseController> getScore(String lawId){ + Map score = iQualityEvaluationService.getScore(lawId); + + return Result.success(score); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java index 1a1aedd5..9432145d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java @@ -1,7 +1,14 @@ package com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface QualityEvaluationDao extends BaseMapper { + + + public IPage getHistory(IPage page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/EvaluationIndex.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/EvaluationIndex.java index d6f7cd00..c48813fc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/EvaluationIndex.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/EvaluationIndex.java @@ -51,5 +51,9 @@ public class EvaluationIndex extends BaseEntity { @TableField("three_index_title") private String threeIndexTitle; + @ApiModelProperty(value = "指标值类型") + @TableField("value_type") + private String valueType; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java index f441095b..16dd75db 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java @@ -12,4 +12,7 @@ public class FormVO { private String standId; private String userId; + + + private String formData; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java index bc120b4d..cc78ae4f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** *

@@ -22,4 +23,7 @@ public interface IQualityEvaluationService extends IService { public List getEvaluationForm(QualityEvaluation query); + + + Map getScore(String lawId); } 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 376231ab..60e3b745 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 @@ -1,7 +1,9 @@ package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.impl; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.EvaluationIndex; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IEvaluationIndexService; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -11,6 +13,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.io.PipedReader; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; @@ -35,6 +39,11 @@ public class QualityEvaluationServiceImpl extends ServiceImpl form) { + QueryWrapper queryWrapper = new QueryWrapper<>(); +// +// queryWrapper.eq("user_id",form.get) +// .eq("evaluation_type","dynamic"); + this.remove(queryWrapper); form.forEach(item->item.setId( UUIDUtils.randomUUID20())); return this.saveBatch(form); } @@ -44,9 +53,31 @@ public class QualityEvaluationServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); Page page = new Page<>(query.getPage(), query.getPageSize()); + + if (query.getUserId()!=null){ //指定用户 + queryWrapper.eq("user_id", query.getUserId()) + .orderBy(true,true, "crate_time","modify_time"); + } + + if (query.getEvaluationType()!=null){ //指定评价指标 + queryWrapper.eq("evaluation_type",query.getEvaluationType()); + } + + return qualityEvaluationDao.getHistory(page,queryWrapper); + + + } + + + + @Override + public List getEvaluationForm(QualityEvaluation query) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + Page page = new Page<>(query.getPage(), query.getPageSize()); + queryWrapper.select("UNAME as userName","score","reason","create_time","modify_time") - .eq("law_id",query.getLawId()) //企标id - .last("JOIN ts_user user ON quality_evaluation.user_id = user.USID"); + .eq("law_id",query.getLawId()) //企标id + .last("JOIN ts_user user ON quality_evaluation.user_id = user.USID"); if (query.getUserId()!=null){ //指定用户 @@ -59,23 +90,44 @@ public class QualityEvaluationServiceImpl extends ServiceImpl getEvaluationForm(QualityEvaluation query) { + public Map getScore(String lawId) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("law_id",query.getLawId()); + queryWrapper.eq("law_id",lawId); + List list = this.list(queryWrapper); - List qualityEvaluations = this.baseMapper.selectList(queryWrapper); - Map> collect = qualityEvaluations.stream() - .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType)); - - return null; + return list.stream() + .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, + Collectors.averagingDouble(item -> getScoreSingle(item)))); } + private Double getScoreSingle(QualityEvaluation item){ + + QueryWrapper indexQuery = new QueryWrapper<>(); + indexQuery.select("code","weight"); + + List indexList = iEvaluationIndexService.list(indexQuery); + + Map weightMap = indexList.stream() + .collect(Collectors.toMap(EvaluationIndex::getCode, obj -> Float.valueOf(obj.getWeight()))); + + + + String score = item.getScore(); + return ((score == null || (Float.valueOf(item.getScore()) < 0.0)) ? 0.0 : Float.valueOf(score) * weightMap.get(item.getEvaluationIndex())); + } + + + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml index 5f003c2f..c166cfe4 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml @@ -2,4 +2,23 @@ + From 02edc0ba2ee37710488b3f0873dc84b792a9ad55 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 5 Dec 2021 20:25:49 +0800 Subject: [PATCH 067/163] =?UTF-8?q?=E4=B8=BA=E7=AC=A6=E5=90=88=E9=A1=B9=20?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index 305cb1c0..a0970a42 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -52,6 +52,7 @@ and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%') or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%') + order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc limit #{start},#{end} From 691e7b6bcc9ca3815c27f107daf69e7a79e87dcd Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 5 Dec 2021 20:56:32 +0800 Subject: [PATCH 068/163] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=BA=B3=E5=85=A5=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarLawsDetailedListServiceImpl.java | 9 +++++++++ .../slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java | 2 ++ .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 15092f35..d32c8f4c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -11,6 +11,8 @@ import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto; import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.adc.da.slrs.sarLawsDetailedList.service.ISarLawsDetailedListService; +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.slrs.sarStandardsInfo.service.impl.SarStandardsInfoServiceImpl; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -39,6 +41,9 @@ import static com.adc.da.login.util.UserUtils.getUserName; @Service public class SarLawsDetailedListServiceImpl extends ServiceImpl implements ISarLawsDetailedListService { + @Autowired + SarStandardsInfoDao sarStandardsInfoDao; + @Autowired public SarLawsDetailedListDao sarLawsDetailedListDao; @Autowired @@ -582,6 +587,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl { List selectStandardsInfoBynumber(SarStandardsInfoEOPage page); + int updateISRELATEACCESSById(@Param("IS_RELATE_ACCESS") String ACCESS,@Param("list") List list); + } 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 15a28204..5a0d04b0 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 @@ -1273,6 +1273,13 @@ #{item} + + + UPDATE sar_standards_info set IS_RELATE_ACCESS = #{IS_RELATE_ACCESS} WHERE ID IN + + #{id} + + - SELECT sar_stand_unqualified.*, sar_standards_info.STAND_TYPE as standType from @@ -49,14 +49,45 @@ and RESPONSIBLE_UNIT = #{sar.responsibleUnit} - and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%') - or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%') + and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') + or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')) order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc limit #{start},#{end} - + SELECT + c.* + FROM + ( + SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM ( + SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* FROM + sar_stand_unqualified,(SELECT @i:=0)j + WHERE + close_state = 1 + + and STAND_ID = #{standId} + + + and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%') + + + and RESPONSIBLE_UNIT = #{sar.responsibleUnit} + + + and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') + or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')) + + order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc + limit #{start},#{end} + )b + left join sar_standards_info on b.STAND_ID = sar_standards_info.id + )c + ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows + + + + + From 58cbe73a0925eb3945cc99f3c36c888b99abfb85 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 15:39:10 +0800 Subject: [PATCH 073/163] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5-----?= =?UTF-8?q?=E9=83=A8=E9=97=A8id=20=E5=92=8C=20=E9=83=A8=E9=97=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java | 5 ++++- .../src/main/resources/mybatis/mapper/sys/UserEOMapper.xml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java index 4923f79b..e77056ef 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java @@ -2,6 +2,7 @@ package com.adc.da.sys.entity; import com.adc.da.base.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.io.Serializable; import java.util.ArrayList; @@ -14,6 +15,7 @@ import java.util.List; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class UserEO extends BaseEntity implements Serializable { private static final long serialVersionUID = 3658632939727891047L; @@ -51,7 +53,8 @@ public class UserEO extends BaseEntity implements Serializable { private Integer unlockFlag; private String userInfoId; private String orgType; - + private String institutionName; + private String institutionId; private String ssoId; private String token; /** diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index 2ffc9c1b..0b4986d5 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -28,6 +28,8 @@ + + @@ -78,6 +80,7 @@ usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type + ,INSTITUTION_NAME,INSTITUTION_ID From 82aa2a113980a5f1840626cec4543b9cbeacc07f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 17:05:37 +0800 Subject: [PATCH 074/163] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=20=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E7=BA=A7=E9=83=A8=E9=97=A8=20id=E5=92=8C=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/sys/entity/UserEO.java | 5 +++++ .../resources/mybatis/mapper/sys/UserEOMapper.xml | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java index e77056ef..e05e2dd8 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java @@ -34,6 +34,11 @@ public class UserEO extends BaseEntity implements Serializable { private String password; private String account; private String usid; + private String sex; + private String phone; + private String upDeptName; + private String upDeptId; + // 扩展字段 private String userType; private String orgId; diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index 0b4986d5..c0bb3b8a 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -30,6 +30,8 @@ + + @@ -80,7 +82,7 @@ usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type - ,INSTITUTION_NAME,INSTITUTION_ID + ,INSTITUTION_NAME,INSTITUTION_ID,SEX,PHONE @@ -751,9 +753,11 @@ - SELECT - `user`.UNAME AS userName, - evaluation_index, - eva.user_id, - avg(eva.score * iex.weight) AS score - FROM - quality_evaluation AS eva - LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID - LEFT JOIN evaluation_index AS iex ON eva.evaluation_index = iex.id - GROUP BY - userName, - evaluation_index, - eva.user_id, - score + SELECT + `user`.UNAME AS userName, + eva.user_id, + avg(eva.score * iex.weight) AS score, + iex.index_type as valueType + FROM + quality_evaluation AS eva + LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID + LEFT JOIN evaluation_index AS iex ON eva.evaluation_index = iex.id + GROUP BY + userName, + eva.user_id, + index_type + ${ew.customSqlSegment} From a2d002d65970c61b1a749ada1fee62b30b083cfc Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Mon, 6 Dec 2021 18:06:28 +0800 Subject: [PATCH 076/163] =?UTF-8?q?ocr=E5=9B=9E=E5=88=B0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=96=9C=E6=9D=A0=E8=BD=AC=E6=8D=A2=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E9=80=A0=E6=88=90=E8=B7=AF=E5=BE=84=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java index c79bdc83..90dad375 100644 --- a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java @@ -161,7 +161,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { String saveWordFileName=null; logger.info("将文件保存至本地"); if(wordFile!=null && !wordFile.isEmpty()){ - saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename(); + saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename().replace("/","_"); saveWordFilePath=ocrFilePath+saveWordFileName; logger.info(saveWordFilePath); //生成保存文件 @@ -175,12 +175,12 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { String saveJsonFilePath=null; String saveJsonFileName=null; if(jsonFile!=null && !jsonFile.isEmpty()){ - saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename(); + saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename().replace("/","_"); saveJsonFilePath=ocrFilePath+saveJsonFileName; logger.info(saveJsonFilePath); File saveJsonFile = new File(saveJsonFilePath); System.out.println(saveJsonFile); - wordFile.transferTo(saveJsonFile); + jsonFile.transferTo(saveJsonFile); // FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath)); // savePic(jsonFile.getInputStream(),saveJsonFilePath); logger.info("Json存储完成"); From a501f87a68b7782506505aa1e32b35cceeac2dbe Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 5 Dec 2021 15:09:19 +0800 Subject: [PATCH 077/163] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=20=EF=BC=81=20=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 2 ++ .../controller/EsRevisePlanController.java | 21 ++++++++++++++++++- .../entity/StandAttrInfoDto.java | 2 ++ .../SarStandProjectLibraryServiceImpl.java | 5 ++++- .../entity/SarStandardsInfo.java | 4 ++++ 5 files changed, 32 insertions(+), 2 deletions(-) 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 3bbea18e..d9051d84 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 @@ -85,6 +85,8 @@ public class WebMvcConfig implements WebMvcConfigurer { //调研流程下载接口 addInterceptor.excludePathPatterns("/api/att/attFile/downloadFile"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/exportProcessDetailInfo"); + // //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index e9eee749..d327ee5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; @@ -54,7 +55,7 @@ public class EsRevisePlanController extends BaseController { @ApiOperation(value = "获取是否存在重复名企标名称接口") - @GetMapping("getDataByName") + @GetMapping("/getDataByName") public ResponseMessage getDataByName(EsRevisePlan esRevisePlan){ return Result.success(iEsRevisePlanService.getDataByName(esRevisePlan)); } @@ -65,18 +66,36 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.modPlan(esRevisePlan)); } + @ApiOperation(value = "编辑企标计划") + @PostMapping("/modPlanByWk") + public ResponseMessage modPlanByWk(@RequestBody EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.modPlan(esRevisePlan)); + } + @ApiOperation(value = "添加企标计划") @PostMapping("addPlan") public ResponseMessage addPlan(EsRevisePlan esRevisePlan){ return Result.success(iEsRevisePlanService.addPlan(esRevisePlan)); } + @ApiOperation(value = "添加企标计划") + @PostMapping("/addPlanByWk") + public ResponseMessage addPlanByWk(@RequestBody EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.addPlan(esRevisePlan)); + } + @ApiOperation(value = "删除单个企标计划") @GetMapping("delPlan") public ResponseMessage delPlan(String id){ return Result.success(iEsRevisePlanService.delPlan(id)); } + @ApiOperation(value = "删除单个企标计划") + @GetMapping("delPlanByWk") + public ResponseMessage delPlanByWk(@RequestParam("id") String id){ + return Result.success(iEsRevisePlanService.delPlans(id)); + } + @ApiOperation(value = "批量删除企标计划") @GetMapping("delPlans") public ResponseMessage delPlans(String ids){ 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 fb26f972..e6a4db9e 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 @@ -61,4 +61,6 @@ public class StandAttrInfoDto { private String CYCVPPSCN; private Long unCount; + + private String endTimes; } \ No newline at end of file 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 b427434a..7ac6049d 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 @@ -379,7 +379,9 @@ 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" + - " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount "); + " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ", + "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME ) from sar_stand_unqualified where " + + " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes "); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'"); Page page1 = new Page<>(current, pageSize); IPage userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1); @@ -407,6 +409,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl Date: Sun, 5 Dec 2021 15:50:46 +0800 Subject: [PATCH 078/163] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20api/lawss/activiti/delCG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 3 +++ .../adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 4 ++++ .../adc/da/workFlow/controller/WorkFlowController.java | 8 ++++++++ 3 files changed, 15 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 88a26c51..1a14a949 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -408,4 +408,7 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/everyDayTenOlockSAM",method = RequestMethod.GET) List everyDayTenOlockSAM(); + + @RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.GET) + String delCG(@RequestParam("id") String id); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 80c35fdd..bd7a87ff 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -321,4 +321,8 @@ public class workFlowFeignClientImpl { public List queryBusProcessNameForEnd(@RequestBody String prcNum){ return workFlowFeignClient.queryBusProcessNameForEnd(prcNum); } + + public String delCG(@RequestParam("id") String id){ + return workFlowFeignClient.delCG(id); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 134b17ab..4e0b18f7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -687,4 +687,12 @@ public class WorkFlowController { } return Result.success("发送成功"); } + + @ApiOperation(value = "草稿删除") + @GetMapping("/delCG") + public String delCG(@RequestParam("id")String id){ + return workFlowFeignClient.delCG(id); + } + + } From 0e68e431ea15221bd6c991f7f9e74bc9ff94b125 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 5 Dec 2021 20:25:49 +0800 Subject: [PATCH 079/163] =?UTF-8?q?=E4=B8=BA=E7=AC=A6=E5=90=88=E9=A1=B9=20?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index 305cb1c0..a0970a42 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -52,6 +52,7 @@ and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%') or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%') + order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc limit #{start},#{end} From 4478fecf7330bc9346efcee8e810324d6d837665 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 09:45:36 +0800 Subject: [PATCH 080/163] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E7=AC=A6=E5=90=88-?= =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88-=E4=B8=8D=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91=20=E4=BB=A5=E5=8F=8A=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=8B=E6=9C=AA=E7=BB=B4=E6=8A=A4=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandProjectLibraryServiceImpl.java | 11 +++++++++-- .../sarStandardsInfo/entity/SarStandardsInfo.java | 4 ++++ .../SarStandProjectLibraryMapper.xml | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) 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 7ac6049d..210feb35 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 @@ -379,7 +379,8 @@ 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" + - " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ", + " 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 " + " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes "); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'"); @@ -408,7 +409,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl0L) { + p.setUnCount(s.getUnCount()); + }else if (s.getUnCount() == 0L && s.getCounts()==0L){ + p.setUnCount(2L); + }else { + p.setUnCount(1L); + } p.setEndTimes(s.getEndTimes()); for (SarStandAttrInfo a:list2){ if(s.getId().equals(a.getStandId())){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 35ed503f..142e98a1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -146,6 +146,10 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private Long unCount; + @ApiModelProperty(value = "为符合数量") + @TableField(exist = false) + private Long counts; + @ApiModelProperty(value = "整改完成时间") @TableField(exist = false) private String endTimes; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 2a39e883..d385bc1a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -120,10 +120,10 @@ ON team.project_code = library.project_number WHERE - library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) - library.id IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) 1=1 From 995891757dcd5f3963af42fa2e61daa75fa03e6d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 09:47:48 +0800 Subject: [PATCH 081/163] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index d385bc1a..49f537ee 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -61,10 +61,10 @@ WHERE - library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) - library.id IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) 1=1 @@ -185,10 +185,10 @@ ON team.project_code = library.project_number WHERE - library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) - library.id IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) 1=1 From 0ce4df725224efcbab27d7c73faab6ecc24b671d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 14:51:25 +0800 Subject: [PATCH 082/163] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=8A=A0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandUnqualifiedMapper.xml | 73 +++++++++++++++++-- 1 file changed, 67 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index a0970a42..20c72636 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -31,7 +31,7 @@ - SELECT sar_stand_unqualified.*, sar_standards_info.STAND_TYPE as standType from @@ -49,14 +49,45 @@ and RESPONSIBLE_UNIT = #{sar.responsibleUnit} - and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%') - or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%') + and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') + or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')) order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc limit #{start},#{end} - + SELECT + c.* + FROM + ( + SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM ( + SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* FROM + sar_stand_unqualified,(SELECT @i:=0)j + WHERE + close_state = 1 + + and STAND_ID = #{standId} + + + and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%') + + + and RESPONSIBLE_UNIT = #{sar.responsibleUnit} + + + and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') + or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')) + + order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc + limit #{start},#{end} + )b + left join sar_standards_info on b.STAND_ID = sar_standards_info.id + )c + ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows + + + + + From 95642b0166b340ac8cafcfb6a46b8aa240a4bf65 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 15:39:10 +0800 Subject: [PATCH 083/163] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5-----?= =?UTF-8?q?=E9=83=A8=E9=97=A8id=20=E5=92=8C=20=E9=83=A8=E9=97=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java | 5 ++++- .../src/main/resources/mybatis/mapper/sys/UserEOMapper.xml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java index 4923f79b..e77056ef 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java @@ -2,6 +2,7 @@ package com.adc.da.sys.entity; import com.adc.da.base.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.io.Serializable; import java.util.ArrayList; @@ -14,6 +15,7 @@ import java.util.List; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class UserEO extends BaseEntity implements Serializable { private static final long serialVersionUID = 3658632939727891047L; @@ -51,7 +53,8 @@ public class UserEO extends BaseEntity implements Serializable { private Integer unlockFlag; private String userInfoId; private String orgType; - + private String institutionName; + private String institutionId; private String ssoId; private String token; /** diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index 2ffc9c1b..0b4986d5 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -28,6 +28,8 @@ + + @@ -78,6 +80,7 @@ usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type + ,INSTITUTION_NAME,INSTITUTION_ID From 39ffe6944233cc9743b64a0b6075cb7d0266168e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 17:05:37 +0800 Subject: [PATCH 084/163] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=20=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E7=BA=A7=E9=83=A8=E9=97=A8=20id=E5=92=8C=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/sys/entity/UserEO.java | 5 +++++ .../resources/mybatis/mapper/sys/UserEOMapper.xml | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java index e77056ef..e05e2dd8 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java @@ -34,6 +34,11 @@ public class UserEO extends BaseEntity implements Serializable { private String password; private String account; private String usid; + private String sex; + private String phone; + private String upDeptName; + private String upDeptId; + // 扩展字段 private String userType; private String orgId; diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index 0b4986d5..c0bb3b8a 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -30,6 +30,8 @@ + + @@ -80,7 +82,7 @@ usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type - ,INSTITUTION_NAME,INSTITUTION_ID + ,INSTITUTION_NAME,INSTITUTION_ID,SEX,PHONE @@ -751,9 +753,11 @@ From 1edd95bccc18e39692c615f6a61857f1900bc787 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 7 Dec 2021 15:19:55 +0800 Subject: [PATCH 086/163] =?UTF-8?q?Ocr=E9=83=A8=E5=88=86bug=20=E5=92=8C?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=83=A8=E5=88=86bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/FeignClient/workFlowFeignClient.java | 2 +- .../workFlow/controller/WorkFlowController.java | 2 +- .../da/workFlow/entity/ProcessDetailExport.java | 2 +- .../da/slrs/sarInstitution/entity/TsUserVO.java | 8 ++++++++ .../sarStandIdea/dao/SarPublicIdeaAllDao.java | 5 +++++ .../Impl/SarPublicIdeaAllServiceImpl.java | 11 +++++++---- .../com/adc/da/slrs/wgDept/entity/WgDept.java | 7 +++++++ .../adc/da/slrs/wgNetInfo/entity/WgNetInfo.java | 9 +++++++++ .../sarInstitution/TsInstitutionMapper.xml | 6 ++++-- .../sarStandIdea/SarPublicIdeaAllMapper.xml | 17 +++++++++++++++++ .../mybatis/mapper/wgDept/WgDeptMapper.xml | 10 ++++++---- .../mapper/wgNetInfo/WgNetInfoMapper.xml | 4 ++-- .../da/ocr/controller/OCRRestfulController.java | 3 +++ .../java/com/adc/da/ocr/dao/OcrRecordEODao.java | 1 + .../adc/da/ocr/service/OcrRecordEOService.java | 2 ++ .../service/impl/OcrRecordEOServiceImpl.java | 5 +++++ .../mybatis/mapper/ocr/OcrRecordEOMapper.xml | 14 ++++++++++++++ 17 files changed, 93 insertions(+), 15 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 1a14a949..8316969c 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -409,6 +409,6 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/everyDayTenOlockSAM",method = RequestMethod.GET) List everyDayTenOlockSAM(); - @RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.GET) + @RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.POST) String delCG(@RequestParam("id") String id); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 4e0b18f7..c77639d5 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -689,7 +689,7 @@ public class WorkFlowController { } @ApiOperation(value = "草稿删除") - @GetMapping("/delCG") + @PostMapping("/delCG") public String delCG(@RequestParam("id")String id){ return workFlowFeignClient.delCG(id); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java index 348a6ce5..1cde1409 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java @@ -15,7 +15,7 @@ public class ProcessDetailExport { private Date startTime; @Excel(name = "完成时间", orderNum = "4",exportFormat = "yyyy/MM/dd",width = 15) private Date endTime; - @Excel(name = "审批意见", orderNum = "5",width = 15) + @Excel(name = "流程信息", orderNum = "5",width = 15) private String comment; @Excel(name = "状态", orderNum = "6",width = 15) private String flag; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java index 3111f5d9..e33d3e4c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java @@ -118,4 +118,12 @@ public class TsUserVO { @ApiModelProperty(value = "岗位") @TableField(exist = false) private List positions; + + @ApiModelProperty(value = "单位") + @TableField(exist = false) + private String unit; + + @ApiModelProperty(value = "单位Id") + @TableField(exist = false) + private String unitId; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java index 3719ea86..55791c62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandIdea.dao; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,8 @@ import java.util.List; public interface SarPublicIdeaAllDao extends BaseMapper { List getPublicIdea(@Param("unique")String unique); + + List getAllDataByIdea(@Param("page")Integer page,@Param("size")Integer size, @Param("ideaId")String ideaId); + + Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 99547e00..4063dab4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -48,10 +48,13 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("idea_id", detAllStandDto.getIdeaId()); - Page page = new Page<>(detAllStandDto.getPage(), detAllStandDto.getSize()); - IPage userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper); + List sarPublicIdeaAlls=sarPublicIdeaAllDao.getAllDataByIdea(detAllStandDto.getPage(),detAllStandDto.getSize(),detAllStandDto.getIdeaId()); + Integer a=sarPublicIdeaAllDao.getAllDataByIdeaCount(detAllStandDto.getIdeaId()); + Page userIPage=new Page(); + userIPage.setTotal(a); + userIPage.setRecords(sarPublicIdeaAlls); + userIPage.setSize(detAllStandDto.getSize()); + userIPage.setCurrent(detAllStandDto.getPage()); System.out.println("总条数" + userIPage.getTotal()); System.out.println("总页数" + userIPage.getPages()); List list = userIPage.getRecords(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java index 0566b276..60644bd3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java @@ -58,5 +58,12 @@ public class WgDept extends BaseEntity { @TableField("join_id") private String joinId; + @ApiModelProperty(value = "手机号") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "邮箱") + @TableField("email") + private String email; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java index 12b1edec..6ec1cf93 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java @@ -44,5 +44,14 @@ public class WgNetInfo extends BaseEntity { @TableField("join_id") private String joinId; + @ApiModelProperty(value = "手机号") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "邮箱") + @TableField("email") + private String email; + + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index d466c37e..cce76150 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -40,9 +40,11 @@ select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID, ts_user.INSTITUTION_ID,ts_user.INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE, ts_user.POSITION_ID,ts_user.POSITION_NAME,ts_user.SEX,ts_user.SSO_ID,ts_user.STATE,ts_user.UNLOCK_FLAG,ts_user.USER_SOURCE, - ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname + ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname, + ts_institution.name as unit,ts_institution.id as unitId from ts_user - WHERE institution_id=#{institutionId} + left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID) + WHERE institution_id=#{institutionId} and ( ts_user.ACCOUNT like concat(concat('%',#{userName}),'%') or ts_user.UNAME like concat(concat('%',#{userName}),'%') ) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 8beb3f8a..61e052a0 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -7,4 +7,21 @@ INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique} + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml index 0cef7c6d..6a3e67df 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml @@ -3,19 +3,21 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml index 7ed719b5..0d2d005c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml @@ -3,7 +3,7 @@ + + + + + + From c53b405891a04c410ba4a138b6c4a907b85515db Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 8 Dec 2021 14:06:21 +0800 Subject: [PATCH 089/163] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8E=92=E5=BA=8F--=E3=80=8B=E7=8C=9C?= =?UTF-8?q?=E6=B5=8B=E9=9C=80=E8=A6=81=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96=20?= =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81=20=E5=90=8E=E7=BB=AD=E7=9C=8B?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=98=AF=E5=90=A6=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ndardComplianceAssessResultController.java | 20 ++---- .../SarInterpretationNationalStandardDao.java | 7 ++ ...InterpretationNationalStandardService.java | 5 ++ ...rpretationNationalStandardServiceImpl.java | 11 +++ ...arInterpretationNationalStandardMapper.xml | 71 +++++++++++++++++++ 5 files changed, 100 insertions(+), 14 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 9b921b33..03be8495 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -234,20 +234,12 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { if (eo.getPosition() == 1) { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - QueryWrapper queryWrapper = new QueryWrapper<>(); - //如果查询条件里标准编号不为空，查询 - if (eo.getStandNumber() != null) queryWrapper.like("STAND_NUMBER",eo.getStandNumber()); - //如果查询条件里标准名称不为空，查询 - if (eo.getStandName() != null) queryWrapper.like("STAND_NAME",eo.getStandName()); - //如果查询条件里具体章条不为空，查询 - if (eo.getSpecificItem() != null) queryWrapper.like("specific_item",eo.getSpecificItem()); - - if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); - - IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); - while (page.getRecords().remove(null)) ; - return Result.success(page); + List standards=iSarInterpretationNationalStandardService.getAllDatas(eo); + Integer datasCount=iSarInterpretationNationalStandardService.getAllDatasCount(eo); + iPage.setTotal(datasCount); + iPage.setRecords(standards); + while (iPage.getRecords().remove(null)) ; + return Result.success(iPage); } else { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java index 5b0f285a..b7a3094c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java @@ -1,9 +1,12 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.dao; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* Mapper 接口 @@ -16,4 +19,8 @@ public interface SarInterpretationNationalStandardDao extends BaseMapper getAllDatas(InterpretationEO sarInterpretationNationalStandard); + + Integer getAllDatasCout(InterpretationEO sarInterpretationNationalStandard); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java index 3efb40f5..52e6e773 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.service; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard; import com.baomidou.mybatisplus.extension.service.IService; @@ -18,4 +19,8 @@ public interface ISarInterpretationNationalStandardService extends IService sarInterpretationNationalStandards); boolean updateData(SarInterpretationNationalStandard findStandDto); + + List getAllDatas(InterpretationEO sarInterpretationNationalStandard); + + Integer getAllDatasCount(InterpretationEO sarInterpretationNationalStandard); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java index b5137a93..5986628f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl; import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard; import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationNationalStandardDao; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess; @@ -55,4 +56,14 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl getAllDatas(InterpretationEO sarInterpretationNationalStandard) { + return sarInterpretationNationalStandardDao.getAllDatas(sarInterpretationNationalStandard); + } + + @Override + public Integer getAllDatasCount(InterpretationEO sarInterpretationNationalStandard) { + return sarInterpretationNationalStandardDao.getAllDatasCout(sarInterpretationNationalStandard); + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml index a722018f..69179058 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml @@ -14,4 +14,75 @@ and sar_interpretation_national_standard.STAND_NAME=#{find.standName} and sar_interpretation_national_standard.INTERPRETATION_TIME = #{find.interpretationTime} + + + From 2bbdb32e8f2a67495b91eb99686004becd26a120 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 8 Dec 2021 17:23:06 +0800 Subject: [PATCH 090/163] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=86=E8=A7=A3=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarStandItems/controller/SarStandItemsController.java | 1 + 1 file changed, 1 insertion(+) 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 59229967..0642b86c 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 @@ -66,6 +66,7 @@ public class SarStandItemsController extends BaseController { }else { map.put(s,id.get(i)); } + i++; } List ItemDto = new ArrayList<>(); map.entrySet().forEach(stringStringEntry -> { From ab07fbf9ceca0c36756927ad04cee86a900121d0 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 9 Dec 2021 10:07:20 +0800 Subject: [PATCH 091/163] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=B8=8E=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86=20=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8F=96=E6=B6=88=E6=97=B6?= =?UTF-8?q?=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/utils/util/FieldConvertUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 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 5323d86d..b21525e1 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 @@ -108,7 +108,7 @@ public class FieldConvertUtil { List timeList = Arrays.asList(timeStr.split(",")); List collect = timeList.stream() - .map(item -> "str_to_date('" + item + "','%Y-%m-%d %H:%i:%s')") + .map(item -> "str_to_date('" + item + "','%Y-%m-%d')") .collect(Collectors.toList()); timeStr ="concat(" + String.join(", \',\' ,", collect) + ")"; } else { @@ -143,7 +143,7 @@ public class FieldConvertUtil { String mustValue = "'"+ UUIDUtils.randomUUID20() + "','" + id + "','0','" + LoginUserUtil.getUserId() + "'"; Date date = new Date(); - SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); String nowTime = sf.format(date); String timeValue = "," + changeTimeValue(nowTime); mustValue += timeValue + timeValue; From 2f402f737de6fc0d0cb04b38884458cee71dd1d6 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 9 Dec 2021 10:24:10 +0800 Subject: [PATCH 092/163] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=AF=BC=E5=87=BA=20=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarPublicIdeaAllController.java | 5 +---- .../adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java | 2 ++ .../adc/da/slrs/sarStandItems/entity/SarStandItems.java | 4 ++-- .../sarStandProjectLibrary/entity/StandAttrInfoDto.java | 3 +++ .../mapper/sarStandIdea/SarPublicIdeaAllMapper.xml | 8 ++++++++ 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 7077606a..4d02e421 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -102,10 +102,7 @@ public class SarPublicIdeaAllController extends BaseController response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); if (!StringUtils.isEmpty(cid)){ - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(SarPublicIdeaAll.CID,cid); - wrapper.orderByAsc("part_code"); - data=sarPublicIdeaAllDao.selectList(wrapper); + data=sarPublicIdeaAllDao.getPublicAllIdea(cid); } List standExcel=new ArrayList<>(); for (SarPublicIdeaAll sarPublicIdeaAll:data){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java index 55791c62..d3fae93a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java @@ -26,4 +26,6 @@ public interface SarPublicIdeaAllDao extends BaseMapper { List getAllDataByIdea(@Param("page")Integer page,@Param("size")Integer size, @Param("ideaId")String ideaId); Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId); + + List getPublicAllIdea(@Param("cid") String cid); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index 06cd41a3..7d32b016 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -125,12 +125,12 @@ public class SarStandItems extends BaseEntity { @ApiModelProperty(value = "新车型实施日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @TableField("XCXSSRQ") - private Date xccssrq; + private String xccssrq; @ApiModelProperty(value = "在产车实施日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @TableField("ZCCSSRQ") - private Date zccssrq; + private String zccssrq; @ApiModelProperty(value = "符合性要求-符合性状态") 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 e6a4db9e..5ed171da 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 @@ -4,8 +4,11 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; /** * //TODO 添加类/接口功能描述 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 61e052a0..864e0387 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -24,4 +24,12 @@ FROM sar_public_idea_all WHERE idea_id = #{ideaId} + + From 276f0a9726e04f8c576d1bc327ddcec2afc257a2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 9 Dec 2021 13:45:49 +0800 Subject: [PATCH 093/163] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/QualityEvaluation.java | 17 +++++++++++++++ .../service/IQualityEvaluationService.java | 2 +- .../impl/QualityEvaluationServiceImpl.java | 21 +++++++++++++------ .../QualityEvaluationMapper.xml | 6 +++++- 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java index 48272e92..db50f52a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java @@ -89,6 +89,23 @@ public class QualityEvaluation extends BaseEntity { @ApiModelProperty(value = "指标名称") private String indexTitle; + @ApiModelProperty(value = "一级指标名称") + @TableField(exist = false) + private String oneIndexTitle; + + @ApiModelProperty(value = "二级指标名称") + @TableField(exist = false) + private String twoIndexTitle; + + @ApiModelProperty(value = "三级指标名称") + @TableField(exist = false) + private String threeIndexTitle; + + + @ApiModelProperty(value = "指标权重") + @TableField(exist = false) + private String weight; + @TableField(exist = false) private Integer page; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java index c4984665..6eb17ced 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java @@ -26,5 +26,5 @@ public interface IQualityEvaluationService extends IService { public List getEvaluationForm(QualityEvaluation query); - Map getScore(String lawId); + Map getScore(String lawId); } 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 786abe9a..765241da 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 @@ -126,15 +126,24 @@ public class QualityEvaluationServiceImpl extends ServiceImpl list = this.list(queryWrapper); - - Page page = new Page<>(1, 1000); - + Page page = new Page<>(1, 1000); List list = qualityEvaluationDao.getHistory(page, queryWrapper).getRecords(); +// return list.stream() +// .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, +// Collectors.groupingBy(QualityEvaluation::getEvaluationIndex, +// Collectors.averagingDouble(item -> Double.valueOf(item.getScore())) +// ) +// )); - return list.stream() + + HashMap result = new HashMap<>(); + result.put("dynamic",0.0); + result.put("quality",0.0); + + result.putAll(list.stream() .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, - Collectors.averagingDouble(item ->Double.valueOf(item.getScore()) ))); + Collectors.averagingDouble(item ->Double.valueOf(item.getScore()) )))); + return result; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml index 4d603e7f..20dc0681 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml @@ -41,7 +41,11 @@ quality_evaluation.create_time AS createTime, quality_evaluation.modify_time AS modifyTime, `index`.value_type AS valueType, - `index`.three_index_title as indexTitle + `index`.three_index_title as indexTitle, + `index`.one_index_title as oneIndexTitle, + `index`.two_index_title as twoIndexTitle, + `index`.three_index_title as threeIndexTitle, + `index`.weight as weight FROM quality_evaluation LEFT JOIN ts_user `user` ON quality_evaluation.user_id = `user` .USID From 0cabb928d7c87658c09e918e327364894473f129 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 9 Dec 2021 14:26:50 +0800 Subject: [PATCH 094/163] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=20=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java | 4 ++-- .../sarStandItems/service/impl/SarStandItemsServiceImpl.java | 2 +- .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java index 3833259b..6d387013 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java @@ -25,11 +25,11 @@ public class FindSarItemsPageReqDTO extends BasePage { @ApiModelProperty(value = "新车型实施日期") @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date XCXSSRQ; + private String XCXSSRQ; @ApiModelProperty(value = "在产车实施日期") @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date ZCCSSRQ; + private String ZCCSSRQ; @ApiModelProperty(value = "文件类型") private String fileType; 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 e71dcf59..12b12d4e 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 @@ -236,7 +236,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl - and XCXSSRQ=#{XCXSSRQ} + and XCXSSRQ like concat('%', #{XCXSSRQ},'%') - and ZCCSSRQ=#{ZCCSSRQ} + and ZCCSSRQ like concat('%',#{ZCCSSRQ},'%') From fd9bf0f1304b3a38b8872ff286365f847b449490 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 9 Dec 2021 14:27:29 +0800 Subject: [PATCH 095/163] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=20=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarStandItems/entity/SarStandItems.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index 06cd41a3..7d32b016 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -125,12 +125,12 @@ public class SarStandItems extends BaseEntity { @ApiModelProperty(value = "新车型实施日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @TableField("XCXSSRQ") - private Date xccssrq; + private String xccssrq; @ApiModelProperty(value = "在产车实施日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @TableField("ZCCSSRQ") - private Date zccssrq; + private String zccssrq; @ApiModelProperty(value = "符合性要求-符合性状态") From 45dab725151c6f746517606f7ab5f46fc200fdbe Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 9 Dec 2021 16:55:55 +0800 Subject: [PATCH 096/163] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 38 +++++++++++++++++++ .../service/ISarStandardsInfoService.java | 2 + .../impl/SarStandardsInfoServiceImpl.java | 28 ++++++++++++++ .../SarStandardsInfoMapper.xml | 3 ++ 4 files changed, 71 insertions(+) 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 17084c8b..17b851a6 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 @@ -127,6 +127,44 @@ public class SarStandardsInfoController extends BaseController return Result.success(getPageInfo(page.getPager(), rows)); } + @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") + @GetMapping("/getSarStandardsInfoPageByWk1") + //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") + public ResponseMessage> getSarStandardsInfoPageByWk1(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); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + 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.getSarStandardsInfoPageByWk1(page); + +// 去掉日期时分秒 + rows.forEach(item->{ + + Optional.ofNullable(item.getSSRQ()) + .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getXCXSSRQ()) + .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getZCCSSRQ()) + .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + + }); + + return Result.success(getPageInfo(page.getPager(), rows)); + } + private void nowOrderFunc(SarStandardsInfoEOPage page) { 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 aa4617f5..4caf6161 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 @@ -21,6 +21,8 @@ public interface ISarStandardsInfoService extends IService { List getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception; + List getSarStandardsInfoPageByWk1(SarStandardsInfoEOPage page) throws Exception; + List getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception; List getSarStandardsInfoPageBak1(SarStandardsInfoEOPage page) 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 91c7ebed..48b557dc 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 @@ -321,6 +321,34 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPageByWk1(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); + } + } + } + Integer rowCount = dao.getSarStandardsInfoCount(page); + page.getPager().setRowCount(rowCount); + List sarlist = dao.getSarStandardsInfoPage(page,"996"); + attrInfoCollect(sarlist); + return sarlist; + } + @Override public List getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 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 5a0d04b0..59dcc305 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 @@ -758,6 +758,9 @@ (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) + + or (stand_name like concat(concat('%',#{page.standNumber}),'%')) + ) From a86fe68308c24c93223392566c85a711a501c1ce Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 9 Dec 2021 17:49:51 +0800 Subject: [PATCH 097/163] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AF=BC=E5=87=BA=20?= =?UTF-8?q?=E5=92=8C=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 8 +- .../controller/EarlyWarningEOController.java | 7 +- .../dao/EarlyWarningEODao.java | 5 +- .../entity/EarlyWarningEO.java | 5 + .../sarStandWarning/entity/WarningDate.java | 3 + .../Impl/EarlyWarningEOServiceImpl.java | 8 +- .../sarStandWarning/EarlyWraningEOMapper.xml | 95 +++++++++++++++++-- .../sarStandWarning/SarStandardWarningDao.xml | 73 +++++++++----- 8 files changed, 164 insertions(+), 40 deletions(-) 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 d9051d84..058ac857 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 @@ -74,6 +74,10 @@ public class WebMvcConfig implements WebMvcConfigurer { //企业标准导出 addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportSarBussionessStand"); + //预警导出 + addInterceptor.excludePathPatterns("/api/sys/EarlyWarning/exportWarning"); + + //OCR回调存储文件 addInterceptor.excludePathPatterns("/api/ocr/OCRRestful/OcrHandleResult"); @@ -94,7 +98,7 @@ public class WebMvcConfig implements WebMvcConfigurer { - // 添加自定义拦截器，并拦截对应 url - addInterceptor.addPathPatterns("/**"); +// // 添加自定义拦截器，并拦截对应 url +// addInterceptor.addPathPatterns("/**"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index 575f096e..5a97d919 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -131,9 +131,11 @@ public class EarlyWarningEOController extends BaseController { - @GetMapping("/exprotWarning") + @GetMapping("/exportWarning") @ApiOperation("导出预警") public void exportStandardsInfoExcel(WarningExcelVO excelVO, HttpServletResponse response) throws Exception { + + // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman try { response.setContentType("application/vnd.ms-excel"); @@ -145,11 +147,12 @@ public class EarlyWarningEOController extends BaseController { String fileName = URLEncoder.encode(excelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); +// List exportExcel = earlyWarningEOService.getExportExcel(excelVO); List exportExcel = earlyWarningEOService.getExportExcel(excelVO); // 这里需要设置不关闭流 - EasyExcel.write(response.getOutputStream(), SarStandIssueControlProduct.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + EasyExcel.write(response.getOutputStream(), StandWarningEO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(exportExcel); } catch (Exception e) { System.out.println(e); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index 0aac00c8..6bef46dd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -11,6 +11,9 @@ import java.util.List; public interface EarlyWarningEODao extends BaseMapper { - IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO,@Param("idList") List ids); + IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO); + + + List exportWarning(@Param("idList") List ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 0471434c..9ad1b399 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -37,6 +37,11 @@ public class EarlyWarningEO extends BaseEntity { @TableField("STAND_ID") private String standId; + @ExcelIgnore + @ApiModelProperty("分解单条款id") + @TableField("ITEM_ID") + private String itemId; + @ExcelIgnore @ApiModelProperty("标准类别") @TableField(exist = false) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java index 13ea497b..b1915f6f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java @@ -14,6 +14,9 @@ public class WarningDate { @TableField("law_id") private String lawId; + @TableField("itemId") + private String itemId; + @TableField("SSRQ") private String SSRQ; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index d22a9db3..57569568 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -112,7 +112,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getStandWarning(StandWarningEO queryPage) { IPage iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize()); - return earlyWarningEODao.selectWarningPage(iPage,queryPage,null); + return earlyWarningEODao.selectWarningPage(iPage,queryPage); } /** @@ -121,8 +121,10 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getExportExcel(WarningExcelVO excelVO){ - IPage standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, excelVO.getIds()); - return standWarningEOIPage.getRecords(); + List standWarningEOList = earlyWarningEODao.exportWarning( excelVO.getIds()); +// IPage standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, null); + + return standWarningEOList; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index 4c5861f7..fdc9655e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -38,16 +38,7 @@ - - warning.ID - IN - - - #{id} - - - AND trim(replace(CONCAT( @@ -83,6 +74,92 @@ ) + SELECT - law_id as STAND_ID, - '-1' AS itemsId, - 'stand' AS mark, - '1' as power + law_id AS standId, + item_id AS itemId, + CASE + WHEN item_id = '-1' THEN + 'stand' + WHEN + item_id IS NULL THEN + 'stand' + ELSE + 'item' + END AS mark, + '1' as power FROM warning_date AS warning WHERE DATE_FORMAT(warning.SSRQ,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m-%d') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d') - UNION + @@ -79,25 +87,44 @@ SELECT lawId,timeName,DATE_FORMAT(SSRQ,'%Y-%m-%d') as SSRQ FROM ( - select attr.STAND_ID as lawId,'SSRQ' as timeName, - substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ - from sar_stand_attr_info attr - join mysql.help_topic b - on b.help_topic_id < (length(attr.SSRQ) - length(replace(attr.SSRQ,',',''))+1) + select attr.STAND_ID as lawId,'-1' as itemId,'SSRQ' as timeName, + substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_attr_info attr + join mysql.help_topic b + on b.help_topic_id > (length(attr.SSRQ) - length(replace(attr.SSRQ,',',''))+1) - UNION ALL + UNION ALL - select attr.STAND_ID as lawId,'XCXSSRQ' as timeName, - substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ - from sar_stand_attr_info attr - join mysql.help_topic b - on b.help_topic_id < (length(attr.XCXSSRQ) - length(replace(attr.SSRQ,',',''))+1) - UNION ALL - select attr.STAND_ID as lawId,'ZCCSSRQ' as timeName, - substring_index(substring_index(attr.ZCCSSRQ,',',b.help_topic_id+1),',',-1) SSRQ - from sar_stand_attr_info attr - join mysql.help_topic b - on b.help_topic_id < (length(attr.SSRQ) - length(replace(attr.SSRQ,',',''))+1) + select attr.STAND_ID as lawId,'-1' as itemId,'XCXSSRQ' as timeName, + substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_attr_info attr + join mysql.help_topic b + on b.help_topic_id > (length(attr.XCXSSRQ) - length(replace(attr.XCXSSRQ,',',''))+1) + + + + UNION ALL + select attr.STAND_ID as lawId,'-1' as itemId,'ZCCSSRQ' as timeName, + substring_index(substring_index(attr.ZCCSSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_attr_info attr + join mysql.help_topic b + on b.help_topic_id > (length(attr.SSRQ) - length(replace(attr.ZCCSSRQ,',',''))+1) + + + + UNION All + select item.STAND_ID as lawId,item.ID as itemId,'ZCCSSRQ' as timeName, + substring_index(substring_index(item.ZCCSSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_items item + join mysql.help_topic b + on b.help_topic_id > (length(item.ZCCSSRQ) - length(replace(item.ZCCSSRQ,',',''))+1) + + UNION All + select item.STAND_ID as lawId,item.ID as itemId,'XCXSSRQ' as timeName, + substring_index(substring_index(item.XCXSSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_items item + join mysql.help_topic b + on b.help_topic_id > (length(item.XCXSSRQ) - length(replace(item.XCXSSRQ,',',''))+1) ) as T WHERE From 1d290e6fed4b1211614d950ab5ad583d974b1895 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 9 Dec 2021 19:44:32 +0800 Subject: [PATCH 098/163] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/login/security/WebMvcConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 058ac857..492c5ea8 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 @@ -99,6 +99,6 @@ public class WebMvcConfig implements WebMvcConfigurer { // // 添加自定义拦截器，并拦截对应 url -// addInterceptor.addPathPatterns("/**"); + addInterceptor.addPathPatterns("/**"); } } From 3156acafd25ce9cf5431b684c032d4977ccebcaf Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Fri, 10 Dec 2021 10:42:13 +0800 Subject: [PATCH 099/163] feat: There is no way the, buss --- .../da/FeignClient/workFlowFeignClient.java | 4 + .../workFlowFeignClientImpl.java | 6 + .../ActSarItemsBussEOController.java | 38 ++ .../controller/WorkFlowController.java | 7 + .../entity/BusProcessEvaluationHis.java | 78 ++++ .../service/ActSarItemsBussEOService.java | 442 ++++++++++++++++++ .../service/ActSarItemsLawsEOService.java | 32 -- .../service/ISarBussStandAttrInfoService.java | 4 + .../impl/SarBussStandAttrInfoServiceImpl.java | 10 + .../entity/SarBussionessStand.java | 4 + .../service/ISarBussionessStandService.java | 2 + 11 files changed, 595 insertions(+), 32 deletions(-) create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 8316969c..5a1572d4 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -3,6 +3,7 @@ package com.adc.da.FeignClient; import com.adc.da.common.*; import com.adc.da.common.Category; import com.adc.da.common.Page; +import com.adc.da.workFlow.entity.BusProcessEvaluationHis; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,6 +18,9 @@ import java.util.Set; //@FeignClient(value = "shan6") public interface workFlowFeignClient { + @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisList",method = RequestMethod.GET) + List evaluationHisList(@RequestParam("pid") String pid); + @RequestMapping(value = "/bat-wkflow/oaTaskExec/execTask",method = RequestMethod.GET) Map execTask(@RequestParam("todoId") String todoId); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index bd7a87ff..da6071a8 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -8,6 +8,7 @@ import com.adc.da.common.*; import com.adc.da.common.Page; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; +import com.adc.da.workFlow.entity.BusProcessEvaluationHis; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; @@ -25,6 +26,11 @@ public class workFlowFeignClientImpl { @Autowired private IUserEOService userEOService; + public List evaluationHisList(@RequestParam("pid") String pid){ + List stringWrapper = workFlowFeignClient.evaluationHisList(pid); + return stringWrapper; + } + public Map execTask(@RequestParam("todoId") String todoId){ Map stringWrapper = workFlowFeignClient.execTask(todoId); return stringWrapper; diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java new file mode 100644 index 00000000..a15cbc75 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java @@ -0,0 +1,38 @@ +package com.adc.da.workFlow.controller; + + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; +import com.adc.da.workFlow.service.ActSarItemsBussEOService; +import com.adc.da.workFlow.service.ActSarItemsLawsEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/${restPath}/lawss/actSarItemsBuss") +@Api(description = "|ActSarItemsBuss|") +public class ActSarItemsBussEOController extends BaseController { + + @Autowired + private ActSarItemsBussEOService actSarItemsEOService; + +// private static final Logger logger = LoggerFactory.getLogger(AttFileEOController.class); + + @ApiOperation(value = "|SarBussionessStand|企标入库流程") + @PostMapping("/processCreateBuss") + public ResponseMessage processCreateBuss(String infoJson) throws Exception { + if (StringUtils.isNotBlank(infoJson)) { + actSarItemsEOService.processCreateBuss(infoJson); + return Result.success("入库成功"); + } else { + return Result.error("传入数据json不能为空"); + } + } +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index c77639d5..1865962f 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -17,6 +17,7 @@ import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.util.LoginUserUtil; import com.adc.da.workFlow.dao.ExportExcelMapper; +import com.adc.da.workFlow.entity.BusProcessEvaluationHis; import com.adc.da.workFlow.entity.ExportExcel; import com.adc.da.workFlow.entity.ExportExcelEO; import com.adc.da.workFlow.entity.ProcessDetailExport; @@ -49,6 +50,12 @@ public class WorkFlowController { // @Autowired // private ExportExcelMapper exportExcelMapper; + @ApiOperation(value = "查询流程父节点所有评分") + @GetMapping("/evaluationHisList") + public List evaluationHisList(@RequestParam("pid") String pid){ + return workFlowFeignClient.evaluationHisList(pid); + } + @ApiOperation(value = "干活流程接收待办") @GetMapping("/execTask") public Map execTask(@RequestParam("todoId") String todoId){ diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java new file mode 100644 index 00000000..e70c9bb3 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java @@ -0,0 +1,78 @@ +package com.adc.da.workFlow.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +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.io.Serializable; + +/** + *

+ * OA日志表 + *

+ * + * @author super_liu + * @since 2021-09-17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BusProcessEvaluationHis对象", description="流程评分历史表") +public class BusProcessEvaluationHis implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "ID", type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "标准id") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "处理人") + @TableField("USER_ID") + private String userId; + + @ApiModelProperty(value = "信息") + @TableField("MESG") + private String mesg; + + @ApiModelProperty(value = "节点信息") + @TableField("TASK_INFO") + private String taskInfo; + + @ApiModelProperty(value = "任务id") + @TableField("TASK_ID") + private String taskId; + + @ApiModelProperty(value = "流程实例id") + @TableField("P_ID") + private String pId; + + @ApiModelProperty(value = "流程名称") + @TableField("PRC_NAME") + private String prcName; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("UPDATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String updateTime; + + @ApiModelProperty(value = "逻辑状态") + @TableField("FLAG") + private String flag; + + +} 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 new file mode 100644 index 00000000..047bfa43 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -0,0 +1,442 @@ +package com.adc.da.workFlow.service; + +import com.adc.da.FeignClientImpl.workFlowFeignClientImpl; +import com.adc.da.common.SarConformStateEnum; +import com.adc.da.common.SarStateColorEnum; +import com.adc.da.common.SarTypeEnum; +import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess; +import com.adc.da.slrs.SarCompResAssess.service.ISarCompResAssessService; +import com.adc.da.slrs.SarCompStatusInfo.dao.SarCompStatusInfoDao; +import com.adc.da.slrs.SarCompStatusInfo.entity.SarCompStatusInfo; +import com.adc.da.slrs.SarFileSplitItems.service.ISarFileSplitItemsService; +import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; +import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; +import com.adc.da.slrs.sarLawsAttrInfo.service.ISarLawsAttrInfoService; +import com.adc.da.slrs.sarLawsItemVal.dao.SarLawsItemValDao; +import com.adc.da.slrs.sarLawsItems.dao.SarLawsItemsDao; +import com.adc.da.slrs.sarLawsItems.entity.SarLawsItems; +import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo; +import com.adc.da.slrs.sarLawsStandInfo.service.ISarLawsStandInfoService; +import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; +import com.adc.da.slrs.sarStandItems.entity.SarStandItems; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; +import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +import com.adc.da.util.UUIDUtils; +import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.workFlow.dao.ActSarItemsEODao; +import com.adc.da.workFlow.entity.BusProcessEvaluationHis; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializerFeature; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.text.SimpleDateFormat; +import java.util.*; + +@Service("actSarItemsBussEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class ActSarItemsBussEOService { + + private static final Logger logger = LoggerFactory.getLogger(ActSarItemsBussEOService.class); + + @Autowired + private SarStandAttrInfoDao sarStandAttrInfoEODao; + + @Autowired + private workFlowFeignClientImpl workFlowFeignClient; + + @Autowired + private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao; + + @Autowired + private ISarBussStandAttrInfoService sarBussStandAttrInfoService; + + @Autowired + private ISarBussionessStandService iSarBussionessStandService; + + @Autowired + private IQualityEvaluationService qualityEvaluationService; + + @Autowired + private ISarUpdLogService sarUpdLogEOService; + + + @Value("${elas.flag}") + private boolean elasflag; + + /*** + * @Description: 国内外标准流程入库" + * @Date: 2020/12/7 13:48 + * @Param: [standJson] + * @Return: void + */ + public void processCreateBuss(String standJson) throws Exception{ + Map standMap = new HashMap(); + standMap = JSONObject.parseObject(standJson); + if (standMap != null && !standMap.isEmpty()) { + String prcNum = String.valueOf(standMap.get("prcNum")); + String pid = String.valueOf(standMap.get("topId")); + String prcName = String.valueOf(standMap.get("prcName")); + String standType = String.valueOf(standMap.get("standType")); +// String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估 + SarBussionessStand sarBussionessStand = new SarBussionessStand(); +// if(standMap.containsKey("standId")) { +// if (standMap.get("standId") != null && !standMap.get("standId").toString().equals("")) { +// String resId = standMap.get("standId").toString(); +// //此处说明是带入的形式 +// sarStandardsInfoEO.setId(resId); +// SarCompResAssess assessInfoByResId = sarCompResAssessEOService.ssessInfoByResId(resId); +// if (assessInfoByResId != null) { +// assessInfoByResId.setProcessState("2"); +// sarCompResAssessEOService.updateByPrimaryKeySelective(assessInfoByResId); +// } +// } +// } + + 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.queryFieldListBuss.contains(field)) { + if (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; + }else { + value = ""; + } + } + attInfoMap.put(field,value); + } else { + createStandBaseField(sarBussionessStand,entry.getKey(),value); + } + } + //处理文件 + //此处需要处理之前的文件信息，防止文件丢失 +// attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); + String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); + sarBussionessStand.setSarStandAttrEOStr(resData); + // 根据标准号判断数据是否已存在 + //2021年4月9日 此处检查当前是否存在standId + String standCode = ""; + if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){ + standCode = sarBussionessStand.getStandCode(); + } + List lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); +// 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"); +// } + //此处判断是否是带入的标准 + String bussId = ""; + if(StringUtils.isNotBlank(sarBussionessStand.getId())) { + bussId = sarBussionessStand.getId(); + SarBussionessStand query = new SarBussionessStand(); + query.setId(sarBussionessStand.getId()); + iSarBussionessStandService.attrInfoDetails(query); + Map attrInfoMap = query.getAttrInfoMap(); + if(attInfoMap!=null && !attInfoMap.isEmpty()){ + updateStandFileFieldData(attInfoMap,attrInfoMap); + resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); + sarBussionessStand.setSarStandAttrEOStr(resData); + } + // 查询原相关流程 + String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",sarBussionessStand.getId()); + if (StringUtils.isNotBlank(relatePro)) { + String[] processSplit = relatePro.split(","); + Set processSet = new HashSet<>(); + for(String sData:processSplit){ + processSet.add(sData); + } + processSet.add(prcNum); + relatePro = StringUtils.join(processSet.toArray(), ","); + } else { + relatePro = prcNum; + } + // 编辑标准 + iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); + // 编辑相关流程 + sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",relatePro); + String content = "新增一条相关流程:" +prcName+" "+prcNum; + sarUpdLogEOService.createBaseLog(sarBussionessStand.getId(),standType+"_STAND",content); + }else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在，但是标准号存在的情况 + String standId = lawsList.get(0).getId(); + bussId = lawsList.get(0).getId(); + SarBussionessStand query = new SarBussionessStand(); + query.setId(standId); + iSarBussionessStandService.attrInfoDetails(query); + Map attrInfoMap = query.getAttrInfoMap(); + if(attInfoMap!=null && !attInfoMap.isEmpty()){ + updateStandFileFieldData(attInfoMap,attrInfoMap); + resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); + sarBussionessStand.setSarStandAttrEOStr(resData); + } + // 查询原相关流程 + String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",standId); + if (StringUtils.isNotBlank(relatePro)) { + String[] processSplit = relatePro.split(","); + Set processSet = new HashSet<>(); + for(String sData:processSplit){ + processSet.add(sData); + } + processSet.add(prcNum); + relatePro = StringUtils.join(processSet.toArray(), ","); + } else { + relatePro = prcNum; + } + // 编辑标准 + sarBussionessStand.setId(standId); + iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); + // 编辑相关流程 + sarBussStandAttrInfoService.updateStandInfo(standId,"XGLC",relatePro); + String content = "新增一条相关流程:" +prcName+" "+prcNum; + sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content); + } else {//标准号、ID都不存在的情况 + // 新增方法 + ResponseMessage responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); + if(responseMessage.isOk()){ + SarBussionessStand bussionessStand = responseMessage.getData(); + bussId = bussionessStand.getId() == null ? "":bussionessStand.getId(); + } + + // 编辑相关流程 + sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",prcNum); + } + List allItems = new ArrayList<>(); + //开始处理条款数据，从去重后的结果中直接处理即可 +// if(itemData!=null && !itemData.isEmpty()){ +// // allItems = +// saveStandItemsData(itemData, sarStandardsInfoEO); +// } + //技术评估结果入库 重构技术评估结果入库内容 +// if ("0".equals(isJudge)) { +// saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum); +// } + + List evaluationHis = workFlowFeignClient.evaluationHisList(pid); + List evaluations = new ArrayList<>(); + if(!evaluationHis.isEmpty()){ + String finalBussId = bussId; + evaluationHis.forEach(busProcessEvaluationHis -> { + List valueArr = JSONArray.parseArray(busProcessEvaluationHis.getMesg(),JSONObject.class); + if(!valueArr.isEmpty()){ + valueArr.forEach(object -> { + QualityEvaluation evaluation = new QualityEvaluation(); + evaluation.setId(UUIDUtils.randomUUID20()); + evaluation.setLawId(finalBussId); + evaluation.setUserId(object.getString("userId")); + evaluation.setScore(object.getString("score")); + evaluation.setReason(object.getString("reason")); + evaluation.setEvaluationIndex(object.getString("code")); + evaluation.setProcessNode(object.getString("processNode")); + evaluation.setEvaluationType(object.getString("indexType")); + evaluation.setCreateTime(new Date()); + evaluation.setModifyTime(new Date()); + evaluations.add(evaluation); + + }); + } + }); + } + qualityEvaluationService.saveBatch(evaluations); + } + + + } + + private void updateStandFileFieldData(Map addAttInfoMap,Map oldAttInfoMap){ + if(oldAttInfoMap.containsKey("CA")){ + String fileStr = (String) oldAttInfoMap.get("CA"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("CA")?(String)addAttInfoMap.get("CA"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("CA",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("CA",fileStr); + } + } + }else if(oldAttInfoMap.containsKey("ZQYJG")){ + String fileStr = (String) oldAttInfoMap.get("ZQYJG"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("ZQYJG")?(String)addAttInfoMap.get("ZQYJG"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("ZQYJG",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("ZQYJG",fileStr); + } + } + }else if(oldAttInfoMap.containsKey("BPG")){ + String fileStr = (String) oldAttInfoMap.get("BPG"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("BPG")?(String)addAttInfoMap.get("BPG"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("BPG",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("BPG",fileStr); + } + } + }else if(oldAttInfoMap.containsKey("SSG")){ + String fileStr = (String) oldAttInfoMap.get("SSG"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("SSG")?(String)addAttInfoMap.get("SSG"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("SSG",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("SSG",fileStr); + } + } + }else if(oldAttInfoMap.containsKey("ZBJBD")){ + String fileStr = (String) oldAttInfoMap.get("ZBJBD"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("ZBJBD")?(String)addAttInfoMap.get("ZBJBD"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("ZBJBD",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("ZBJBD",fileStr); + } + } + }else if(oldAttInfoMap.containsKey("FBGBJBD")){ + String fileStr = (String) oldAttInfoMap.get("FBGBJBD"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("FBGBJBD")?(String)addAttInfoMap.get("FBGBJBD"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("FBGBJBD",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("FBGBJBD",fileStr); + } + } + } + } + + /** + * 处理标准基础库字段 + * @param sarBussionessStand + * @param field + * @param value + * @throws Exception + */ + public void createStandBaseField (SarBussionessStand sarBussionessStand,String field,Object value) throws Exception{ + String valueStr = ""; + if (value != null) { + valueStr = String.valueOf(value); + } + switch (field) { + case "id": sarBussionessStand.setId(valueStr); break; + case "standSort": sarBussionessStand.setStandSort(valueStr); break; + case "standNumber": sarBussionessStand.setStandNumber(valueStr); break; + case "standYear": sarBussionessStand.setStandYear(valueStr); break; + case "standCode": sarBussionessStand.setStandCode(valueStr); break; + case "standName": sarBussionessStand.setStandName(valueStr); break; + case "standEnName": sarBussionessStand.setStandEnName(valueStr); break; + case "textStatusBuss": sarBussionessStand.setTextStatusBuss(valueStr); break; + case "issueTime": + if (StringUtils.isNotBlank(valueStr)) { + sarBussionessStand.setIssueTime(tTo(valueStr)); + } + break; + case "putTime": + if (StringUtils.isNotBlank(valueStr)) { + sarBussionessStand.setPutTime(tTo(valueStr)); + } + break; + case "prcNum": sarBussionessStand.setProcessNum(valueStr); break; + case "menuId": sarBussionessStand.setMenuId(valueStr); break; + case "fileWord": + if (StringUtils.isNotBlank(sarBussionessStand.getFileIds()) && StringUtils.isNotBlank(valueStr)) { + valueStr = sarBussionessStand.getFileIds() + "," + valueStr; + } + sarBussionessStand.setFileIds(valueStr); break; + case "filePdf": + if (StringUtils.isNotBlank(sarBussionessStand.getFileIds()) && StringUtils.isNotBlank(valueStr)) { + valueStr = sarBussionessStand.getFileIds() + "," + valueStr; + } + sarBussionessStand.setFileIds(valueStr); + break; + default: break; + } + } + + private String tTo(String dateStr){ + return dateStr.contains("T") ? dateStr.split("T")[0] : dateStr; + } + +} 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 9a56387e..9509383b 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 @@ -87,38 +87,6 @@ public class ActSarItemsLawsEOService { @Value("${elas.flag}") private boolean elasflag; - /** - * 标准解读流程入库" - * @param standJson - * @throws Exception - */ - public void createStandardRead(String standJson) throws Exception{ - JSONObject object = JSONObject.parseObject(standJson); - String fileName = object.getString("fileName"); - String fileType = object.getString("fileType"); - String creationTime = object.getString("creationTime"); - String creationUser = object.getString("creationUser"); - String standId = object.getString("standId"); - //数组去重 - JSONArray responUserList1 = object.getJSONArray("itemList"); - for (Object obj:responUserList1) { - JSONObject object1 = (JSONObject) obj; - JSONArray preResponUserList = object1.getJSONArray("zxUserId"); - String oldNumber = object1.getString("oldNumber"); - String itemsNum = object1.getString("itemsNum"); - String itemsName = object1.getString("itemsName"); - String itemsTitle = object1.getString("itemsTitle"); - String applyArcticId = object1.getString("applyArcticId"); - String applyArctic = object1.getString("applyArctic"); - String changePoint = object1.getString("changePoint"); - String technicalRequir = object1.getString("technicalRequir"); - String onlineData = object1.getString("onlineData"); - String newData = object1.getString("newData"); - String complianceRequir = object1.getString("complianceRequir"); - String complianceState = object1.getString("complianceState"); - } - } - /*** * @Description: 国内外标准流程入库" * @Author: yangxuenan diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java index b34a1f17..a332d80c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java @@ -16,6 +16,10 @@ import java.util.List; */ public interface ISarBussStandAttrInfoService extends IService { + String selectFieldValByStandId(String field,String standId); + + int updateStandInfo(String standId,String field,String value); + List queryByList(SarBussStandAttrInfoEOPage page); List queryByPage(SarBussStandAttrInfoEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java index 3bc28e05..d4a5a599 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java @@ -20,6 +20,16 @@ import java.util.List; @Service public class SarBussStandAttrInfoServiceImpl extends ServiceImpl implements ISarBussStandAttrInfoService { + @Override + public int updateStandInfo(String standId,String field,String value){ + return this.baseMapper.updateStandInfo(standId,field,value); + } + + @Override + public String selectFieldValByStandId (String field,String standId) { + return this.baseMapper.selectFieldValByStandId(field,standId); + } + @Override public List queryByList(SarBussStandAttrInfoEOPage page){ return this.baseMapper.queryByList(page); 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 1009fa1a..3f411919 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 @@ -56,6 +56,7 @@ public class SarBussionessStand extends BaseEntity { @ApiModelProperty(value = "发布日期") @TableField("ISSUE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String issueTime; @ApiModelProperty(value = "实施日期") @@ -130,6 +131,9 @@ public class SarBussionessStand extends BaseEntity { @TableField(exist = false) private String putTimeStr; + @TableField(exist = false) + private String processNum;//流程编号 + //目录ID 非标准信息表中的字段 @TableField(exist = false) private String menuId; 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 633241f4..39fa8d65 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 @@ -18,6 +18,8 @@ import java.util.List; */ public interface ISarBussionessStandService extends IService { + void attrInfoDetails (SarBussionessStand row) throws Exception; + ResponseMessage deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception; List getSarBussionessStand(String exportType, String exportContent,String userId) throws Exception; From 22faad46dbefea7ee5ee325728c310becad89c52 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 10 Dec 2021 13:45:07 +0800 Subject: [PATCH 100/163] =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandItems/service/impl/SarStandItemsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 12b12d4e..0a90890a 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 @@ -245,7 +245,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl Date: Fri, 10 Dec 2021 13:47:42 +0800 Subject: [PATCH 101/163] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=AF=84=E5=88=86?= =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QualityEvaluationServiceImpl.java | 6 ++++++ .../QualityEvaluationMapper.xml | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) 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 765241da..c24c9664 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 @@ -112,6 +112,12 @@ public class QualityEvaluationServiceImpl extends ServiceImpl @@ -38,6 +40,7 @@ score, reason, evaluation_index as evaluationIndex, + process_node as processNode, quality_evaluation.create_time AS createTime, quality_evaluation.modify_time AS modifyTime, `index`.value_type AS valueType, From 483429fb8b023a68017807f9e4e9734b0b52ab5e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 10 Dec 2021 13:51:26 +0800 Subject: [PATCH 102/163] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=95=B4=E6=94=B9--=E3=80=8B=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E7=9B=B4=E6=8E=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9A=84closeStatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandUnqualifiedController.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java index c63c1e8d..3c25d66a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java @@ -68,7 +68,7 @@ public class SarStandUnqualifiedController extends BaseController update(@RequestBody SarStandUnqualified sarStandUnqualified){ if (sarStandUnqualifiedService.updateById(sarStandUnqualified)) { @@ -79,6 +79,17 @@ public class SarStandUnqualifiedController extends BaseController updateBatch(@RequestBody List sarStandUnqualified){ + if (sarStandUnqualifiedService.saveOrUpdateBatch(sarStandUnqualified)) { + return Result.success("新增成功"); + } + else{ + return Result.error("新增失败"); + } + } + /** * 分页查询未符合项 * @param sarStandUnqualifiedPage：筛选、分页信息 From 2623bb0954f86e7e1f374b48218fa34f31e4150e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 10 Dec 2021 14:49:41 +0800 Subject: [PATCH 103/163] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=B8=85=E5=8D=95!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListServiceImpl.java | 20 +++++++++---------- .../impl/SarLawsDetailedListServiceImpl.java | 12 +++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index ea61ac36..037c2f22 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -60,16 +60,16 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper);/ -// if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ -// lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); -// } -// if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ -// lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); -// } -// if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq())){ -// lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); -// } + List sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ + lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ + lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq())){ + lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); + } if ("INLAND".equals(lawsDto.getStandType()))lawsDto.setStandType("INLAND_STAND"); if ("FOREIGN".equals(lawsDto.getStandType()))lawsDto.setStandType("FOREIGN_STAND"); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index d32c8f4c..41bb6724 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -250,9 +250,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); if (detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); - String[] putTime = detailedUpDto.getInforlist1().split(","); - String[] zcc = detailedUpDto.getInforlist2().split(","); - String[] xcx = detailedUpDto.getInforlist3().split(","); + String[] putTime = detailedUpDto.getInforlist1().split(";"); + String[] zcc = detailedUpDto.getInforlist2().split(";"); + String[] xcx = detailedUpDto.getInforlist3().split(";"); for (int a = 0; a < id.length; a++) { TimeDto dto = new TimeDto(); dto.setStandId(id[a]); From c783f40d415da7354572b0045a6e0c3c1d9f8f1c Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 10 Dec 2021 15:38:41 +0800 Subject: [PATCH 104/163] =?UTF-8?q?=E9=A2=84=E8=AD=A6excel=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=20=E6=95=B0=E6=8D=AE=E4=B8=8E=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 5 ++- .../dao/EarlyWarningEODao.java | 3 +- .../entity/EarlyWarningEO.java | 14 +++---- .../entity/WarningExportVO.java | 35 +++++++++++++++++ .../service/EarlyWarningEOService.java | 3 +- .../Impl/EarlyWarningEOServiceImpl.java | 5 ++- .../sarStandWarning/EarlyWraningEOMapper.xml | 38 ++++++++++++++----- 7 files changed, 80 insertions(+), 23 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index 5a97d919..987beea9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -9,6 +9,7 @@ import com.adc.da.slrs.sarStandIssueControlProduct.entity.StandIssueControlProdu import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.adc.da.slrs.sarStandWarning.service.Impl.EarlyWarningEOServiceImpl; import com.alibaba.excel.EasyExcel; @@ -148,11 +149,11 @@ public class EarlyWarningEOController extends BaseController { response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); // List exportExcel = earlyWarningEOService.getExportExcel(excelVO); - List exportExcel = earlyWarningEOService.getExportExcel(excelVO); + List exportExcel = earlyWarningEOService.getExportExcel(excelVO); // 这里需要设置不关闭流 - EasyExcel.write(response.getOutputStream(), StandWarningEO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + EasyExcel.write(response.getOutputStream(), WarningExportVO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(exportExcel); } catch (Exception e) { System.out.println(e); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index 6bef46dd..618770a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandWarning.dao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; @@ -14,6 +15,6 @@ public interface EarlyWarningEODao extends BaseMapper { IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO); - List exportWarning(@Param("idList") List ids); + List exportWarning(@Param("idList") List ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 9ad1b399..21172be4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -47,17 +47,17 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String standType; - @ExcelProperty("标准号") + @ExcelProperty(value = "标准号",index = 1) @ApiModelProperty("标准号") @TableField(exist = false) private String standCode; - @ExcelProperty("标准名称") + @ExcelProperty(value = "标准名称",index = 2) @ApiModelProperty("标准名称") @TableField(exist = false) private String standName; - @ExcelProperty("发布日期") + @ExcelProperty(value = "发布日期",index = 5) @ApiModelProperty("发布日期") @TableField(exist = false) @DateTimeFormat(pattern="yyyy-MM-dd") @@ -67,12 +67,12 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private Date lastTime; - @ExcelProperty("适用车型") + @ExcelIgnore @ApiModelProperty("适用车型") @TableField(exist = false) private String applyType; - @ExcelProperty("责任工程师") + @ExcelIgnore @ApiModelProperty("责任工程师") @TableField(exist = false) private String dutyEngineer; @@ -82,12 +82,12 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String itemsId; - @ExcelProperty("条款（分解单）编号") + @ExcelProperty(value = "条款（分解单）编号",index = 3) @ApiModelProperty("条款（分解单）编号") @TableField(exist = false) private String itemsNum; - @ExcelProperty("条款（分解单）名称") + @ExcelProperty(value = "条款（分解单）名称",index = 4) @ApiModelProperty("条款（分解单）名称") @TableField(exist = false) private String itemsName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java new file mode 100644 index 00000000..74b67615 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.sarStandWarning.entity; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WarningExportVO extends EarlyWarningEO { + + + + @ExcelProperty(value = "实施日期",index = 6) + @ApiModelProperty("标准号") + private String SSRQ; + + + @ExcelProperty(value = "新车型实施日期",index = 7) + @ApiModelProperty("新车型实施日期") + private String XCXSSRQ; + + @ExcelProperty(value = "在产车实施日期",index = 8) + @ApiModelProperty("在产车实施日期") + private String ZCCSSRQ; + + @ExcelProperty(value = "标准类别",index = 0) + @ApiModelProperty("标准类别显示") + private String standTypeShow; + + @ExcelProperty(value = "适用车型",index = 9) + @ApiModelProperty("适用车型展示") + private String applyTypeShow; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java index fea9090f..b5079d69 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandWarning.service; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -22,5 +23,5 @@ public interface EarlyWarningEOService extends IService { IPage getStandWarning(StandWarningEO queryPage); - List getExportExcel(WarningExcelVO excelVO); + List getExportExcel(WarningExcelVO excelVO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 57569568..0b8f6f78 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -120,8 +121,8 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getExportExcel(WarningExcelVO excelVO){ - List standWarningEOList = earlyWarningEODao.exportWarning( excelVO.getIds()); + public List getExportExcel(WarningExcelVO excelVO){ + List standWarningEOList = earlyWarningEODao.exportWarning( excelVO.getIds()); // IPage standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, null); return standWarningEOList; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index fdc9655e..1e2ee222 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -38,8 +38,6 @@ - - AND trim(replace(CONCAT( sarInfo.STAND_SORT, @@ -74,18 +72,35 @@ ) - SELECT WARNING_RESULT.* FROM ( SELECT - - , - attr.CLLX AS - APPLY_TYPE , - attr - .ZRGCS AS DUTY_ENGINEER , + , + dicType.DIC_TYPE_NAME AS applyTypeShow, + attr.CLLX AS APPLY_TYPE , + attr.ZRGCS AS DUTY_ENGINEER , NULL AS ITEMS_ID , NULL AS ITEMS_NUM , NULL AS ITEMS_NAME , NULL AS POLICY_ID , @@ -97,6 +112,7 @@ FROM sar_stand_warning AS warning LEFT JOIN sar_standards_info AS sarInfo on sarInfo.id=warning.STAND_ID LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID + LEFT JOIN ts_dictype as dicType on dicType.DIC_TYPE_CODE =attr.CLLX POWER = '1' AND (MARK = 'stand') @@ -116,7 +132,8 @@ UNION ALL SELECT - , + , + dicType.DIC_TYPE_NAME AS applyTypeShow, items.APPLY_ARCTIC AS APPLY_TYPE , items.DUTY_ENGINEER AS DUTY_ENGINEER , items.ID AS ITEMS_ID , @@ -133,6 +150,7 @@ LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID LEFT JOIN sar_stand_items AS items ON items.STAND_ID = warning.STAND_ID LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID + LEFT JOIN ts_dictype as dicType on dicType.DIC_TYPE_CODE =items.APPLY_ARCTIC POWER = '1' AND (MARK = 'item') From e6aa1bf44fb42af47961a5e29d56b9b5fb238ee0 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 10 Dec 2021 15:40:00 +0800 Subject: [PATCH 105/163] =?UTF-8?q?=E8=AF=84=E5=88=86=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?bug=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=A4=9F=E7=B2=BE=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QualityEvaluationController.java | 1 + .../slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java | 3 +++ .../service/impl/QualityEvaluationServiceImpl.java | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java index c146dbf8..7bcab299 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java @@ -78,6 +78,7 @@ public class QualityEvaluationController extends BaseController evaluationForm = iQualityEvaluationService.getEvaluationForm(qualityEvaluation); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java index 2620c87d..6466e49a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java @@ -25,4 +25,7 @@ public class FormVO { @ApiModelProperty("评分类型") private String evaluationType; + + @ApiModelProperty("流程节点名称") + private String processNode; } 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 c24c9664..97df86c3 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 @@ -84,6 +84,9 @@ public class QualityEvaluationServiceImpl extends ServiceImpl Date: Fri, 10 Dec 2021 16:15:39 +0800 Subject: [PATCH 106/163] =?UTF-8?q?=E8=AF=84=E5=88=86=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QualityEvaluationServiceImpl.java | 3 ++- .../sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml | 2 +- 2 files changed, 3 insertions(+), 2 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 97df86c3..55364424 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 @@ -72,7 +72,8 @@ public class QualityEvaluationServiceImpl extends ServiceImpl getHistory(QualityEvaluation query) { QueryWrapper queryWrapper = new QueryWrapper<>(); // Page page = new Page<>(query.getPage(), query.getPageSize()); - Page page = new Page<>(1, 20); + //没有page和pageSize无法分页 + Page page = new Page<>(1, 100000); if (query.getUserId()!=null){ //指定用户 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml index 2a958245..86929393 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml @@ -26,7 +26,7 @@ valueType, evaluationType, process_node - ORDER BY modifyTime DESC + ORDER BY modifyTime DESC,process_node ASC From 11dbe628c80e431539a83191f2ef1bb30f7b7768 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 10 Dec 2021 17:01:07 +0800 Subject: [PATCH 107/163] =?UTF-8?q?=E8=AF=84=E5=88=86=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/QualityEvaluationServiceImpl.java | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) 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 55364424..3b76d119 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 @@ -148,9 +148,35 @@ public class QualityEvaluationServiceImpl extends ServiceImplDouble.valueOf(item.getScore()) )))); + Collectors.averagingDouble(item ->{ + + Double score; + switch (item.getProcessNode()){ + case "会签征求意见": + score=Double.valueOf(item.getScore()) * 0.3; + break; + case "技术委员会负责人/起草中心主任审核": + score=Double.valueOf(item.getScore()) * 0.4; + break; + case "标准法规工程师复审": + score=Double.valueOf(item.getScore()) * 0.3; + break; + case "标准法规部部长审核": + score=Double.valueOf(item.getScore()) * 0.3; + break; + default: score=Double.valueOf(item.getScore()); + } + + return score; + } )))); return result; } From 1a88f21eb09d13b73152e283afb67974ca13756a Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 12 Dec 2021 10:52:29 +0800 Subject: [PATCH 108/163] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index 20c72636..8261e623 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -61,7 +61,7 @@ c.* FROM ( - SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM ( + SELECT b.*,sar_standards_info.STAND_TYPE as standType , ts_user.UNAME as dutyEngineerName , ts_user.INSTITUTION_NAME as responsibleUnit FROM ( SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* FROM sar_stand_unqualified,(SELECT @i:=0)j WHERE @@ -83,6 +83,7 @@ limit #{start},#{end} )b left join sar_standards_info on b.STAND_ID = sar_standards_info.id + left join ts_user on ts_user.USID = b.DUTY_ENGINEER )c ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows From c87d843055d130fecb3fd2645f6ca57b7c57fd1c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 13 Dec 2021 14:15:44 +0800 Subject: [PATCH 109/163] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=96=B0---=EF=BC=81=EF=BC=81=EF=BC=81?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/common/ActDefineStartMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 2fa07426..67304700 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -16,7 +16,7 @@ public class ActDefineStartMap { Map map = new TreeMap<>(); map.put("1","standardLibraryWkflow"); map.put("2","standardSurveyWorkFlow"); - map.put("3","standardCommentProcessWorkFlow"); + map.put("3","StandAskForOpinion"); map.put("4","standardregulatoryinventory"); map.put("5","projectEvaluationProcess"); map.put("6","Projectcomplianceassessment"); From 301ba42d65b3c31b6b35b1c7ec7339cbe44c65f4 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 13 Dec 2021 16:17:25 +0800 Subject: [PATCH 110/163] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=9F=A5?= =?UTF-8?q?=E4=BA=BA=E6=8E=A5=E5=8F=A3=20=E4=BB=A5=E5=8F=8A=20=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=B6=89=E5=8F=8A=E5=88=B0=E5=BC=80=E8=80=80=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E5=8A=A0=E4=BA=86=E5=A4=87=E6=B3=A8=20?= =?UTF-8?q?=E6=88=91=E5=85=88=E6=94=B9=E4=BA=86=E4=B8=80=E4=B8=8B=20?= =?UTF-8?q?=E7=AD=89=E5=BC=80=E8=80=80=E5=9B=9E=E6=9D=A5=E7=9C=8B=E4=B8=80?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandFileEOServiceImpl.java | 8 ++++---- .../com/adc/da/sys/controller/UserEOController.java | 11 +++++++++++ .../src/main/java/com/adc/da/sys/dao/UserEODao.java | 3 +++ .../java/com/adc/da/sys/entity/UserPhoneDTO.java | 13 +++++++++++++ .../java/com/adc/da/sys/service/IUserEOService.java | 4 ++++ .../adc/da/sys/service/impl/UserEOServiceImpl.java | 10 ++++++---- .../resources/mybatis/mapper/sys/UserEOMapper.xml | 10 ++++++++++ 7 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 3713a30a..848d2eed 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -77,13 +77,13 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE"); List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); - + //开耀这地方我把selectOne改成了批量因为 查单个数据里面出了问题你看看给改一下 sarStandFileEOS.forEach(item->{ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("ORI_ATT_ID",item.getOriAttId()) - .eq("USE_MODEL","SOURCE_FILE"); - SarStandFileEO sarStandFileEO = sarStandFileEODao.selectOne(wrapper); - item.setFileOldName(sarStandFileEO.getFileName()); + .eq("USE_MODEL","SOURCE_FILE").orderByDesc("CREATION_TIME"); + List sarStandFileEO = sarStandFileEODao.selectList(wrapper); + item.setFileOldName(sarStandFileEO.get(0).getFileOldName()); }); return sarStandFileEOS; diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 9e48c42c..909c6720 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -9,6 +9,7 @@ import com.adc.da.http.Result; import com.adc.da.sys.constant.ValidFlagEnum; import com.adc.da.sys.entity.RoleEO; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserPhoneDTO; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.service.IOrgEOService; import com.adc.da.sys.service.IRoleEOService; @@ -66,6 +67,16 @@ public class UserEOController extends BaseController { return Result.success(userVO); } + + + @ApiOperation(value = "|UserEO|详情") + @GetMapping("/getUserByPhone") +// @RequiresPermissions("sys:user:get") + public ResponseMessage> getUserByName(@RequestParam(required = false,value = "name")String name){ + List userPhoneDTOS=userEOService.getUserByName(name); + return Result.success(userPhoneDTOS); + } + @ApiOperation(value = "|UserEO|详情接口") @GetMapping("/getById") public ResponseMessage getByIdFeignClient(String id) throws Exception { diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java index 7350abc3..feb6b27f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java @@ -2,6 +2,7 @@ package com.adc.da.sys.dao; import com.adc.da.base.page.BasePage; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserPhoneDTO; import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.vo.RoleUserVO; @@ -171,5 +172,7 @@ public interface UserEODao extends BaseMapper { public UserEO getUserEOByAccountNotDeleted(String account); + //手机端接口 只查人 + List getUserByName(@Param("name") String name); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java new file mode 100644 index 00000000..b7e6e3b4 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java @@ -0,0 +1,13 @@ +package com.adc.da.sys.entity; + +import lombok.Data; + +@Data +public class UserPhoneDTO { + + private String usId; + + private String userName; + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java index 3e3e70ec..2ac157e6 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java @@ -3,6 +3,7 @@ package com.adc.da.sys.service; import com.adc.da.base.page.BasePage; import com.adc.da.http.ResponseMessage; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserPhoneDTO; import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.vo.RoleUserVO; @@ -75,5 +76,8 @@ public interface IUserEOService extends IService { public UserEO getUserByLoginNameNotDeleted(String userName); + //手机端接口 只查人 + List getUserByName(String name); + } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java index b98902f4..2f8b0bec 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java @@ -8,10 +8,7 @@ import com.adc.da.sys.constant.ValidFlagEnum; import com.adc.da.sys.dao.OrgEODao; import com.adc.da.sys.dao.UserEODao; import com.adc.da.sys.dao.UserInfoEODao; -import com.adc.da.sys.entity.OrgEO; -import com.adc.da.sys.entity.UserEO; -import com.adc.da.sys.entity.UserInfoEO; -import com.adc.da.sys.entity.UserOrgEO; +import com.adc.da.sys.entity.*; import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.service.IOrgEOService; @@ -514,4 +511,9 @@ public class UserEOServiceImpl extends ServiceImpl implements return userEO; } + @Override + public List getUserByName(String name) { + return this.baseMapper.getUserByName(name); + } + } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index c0bb3b8a..d3ccac97 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -793,4 +793,14 @@ + + From 6db9220082dddc47df51e95c5c9b7522b5761306 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 13 Dec 2021 17:49:33 +0800 Subject: [PATCH 111/163] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BA=BA=E5=91=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/sys/controller/UserEOController.java | 4 ++-- adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java | 2 +- .../src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java | 2 ++ .../main/java/com/adc/da/sys/service/IUserEOService.java | 2 +- .../java/com/adc/da/sys/service/impl/UserEOServiceImpl.java | 4 ++-- .../src/main/resources/mybatis/mapper/sys/UserEOMapper.xml | 6 ++++-- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 909c6720..377c6226 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -72,8 +72,8 @@ public class UserEOController extends BaseController { @ApiOperation(value = "|UserEO|详情") @GetMapping("/getUserByPhone") // @RequiresPermissions("sys:user:get") - public ResponseMessage> getUserByName(@RequestParam(required = false,value = "name")String name){ - List userPhoneDTOS=userEOService.getUserByName(name); + public ResponseMessage> getUserByName(@RequestParam(required = false,value = "name")String name,@RequestParam("page")Integer page){ + List userPhoneDTOS=userEOService.getUserByName(name,page); return Result.success(userPhoneDTOS); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java index feb6b27f..8e80deae 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java @@ -173,6 +173,6 @@ public interface UserEODao extends BaseMapper { public UserEO getUserEOByAccountNotDeleted(String account); //手机端接口 只查人 - List getUserByName(@Param("name") String name); + List getUserByName(@Param("name") String name,@Param("page")Integer page); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java index b7e6e3b4..8c416903 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java @@ -9,5 +9,7 @@ public class UserPhoneDTO { private String userName; + private Integer total; + } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java index 2ac157e6..73a74e01 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java @@ -77,7 +77,7 @@ public interface IUserEOService extends IService { public UserEO getUserByLoginNameNotDeleted(String userName); //手机端接口 只查人 - List getUserByName(String name); + List getUserByName(String name,Integer page); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java index 2f8b0bec..d3265e76 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java @@ -512,8 +512,8 @@ public class UserEOServiceImpl extends ServiceImpl implements } @Override - public List getUserByName(String name) { - return this.baseMapper.getUserByName(name); + public List getUserByName(String name,Integer page) { + return this.baseMapper.getUserByName(name,page); } } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index d3ccac97..240dcca8 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -794,13 +794,15 @@ From 2412b50953074ba12072b3328c0e66131fd998da Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 14 Dec 2021 10:32:25 +0800 Subject: [PATCH 112/163] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=A0=87=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E5=92=8C=E5=88=97=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarStandWarning/entity/EarlyWarningEO.java | 11 ++++++++--- .../slrs/sarStandWarning/entity/WarningExportVO.java | 9 +++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 21172be4..fec3d95e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandWarning.entity; import com.adc.da.base.entity.BaseEntity; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -47,12 +48,14 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String standType; - @ExcelProperty(value = "标准号",index = 1) + @ExcelProperty(value = "标准编号",index = 1) + @ColumnWidth(20) @ApiModelProperty("标准号") @TableField(exist = false) private String standCode; @ExcelProperty(value = "标准名称",index = 2) + @ColumnWidth(40) @ApiModelProperty("标准名称") @TableField(exist = false) private String standName; @@ -82,12 +85,14 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String itemsId; - @ExcelProperty(value = "条款（分解单）编号",index = 3) + @ExcelProperty(value = "条款编号",index = 3) + @ColumnWidth(20) @ApiModelProperty("条款（分解单）编号") @TableField(exist = false) private String itemsNum; - @ExcelProperty(value = "条款（分解单）名称",index = 4) + @ExcelProperty(value = "条款名称",index = 4) + @ColumnWidth(40) @ApiModelProperty("条款（分解单）名称") @TableField(exist = false) private String itemsName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java index 74b67615..db2f7b95 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandWarning.entity; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,23 +12,27 @@ public class WarningExportVO extends EarlyWarningEO { @ExcelProperty(value = "实施日期",index = 6) - @ApiModelProperty("标准号") + @ColumnWidth(20) + @ApiModelProperty("实施日期") private String SSRQ; @ExcelProperty(value = "新车型实施日期",index = 7) + @ColumnWidth(20) @ApiModelProperty("新车型实施日期") private String XCXSSRQ; @ExcelProperty(value = "在产车实施日期",index = 8) + @ColumnWidth(20) @ApiModelProperty("在产车实施日期") private String ZCCSSRQ; - @ExcelProperty(value = "标准类别",index = 0) + @ExcelProperty(value = "类型",index = 0) @ApiModelProperty("标准类别显示") private String standTypeShow; @ExcelProperty(value = "适用车型",index = 9) + @ColumnWidth(20) @ApiModelProperty("适用车型展示") private String applyTypeShow; From 36568f8c19b3f39ada486691c07de5420bfc98c1 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 14 Dec 2021 13:55:31 +0800 Subject: [PATCH 113/163] =?UTF-8?q?=E9=87=8D=E7=82=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IssueTrackController.java | 10 +++++----- .../slrs/sarIssueTrack/entity/IssueTrack.java | 4 ++-- .../service/IIssueTrackService.java | 2 +- .../service/impl/IssueTrackServiceImpl.java | 19 ++++++++++++++----- 4 files changed, 22 insertions(+), 13 deletions(-) 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 51d19690..b8ce4322 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 @@ -28,12 +28,12 @@ public class IssueTrackController { @PutMapping() @ApiOperation("新增重点标准跟踪清单项目") public ResponseMessage addIssueTrack(@RequestBody IssueTrack issueTrack){ - boolean b = issueTrackService.addIssueTrack(issueTrack); + int b = issueTrackService.addIssueTrack(issueTrack); - if (b){ - return Result.success("200","成功", true); + if (b>0){ + return Result.success("200","信息已存在,更新!", true); }else{ - return Result.error("100","数据不能相同", false); + return Result.error("100","新增成功!", false); } } @@ -63,7 +63,7 @@ public class IssueTrackController { if (b){ return Result.success("200","成功", true); }else{ - return Result.error("100","数据不能相同", false); + return Result.error("100","标准或政策已存在", false); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java index 3e3a492b..12cc0873 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java @@ -37,9 +37,9 @@ public class IssueTrack { @TableField("product_type") private String productType; - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @TableField("impl_time") - private Date implTime; + private String implTime; @TableField("impl_require") private String implRequire; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java index 9324cbee..b51ad06b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java @@ -9,7 +9,7 @@ import java.util.Map; public interface IIssueTrackService { - public boolean addIssueTrack(IssueTrack obj); + public int addIssueTrack(IssueTrack obj); public boolean removeIssueTrack(List idList); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java index 1a3188f4..0563be7c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java @@ -25,14 +25,22 @@ public class IssueTrackServiceImpl extends ServiceImpl countWrapper = new QueryWrapper<>(); + countWrapper.eq("law_id",obj.getLawId()) + .eq("del_flag",0); + int count = this.count(countWrapper); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("law_id",obj.getLawId()); obj.setId(UUIDUtils.randomUUID20()); obj.setDelFlag("0"); + this.saveOrUpdate(obj,wrapper); - return this.saveOrUpdate(obj,wrapper); + + return count; } @@ -56,12 +64,13 @@ public class IssueTrackServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("law_id",obj.getLawId()); + wrapper.eq("law_id",obj.getLawId()) + .eq("del_flag","0") + .ne("id",obj.getId()); IssueTrack one = this.getOne(wrapper); - if (one==null){ + if (one!=null){ return false; }else { - obj.setId(UUIDUtils.randomUUID20()); obj.setDelFlag("0"); return this.updateById(obj); } From 0babd2b56f995b5a30efca06ad0b6f3d7a91c34e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 14 Dec 2021 16:07:51 +0800 Subject: [PATCH 114/163] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=B8=8B=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml | 2 +- .../sarStandProjectLibrary/SarStandProjectLibraryMapper.xml | 4 ++-- .../SarInterpretationNationalStandardMapper.xml | 2 +- .../SarStandardComplianceProductAssessMapper.xml | 2 +- .../src/main/resources/mybatis/mapper/sys/UserEOMapper.xml | 5 +++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 864e0387..c2488f4b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -16,7 +16,7 @@ left join ts_user on sar_public_idea_all.user_id=ts_user.USID WHERE sar_public_idea_all.idea_id = #{ideaId} - LIMIT ${(page-1)*size},${page*size} + LIMIT ${(page-1)*size},${size} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml index 69179058..2f9f57ad 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml @@ -59,7 +59,7 @@ AND specific_item like concat(concat('%',#{specificItem}),'%') ORDER BY STAND_ID, specific_item - LIMIT ${(current-1)*size},${current*size} + LIMIT ${(current-1)*size},${size} ) c ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows From a8fda1bb9436365d467b59f9497d8339ba6f2911 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 14 Dec 2021 16:33:07 +0800 Subject: [PATCH 115/163] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3!!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 59dcc305..6d089807 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 @@ -759,7 +759,7 @@ SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) - or (stand_name like concat(concat('%',#{page.standNumber}),'%')) + or (trim(replace(stand_name,' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) ) ) From 5eeb60b7f3effbb298333229f6e0c823b2426653 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 14 Dec 2021 17:09:05 +0800 Subject: [PATCH 116/163] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/main/generate/CodeGen.java | 6 +- .../controller/FileMaterialController.java | 92 ++++++++++++ .../dao/FileMaterialDao.java | 19 +++ .../entity/FileMaterial.java | 61 ++++++++ .../entity/FileMaterialPage.java | 23 +++ .../service/IFileMaterialService.java | 44 ++++++ .../service/impl/FileMaterialServiceImpl.java | 71 +++++++++ .../SarLawsStandInfoController.java | 4 +- .../fileMaterialCenter/FileMaterialMapper.xml | 19 +++ .../mapper/materialCerter/MaterialMapper.xml | 5 + .../SarLawsStandInfoMapper.xml | 137 +++++++++++++++++- 11 files changed, 473 insertions(+), 8 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/materialCerter/MaterialMapper.xml diff --git a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java index 8e9a93ae..6a4b9032 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java +++ b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java @@ -18,13 +18,13 @@ public class CodeGen { private static final String PACKAGE_PATH="/adc-da-slrs/src/main"; - private static final String AUTHOR="super_liu"; + private static final String AUTHOR="zhaokaiyao"; - private static final String DB_IP="127.0.0.1:3306/foton_slrs_test"; + private static final String DB_IP="123.56.177.15:3306/foton_slrs_test2"; private static final String DB_USER="root"; - private static final String DB_PWD="root"; + private static final String DB_PWD="RsLDRj3dXtSwYjBI"; /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java new file mode 100644 index 00000000..f1dc2bd1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -0,0 +1,92 @@ +package com.adc.da.slrs.fileMaterialCenter.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage; +import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.lang.reflect.Array; +import java.util.Arrays; +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author zhaokaiyao +* @since 2021-12-14 +*/ +@RestController +@Api(description = "资料中心") +@RequestMapping("/fileMaterialCenter/file-material") +public class FileMaterialController extends BaseController { + + @Autowired + IFileMaterialService iFileMaterialService; + + @PostMapping + @ApiOperation("新增文件资料组") + public ResponseMessage addFileMaterial(FileMaterial material){ + boolean save = iFileMaterialService.save(material); + + return Result.success(save); + } + + + @DeleteMapping + @ApiOperation("删除文件资料组") + public ResponseMessage deleteMaterial(String id){ + List idList = Arrays.asList(id.split(id)); + boolean b = iFileMaterialService.removeByIds(idList); + + return Result.success(b); + + } + + + @GetMapping + @ApiOperation("查询文件资料组") + public ResponseMessage> getFileMaterial(FileMaterialPage queryPage){ + IPage fileMaterial = iFileMaterialService.getFileMaterial(queryPage); + + return Result.success(fileMaterial); + } + + + @PutMapping + @ApiOperation("修改文件资料组") + public ResponseMessage updateFileMaterial(FileMaterial fileMaterial){ + boolean b = iFileMaterialService.updateById(fileMaterial); + + return Result.success(b); + } + + + @GetMapping("/type") + @ApiOperation("获取类型") + public ResponseMessage> getFileMaterialType(){ + List fileMaterialType = iFileMaterialService.getFileMaterialType(); + + return Result.success(fileMaterialType); + } + + @PutMapping("/topping") + @ApiModelProperty("置顶") + public ResponseMessage topping(String id){ + int topping = iFileMaterialService.topping(id); + + return Result.success(topping); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java new file mode 100644 index 00000000..7fb80943 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java @@ -0,0 +1,19 @@ +package com.adc.da.slrs.fileMaterialCenter.dao; + +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +public interface FileMaterialDao extends BaseMapper { + + + int topping(@Param("id") String id); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java new file mode 100644 index 00000000..ec068ebc --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java @@ -0,0 +1,61 @@ +package com.adc.da.slrs.fileMaterialCenter.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.time.LocalDateTime; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.Tag; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="FileMaterial对象", description="") +public class FileMaterial extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "类型") + @TableField("data_type") + private String dataType; + + @ApiModelProperty(value = "标题") + @TableField("data_title") + private String dataTitle; + + @ApiModelProperty(value = "上传时间") + @TableField("data_upload_time") + private Date dataUploadTime; + + @ApiModelProperty(value = "文件id") + @TableField("attach_file_id") + private String attachFileId; + + + @ApiModelProperty(value = "点击量") + @TableField("click_count") + private Integer clickCount; + + + @ApiModelProperty(value = "置顶") + @TableField("is_top") + private Integer isTop; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java new file mode 100644 index 00000000..f99ac329 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.fileMaterialCenter.entity; + +import lombok.Data; + +/** + * @author zhaokaiyao + */ +@Data +public class FileMaterialPage { + + private String dataTitle; + + private String dataType; + + private String startDataUploadTime; + + private String endDataUploadTime; + + + private Integer page; + + private Integer pageSize; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java new file mode 100644 index 00000000..2007711c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java @@ -0,0 +1,44 @@ +package com.adc.da.slrs.fileMaterialCenter.service; + +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial; +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import javafx.scene.paint.Material; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +public interface IFileMaterialService extends IService { + + + /** + * 查询文件资料组 + * @param queryPage + * @return + */ + IPage getFileMaterial(FileMaterialPage queryPage); + + + /** + * 获取类型 + * @return + */ + List getFileMaterialType(); + + /** + * 置顶 + * @param id + * @return + */ + int topping(String id); + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java new file mode 100644 index 00000000..f9b159c5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -0,0 +1,71 @@ +package com.adc.da.slrs.fileMaterialCenter.service.impl; + +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial; +import com.adc.da.slrs.fileMaterialCenter.dao.FileMaterialDao; +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage; +import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService; +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 javax.management.Query; +import java.text.SimpleDateFormat; +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +@Service +public class FileMaterialServiceImpl extends ServiceImpl implements IFileMaterialService { + + @Autowired + FileMaterialDao fileMaterialDao; + + + @Override + public IPage getFileMaterial(FileMaterialPage queryPage) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + + if (queryPage.getDataType()!=null){ + queryWrapper.eq("data_type",queryPage.getDataTitle()); + } + + if (queryPage.getDataTitle()!=null){ + queryWrapper.like("data_title",queryPage.getDataTitle()); + } + + if (queryPage.getStartDataUploadTime()!=null && queryPage.getEndDataUploadTime()!=null){ + + + String strDateFormat = "yyyy-MM-dd HH:mm:ss"; + SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat); + queryWrapper.between("data_upload_time", + sdf.format(queryPage.getStartDataUploadTime()), + sdf.format(queryPage.getEndDataUploadTime())); + } + + return this.page(new Page<>(queryPage.getPage(),queryPage.getPageSize()),queryWrapper); + } + + @Override + public List getFileMaterialType() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + queryWrapper.select("data_type"); + return this.listObjs(queryWrapper, item -> item.toString()); + } + + @Override + public int topping(String id) { + return fileMaterialDao.topping(id); + } +} 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 bdb440df..b57b589e 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 @@ -194,6 +194,8 @@ 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); + OutputStream os = null; Workbook workbook = null; try { @@ -204,7 +206,7 @@ public class SarLawsStandInfoController extends BaseController "attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx",request)); response.setContentType("application/force-download"); // 导出所有数据 - List data = sarLawsInfoEOService.getExportData(exportType,exportContent,userId); +// List data = sarLawsInfoEOService.getExportData(exportType,exportContent,userId); workbook = LawsStandExportUtil.exportDatas(data); os = response.getOutputStream(); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml new file mode 100644 index 00000000..883a0e98 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml @@ -0,0 +1,19 @@ + + + + + + UPDATE file_material + SET is_top = ( + ( + SELECT + Max(is_top) + FROM + (SELECT * FROM file_material) AS x + ) + 1 + ) + WHERE + id = #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/materialCerter/MaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/materialCerter/MaterialMapper.xml new file mode 100644 index 00000000..523a9b7f --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/materialCerter/MaterialMapper.xml @@ -0,0 +1,5 @@ + + + + + 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 bb2d5470..6c9f406d 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 @@ -283,7 +283,7 @@ parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage"> select DISTINCT SAR_LAWS_STAND_INFO.ID, - SAR_LAWS_STAND_INFO.LAWS_TYPE, + 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, @@ -293,8 +293,8 @@ SAR_LAWS_STAND_INFO.COMMENT_CYCLE_START, SAR_LAWS_STAND_INFO.COMMENT_CYCLE_END, SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE, - SAR_LAWS_STAND_INFO.LAWS_SYQY, - SAR_LAWS_STAND_INFO.LAWS_SYCX, + 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, @@ -305,7 +305,7 @@ SAR_LAWS_STAND_INFO.MODIFY_TIME, dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow from SAR_LAWS_STAND_INFO - + order by ${orderByA} ${order1}, @@ -313,4 +313,133 @@ SAR_LAWS_STAND_INFO.id + + + left join SAR_LAWS_MENU ON SAR_LAWS_STAND_INFO.id = SAR_LAWS_MENU.laws_id + LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( + dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE + AND dicstandTextStatus.dic_id IS NOT NULL + AND dicstandTextStatus.valid_flag = 0 + ) + + LEFT JOIN TS_DICTYPE laws_sycx_show ON ( + dicstandTextStatus.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 ( + dicstandTextStatus.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 ( + dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_TYPE + AND dicstandTextStatus.dic_id IS NOT NULL + AND dicstandTextStatus.valid_flag = 0 + ) + left join SAR_LAWS_ATTR_INFO on (SAR_LAWS_ATTR_INFO.LAWS_ID = SAR_LAWS_STAND_INFO.id and SAR_LAWS_ATTR_INFO.valid_flag=0) + where 1=1 and SAR_LAWS_STAND_INFO.valid_flag=0 + + + + and SAR_LAWS_STAND_INFO.LAWS_TYPE like concat(concat('%',#{lawsType}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{lawsNumber}),'%') + + + and (LAWS_NAME like concat(concat('%',#{numberName}),'%') + or SAR_LAWS_STAND_INFO.LAWS_EN_NAME like concat(concat('%',#{numberName}),'%')) + + + and LAWS_NAME like concat(concat('%',#{lawsName}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_EN_NAME like concat(concat('%',#{lawsEnName}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_NO like concat(concat('%',#{lawsNo}),'%') + + + and DATE_FORMAT(SAR_LAWS_STAND_INFO.ISSUE_TIME,'%Y-%m-%d') = #{issueTime} + + + and SAR_LAWS_STAND_INFO.ISSUE_COMPANY like concat(concat('%',#{issueCompany}),'%') + + + and DATE_FORMAT(SAR_LAWS_STAND_INFO.COMMENT_CYCLE_START ,'%Y-%m-%d') = DATE_FORMAT(#{commentCycleStart},'%Y-%m-%d') + + + and DATE_FORMAT(SAR_LAWS_STAND_INFO.COMMENT_CYCLE_END ,'%Y-%m-%d') = DATE_FORMAT(#{commentCycleEnd},'%Y-%m-%d') + + + and SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE = #{lawsTextState} + + + and FIND_IN_SET(#{lawsSyqy},SAR_LAWS_STAND_INFO.LAWS_SYQY) + + + and FIND_IN_SET(#{lawsSycx},SAR_LAWS_STAND_INFO.LAWS_SYCX) + + + and SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS = #{isRelateAccess} + + + and SAR_LAWS_STAND_INFO.LAWS_YEAR like concat(concat('%',#{lawsYear}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM like concat(concat('%',#{lawsNotisyncNum}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_BULLETIN like concat(concat('%',#{lawsBulletin}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_LABEL like concat(concat('%',#{lawsLabel}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_REMARK like concat(concat('%',#{lawsRemark}),'%') + + + + and SAR_LAWS_STAND_INFO.country = #{country} + + + + and SAR_LAWS_MENU.MENU_ID in + + #{item} + + + + + + and SAR_LAWS_MENU.MENU_ID in + + #{item} + + + + + and SAR_LAWS_STAND_INFO.id in + + #{item} + + + + + + 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 TS_PERSON_COLLECT.user_id=#{userId} + ) + + + + and (${advanceSearchStr}) + + + From cae1605ab156c94b34ccbe2c388c8d72ddd8f6bd Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 14 Dec 2021 17:45:23 +0800 Subject: [PATCH 117/163] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=8C=E5=B7=B2=E7=BB=8F=E5=8F=AF=E4=BB=A5=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WgWorkGroupServiceImpl.java | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index 04e3946f..0c88d87d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -23,6 +23,7 @@ import com.adc.da.slrs.wgWorkGroup.dao.WgWorkGroupDao; import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO; import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -333,15 +334,21 @@ public class WgWorkGroupServiceImpl extends ServiceImpl { WgDept wgDept=new WgDept(); BeanUtils.copyProperties(wgDeptShow,wgDept); + if (null==wgDept.getWgId()){ + wgDept.setWgId(wgWorkGroupShowDTO.getId()); + } wgDepts.add(wgDept); }); - flag = wgDeptService.saveOrUpdateBatch(wgDepts); } if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { List removeMeet = new ArrayList<>(); List wgMeetingUserRelations = new ArrayList<>(); wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { + if (null==wgMeetingInfo.getId()){ + wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); + wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); + } wgMeetingInfo.getMeetingPeople().forEach(s -> { WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); wgMeetingUserRelation.setUserId(s); @@ -350,27 +357,42 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { List wgNetInfos = new ArrayList<>(); wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { WgNetInfo wgNetInfo = new WgNetInfo(); BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); + if (null==wgNetInfo.getWgId()){ + wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); + } wgNetInfos.add(wgNetInfo); }); flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); } if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){ + wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { + if (null==wgPayInfo.getWgId()){ + wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); } if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()){ + wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { + if (null==wgStandorpolicyInfo.getWgId()){ + wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); } From 02f0fb0cd772b90103fd1b894316083e84aaa25e Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 14 Dec 2021 20:27:49 +0800 Subject: [PATCH 118/163] =?UTF-8?q?=E4=BD=93=E7=B3=BB=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E7=BC=BA=E5=B0=91-=E5=86=85=E5=AD=98=E4=B8=AD=E6=9E=84?= =?UTF-8?q?=E9=80=A0=E6=A0=91=E7=BB=93=E6=9E=84=E6=97=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=8A=8A=E6=94=B9=E8=8A=82=E7=82=B9=E6=9F=A5=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TsResourceServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index b39f1f1f..cf74720e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -184,7 +184,12 @@ public class TsResourceServiceImpl extends ServiceImpl TsResourceQueryWrapper=new QueryWrapper<>(); - TsResourceQueryWrapper.like("PARENT_IDS",resource.getId()); +// TsResourceQueryWrapper.like("PARENT_IDS",resource.getId()); + /** + * 没有把改节点查出 + */ + TsResourceQueryWrapper.isNotNull("PARENT_ID"); + if(StringUtils.isNotBlank(tsResource.getSorDivide())){ TsResourceQueryWrapper.in("ID",getMenuIdList); } @@ -323,7 +328,9 @@ public class TsResourceServiceImpl extends ServiceImpl */ private List recursionGetListChildrenStand(TsResource resource,List children){ - List tsResources = children.stream().filter(resource1 -> resource1.getParentId().equals(resource.getId())).collect(Collectors.toList()); + List tsResources = children.stream() + .filter(resource1 -> resource1.getParentId().equals(resource.getId())) + .collect(Collectors.toList()); if(!tsResources.isEmpty()){ tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList()); tsResources.forEach(resource1 -> { From 246a9c01c96242d745f694b5c48ddab74ce28675 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 14 Dec 2021 20:28:03 +0800 Subject: [PATCH 119/163] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=B8=A6=E6=B0=B4?= =?UTF-8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/util/WaterMarkUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java index 34575906..e28415b7 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java +++ b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java @@ -53,14 +53,14 @@ public class WaterMarkUtil { under.setGState(gs); under.restoreState(); under.beginText(); - under.setFontAndSize(base, 50); + under.setFontAndSize(base, 30); under.setTextMatrix(30, 30); under.setColorFill(BaseColor.LIGHT_GRAY); - for (int y = 0; y < 5; y++) { - for (int x = 0; x < 10; x++) { - // 水印文字成45度角倾斜 + for (int y = 0; y < 50; y++) { + for (int x = 0; x < 50; x++) { + // 水印文字成45度角倾斜 x位置 y位置 角度 under.showTextAligned(Element.ALIGN_LEFT - , waterMarkName, 100 + 300 * x, 300 * y, 40); + , waterMarkName, 40 + 120 * x, 100 * y, 40); } } From 7521af3dd0ef05e213489cb6e1f244153b4f4120 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 14 Dec 2021 21:18:43 +0800 Subject: [PATCH 120/163] feat: There is no way the, buss process --- .../da/FeignClient/workFlowFeignClient.java | 4 + .../workFlowFeignClientImpl.java | 6 ++ .../controller/WorkFlowController.java | 11 ++- .../workFlow/entity/BusProcessModelHis.java | 88 +++++++++++++++++++ 4 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 5a1572d4..ff0bb4f8 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -4,6 +4,7 @@ import com.adc.da.common.*; import com.adc.da.common.Category; import com.adc.da.common.Page; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; +import com.adc.da.workFlow.entity.BusProcessModelHis; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -18,6 +19,9 @@ import java.util.Set; //@FeignClient(value = "shan6") public interface workFlowFeignClient { + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOne",method = RequestMethod.GET) + BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId); + @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisList",method = RequestMethod.GET) List evaluationHisList(@RequestParam("pid") String pid); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index da6071a8..d158c2f0 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -9,6 +9,7 @@ import com.adc.da.common.Page; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; +import com.adc.da.workFlow.entity.BusProcessModelHis; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; @@ -26,6 +27,11 @@ public class workFlowFeignClientImpl { @Autowired private IUserEOService userEOService; + public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOne(pid,taskId); + return stringWrapper; + } + public List evaluationHisList(@RequestParam("pid") String pid){ List stringWrapper = workFlowFeignClient.evaluationHisList(pid); return stringWrapper; diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 1865962f..1e3215d2 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -17,10 +17,7 @@ import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.util.LoginUserUtil; import com.adc.da.workFlow.dao.ExportExcelMapper; -import com.adc.da.workFlow.entity.BusProcessEvaluationHis; -import com.adc.da.workFlow.entity.ExportExcel; -import com.adc.da.workFlow.entity.ExportExcelEO; -import com.adc.da.workFlow.entity.ProcessDetailExport; +import com.adc.da.workFlow.entity.*; import com.adc.da.workFlow.service.WorkFlowService; import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; @@ -50,6 +47,12 @@ public class WorkFlowController { // @Autowired // private ExportExcelMapper exportExcelMapper; + @ApiOperation(value = "查询在线编辑流程当前节点编辑对象") + @GetMapping("/processModelHisOne") + public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + return workFlowFeignClient.processModelHisOne(pid); + } + @ApiOperation(value = "查询流程父节点所有评分") @GetMapping("/evaluationHisList") public List evaluationHisList(@RequestParam("pid") String pid){ diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java new file mode 100644 index 00000000..82b0692a --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java @@ -0,0 +1,88 @@ +package com.adc.da.workFlow.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +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.io.Serializable; + +/** + *

+ * 流程模块历史表 + *

+ * + * @author super_liu + * @since 2021-09-17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BusProcessModelHis对象", description="流程模块历史表") +public class BusProcessModelHis implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "ID", type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "标准id") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "处理人") + @TableField("USER_ID") + private String userId; + + @ApiModelProperty(value = "信息") + @TableField("MESG") + private String mesg; + + @ApiModelProperty(value = "节点信息") + @TableField("TASK_INFO") + private String taskInfo; + + @ApiModelProperty(value = "任务id") + @TableField("TASK_ID") + private String taskId; + + @ApiModelProperty(value = "流程实例id") + @TableField("P_ID") + private String pId; + + @ApiModelProperty(value = "流程名称") + @TableField("PRC_NAME") + private String prcName; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("UPDATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String updateTime; + + @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑") + @TableField("EDIT_STATUS") + private String editStatus; + + @ApiModelProperty(value = "onlyOffice 编辑文件存储路径") + @TableField("EDIT_FILE_PATH") + private String editFilePath; + + @ApiModelProperty(value = "逻辑状态") + @TableField("FLAG") + private String flag; + + @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径") + @TableField(exist = false) + private String downLoadUrl; +} From 1e83fad8bd177d68899c092157c6333e437bec86 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 14 Dec 2021 21:56:42 +0800 Subject: [PATCH 121/163] feat: There is no way the --- .../java/com/adc/da/workFlow/controller/WorkFlowController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 1e3215d2..5949b1ce 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -50,7 +50,7 @@ public class WorkFlowController { @ApiOperation(value = "查询在线编辑流程当前节点编辑对象") @GetMapping("/processModelHisOne") public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ - return workFlowFeignClient.processModelHisOne(pid); + return workFlowFeignClient.processModelHisOne(pid,taskId); } @ApiOperation(value = "查询流程父节点所有评分") From 121dc4b9657c3c59fb3e132c1acbe6b53de9bb27 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 15 Dec 2021 09:08:41 +0800 Subject: [PATCH 122/163] feat: There is no way the, --- .../da/workFlow/entity/BusProcessEvaluationHis.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java index e70c9bb3..e8597c46 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java @@ -70,9 +70,21 @@ public class BusProcessEvaluationHis implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private String updateTime; + @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑") + @TableField("EDIT_STATUS") + private String editStatus; + + @ApiModelProperty(value = "onlyOffice 编辑文件存储路径") + @TableField("EDIT_FILE_PATH") + private String editFilePath; + @ApiModelProperty(value = "逻辑状态") @TableField("FLAG") private String flag; + @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径") + @TableField(exist = false) + private String downLoadUrl; + } From e814c496d58825f6135ecfca1f19e501c7ddab37 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 15 Dec 2021 09:09:22 +0800 Subject: [PATCH 123/163] feat: There is no way the, --- .../src/main/java/com/adc/da/login/security/WebMvcConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 058ac857..492c5ea8 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 @@ -99,6 +99,6 @@ public class WebMvcConfig implements WebMvcConfigurer { // // 添加自定义拦截器，并拦截对应 url -// addInterceptor.addPathPatterns("/**"); + addInterceptor.addPathPatterns("/**"); } } From 99f33ac21839115141116ee45c6bf2a72084bd01 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Dec 2021 10:14:45 +0800 Subject: [PATCH 124/163] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=20=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=B8=8D=E5=9B=9E=E6=98=BEbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java | 6 +++--- .../java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java | 6 +++--- .../main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml | 4 ++-- .../wgMeetingUserRelation/WgMeetingUserRelationMapper.xml | 2 +- .../resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml | 5 +++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java index db6423e3..5711d5a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java @@ -54,11 +54,11 @@ public class WgDeptShow extends BaseEntity { @ApiModelProperty(value = "中文名") private String name; - @ApiModelProperty(value = "单位") + @ApiModelProperty(value = "单位名称") private String unit; - @ApiModelProperty(value = "单位名称") - private String unitName; + @ApiModelProperty(value = "单位") + private String unitId; @ApiModelProperty(value = "电话") private String phone; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java index cdf47254..2b2e48a8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java @@ -48,11 +48,11 @@ public class WgNetInfoDTO extends BaseEntity { @ApiModelProperty(value = "中文名") private String name; - @ApiModelProperty(value = "单位") + @ApiModelProperty(value = "单位名称") private String unit; - @ApiModelProperty(value = "单位名称") - private String unitName; + @ApiModelProperty(value = "单位") + private String unitId; @ApiModelProperty(value = "电话") private String phone; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml index 6a3e67df..2cc02e2e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml @@ -12,8 +12,8 @@ - select wg_meeting_user_relation.*,ts_user.UNAME as name from wg_meeting_user_relation + select wg_meeting_user_relation.*,concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as name from wg_meeting_user_relation left join ts_user on ts_user.ACCOUNT = wg_meeting_user_relation.user_id left join wg_meeting_info on wg_meeting_info.id = wg_meeting_user_relation.meeting_id left join wg_work_group on wg_work_group.id = wg_meeting_info.wg_id diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml index 0d2d005c..97768a6b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml @@ -11,11 +11,12 @@ From bb5cd0a360b57503b803d1dccb7364ac5fa25eef Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 15 Dec 2021 10:41:31 +0800 Subject: [PATCH 125/163] =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/StandRegionalTimeDto.java | 6 +++--- .../impl/SarLawsAttrDetailedListServiceImpl.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java index 7b50a568..26a498c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java @@ -21,15 +21,15 @@ public class StandRegionalTimeDto { @ApiModelProperty(value = "实施日期") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date putTime; + private String putTime; @ApiModelProperty(value = "在产车实施日期") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date zccssrq; + private String zccssrq; @ApiModelProperty(value = "新车型实施日期") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date xcxssrq; + private String xcxssrq; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 037c2f22..6394e360 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -301,14 +301,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> mapList, StandRegionalTimeDto s) { - String putTime = new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); - String xcx = new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq()); - String zcc = new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq()); +// String putTime = new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); +// String xcx = new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq()); +// String zcc = new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq()); // putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); // xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq())); // zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq())); - mapList.put("实施日期("+s.getCountry()+")", Collections.singletonList(putTime)); - mapList.put("新车型实施日期("+s.getCountry()+")", Collections.singletonList(xcx)); - mapList.put("在产车实施日期("+s.getCountry()+")", Collections.singletonList(zcc)); + mapList.put("实施日期("+s.getCountry()+")",Arrays.asList(s.getPutTime().split(","))); + mapList.put("新车型实施日期("+s.getCountry()+")", Arrays.asList(s.getXcxssrq().split(","))); + mapList.put("在产车实施日期("+s.getCountry()+")", Arrays.asList(s.getZccssrq().split(","))); } } From 67deb52111f73065c112ff799de9dd1be0218b7e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Dec 2021 11:05:00 +0800 Subject: [PATCH 126/163] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=B8=8B=20?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B1=9E=E6=80=A7=E5=88=A0=E9=99=A41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wgWorkGroup/entity/WgWorkGroupShowDTO.java | 8 ++++++++ .../service/impl/WgWorkGroupServiceImpl.java | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java index 5e736116..7dd662bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java @@ -74,18 +74,26 @@ public class WgWorkGroupShowDTO extends BaseEntity { //支付信息 List wgPayInfos; + private String wgPayInfosDel; + //标准政策 List wgStandorpolicyInfos; //集团参与情况 List wgDepts; + private String wgDeptsDel; + //秘书联系方式 List wgNetInfos; + private String wgNetInfosDel; + //参会记录及资料 List wgMeetingInfos; + private String wgMeetingInfosDel; + List children; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index 0c88d87d..2525d233 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -25,6 +25,7 @@ import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -330,6 +331,10 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())){ + List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); + wgDeptService.removeByIds(strings); + } List wgDepts=new ArrayList<>(); wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> { WgDept wgDept=new WgDept(); @@ -342,6 +347,11 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())){ + List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); + wgDeptService.removeByIds(strings); + wgMeetingUserRelationService.removeByIds(strings); + } List removeMeet = new ArrayList<>(); List wgMeetingUserRelations = new ArrayList<>(); wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { @@ -364,6 +374,10 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())){ + List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); + wgNetInfoService.removeByIds(strings); + } List wgNetInfos = new ArrayList<>(); wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { WgNetInfo wgNetInfo = new WgNetInfo(); @@ -376,6 +390,10 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())){ + List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); + wgPayInfoService.removeByIds(strings); + } if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){ wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { if (null==wgPayInfo.getWgId()){ From 0a26dbfda96e7a764831d79dc6358cd0c5db11de Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Dec 2021 11:22:19 +0800 Subject: [PATCH 127/163] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java index 01a25d53..4deca5fe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java @@ -40,7 +40,7 @@ public class WgPayInfo extends BaseEntity { @ApiModelProperty(value = "价格") @TableField("price") - private BigDecimal price; + private String price; @ApiModelProperty(value = "年份") @TableField("year") From 27625262600681ab2685536e675d769b75516a3f Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 15 Dec 2021 15:16:55 +0800 Subject: [PATCH 128/163] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E9=80=8F=E6=98=8E?= =?UTF-8?q?=E5=BA=A6=20=E5=9C=A8beginText=E6=96=B9=E6=B3=95=E5=90=8E?= =?UTF-8?q?=E6=89=8D=E8=83=BD=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/util/WaterMarkUtil.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java index e28415b7..cb03edc7 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java +++ b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java @@ -46,16 +46,17 @@ public class WaterMarkUtil { // 获得PDF最顶层 under = stamper.getOverContent(i); under.saveState(); - // set Transparency - PdfGState gs = new PdfGState(); - // 设置透明度为0.2 - gs.setFillOpacity(0.25f); - under.setGState(gs); + under.restoreState(); under.beginText(); under.setFontAndSize(base, 30); under.setTextMatrix(30, 30); under.setColorFill(BaseColor.LIGHT_GRAY); + // 设置透明度为0.2 + // set Transparency + PdfGState gs = new PdfGState(); + gs.setFillOpacity(0.2f); + under.setGState(gs); for (int y = 0; y < 50; y++) { for (int x = 0; x < 50; x++) { // 水印文字成45度角倾斜 x位置 y位置 角度 From 5b64f6998976e6453c377edaad17a6b82d337c00 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 15 Dec 2021 15:17:18 +0800 Subject: [PATCH 129/163] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FileMaterialController.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java index f1dc2bd1..9f285c75 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage; import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService; +import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiModelProperty; @@ -15,8 +16,11 @@ import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import javax.xml.crypto.Data; import java.lang.reflect.Array; +import java.text.SimpleDateFormat; import java.util.Arrays; +import java.util.Date; import java.util.List; /** @@ -29,7 +33,7 @@ import java.util.List; */ @RestController @Api(description = "资料中心") -@RequestMapping("/fileMaterialCenter/file-material") +@RequestMapping("/${restPath}/fileMaterialCenter/file-material") public class FileMaterialController extends BaseController { @Autowired @@ -37,7 +41,14 @@ public class FileMaterialController extends BaseController { @PostMapping @ApiOperation("新增文件资料组") - public ResponseMessage addFileMaterial(FileMaterial material){ + public ResponseMessage addFileMaterial(@RequestBody FileMaterial material){ + + +// Date date = new Date(); +// String strDateFormat = "yyyy-MM-dd HH:mm:ss"; +// SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat); + material.setId(UUIDUtils.randomUUID20()); + material.setDataUploadTime(new Date()); boolean save = iFileMaterialService.save(material); return Result.success(save); From 14e2b3368ca03592e5b1263661ed9a382c71275c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Dec 2021 16:15:29 +0800 Subject: [PATCH 130/163] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=92=8Cocr=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=87=E4=BB=B6=E5=87=BA=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandFileEOServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 848d2eed..9bfa3851 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -100,7 +101,7 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { for (String key:result.getAttrInfoCaseMap().keySet()) { if (null!=result.getAttrInfoCaseMap().get(key) && !"".equals(result.getAttrInfoCaseMap().get(key))){ if (result.getAttrInfoCaseMap().get(key).toString().contains(",")){ - choose.add(result.getAttrInfoCaseMap().get(key).toString().replace(",","")); + choose.addAll(new ArrayList<>(Arrays.asList(result.getAttrInfoCaseMap().get(key).toString().split(",")))); }else { choose.add(result.getAttrInfoCaseMap().get(key).toString()); } @@ -112,7 +113,11 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { } queryWrapper.eq("STAND_ID",standId); - queryWrapper.eq("USE_MODEL","SOURCE_FILE"); + if ("0".equals(type)){ + queryWrapper.eq("USE_MODEL", "WEB_FILE"); + }else { + queryWrapper.eq("USE_MODEL", "SOURCE_FILE"); + } queryWrapper.in("ATT_ID",choose); List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); From f00f5b90212c4b04b540e0f87740d00be285d7ce Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 15 Dec 2021 17:50:25 +0800 Subject: [PATCH 131/163] commit --- .../controller/FileMaterialController.java | 2 +- .../da/slrs/fileMaterialCenter/entity/FileMaterial.java | 5 +++++ .../service/impl/FileMaterialServiceImpl.java | 9 ++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java index 9f285c75..646b7fc1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -58,7 +58,7 @@ public class FileMaterialController extends BaseController { @DeleteMapping @ApiOperation("删除文件资料组") public ResponseMessage deleteMaterial(String id){ - List idList = Arrays.asList(id.split(id)); + List idList = Arrays.asList(id.split(",")); boolean b = iFileMaterialService.removeByIds(idList); return Result.success(b); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java index ec068ebc..6533651e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java @@ -6,6 +6,7 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.Tag; @@ -58,4 +59,8 @@ public class FileMaterial extends BaseEntity { @ApiModelProperty(value = "置顶") @TableField("is_top") private Integer isTop; + + @ApiModelProperty(value = "删除标志") + @TableLogic(value = "0",delval = "1") + private String delFlag; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java index f9b159c5..5692f135 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -36,7 +36,7 @@ public class FileMaterialServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); if (queryPage.getDataType()!=null){ - queryWrapper.eq("data_type",queryPage.getDataTitle()); + queryWrapper.eq("data_type",queryPage.getDataType()); } if (queryPage.getDataTitle()!=null){ @@ -48,9 +48,8 @@ public class FileMaterialServiceImpl extends ServiceImpl(queryPage.getPage(),queryPage.getPageSize()),queryWrapper); @@ -60,7 +59,7 @@ public class FileMaterialServiceImpl extends ServiceImpl getFileMaterialType() { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("data_type"); + queryWrapper.select("DISTINCT data_type"); return this.listObjs(queryWrapper, item -> item.toString()); } From c73f9b50d47fc20d961e546eac78c265c0532cdc Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Wed, 15 Dec 2021 19:54:18 +0800 Subject: [PATCH 132/163] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=BB=98=E8=AE=A4=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarFileSplitItemsEOServiceImpl.java | 8 ++++---- .../com/adc/da/att/controller/AttFileEOController.java | 2 +- .../java/com/adc/da/att/controller/UeditorController.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index 5ec05134..19cf6cf5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -399,7 +399,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic String imgContent = itemsValEO.getItemContent(); String imgUUIndex = "img" + String.valueOf(imgIndex); if (StringUtils.isNotEmpty(imgContent)){ - int pathIndex = imgContent.indexOf("src='uploadPath"); + int pathIndex = imgContent.indexOf("src='file"); if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) { String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2); String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length()); @@ -525,7 +525,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); if(attFileVo!=null){ isText = false; - String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); + String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName(); String imgCon = ""; valEO.setType("IMG"); valEO.setItemContent(imgCon); @@ -559,7 +559,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); if(attFileVo!=null){ isText = false; - String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); + String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName(); String imgCon = ""; valEO.setType("IMG"); valEO.setItemContent(imgCon); @@ -595,7 +595,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); if(attFileVo!=null){ isText = false; - String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); + String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName(); String imgCon = ""; valEO.setType("IMG"); valEO.setItemContent(imgCon); diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index 475d5f7d..ce965718 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -293,7 +293,7 @@ public class AttFileEOController { if (!newFile.exists()) { Files.copy(oldFile.toPath(), newFile.toPath()); } - filePathResult = "uploadPath/phoneLoadFiles/" + timeStr + "/" + fileOldName; + filePathResult = "file/phoneLoadFiles/" + timeStr + "/" + fileOldName; return Result.success(filePathResult); } else { return Result.error("获取文件信息失败"); diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java index f566df77..888609b8 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java @@ -69,9 +69,9 @@ public class UeditorController { AttFileVo attFileVo= attFileEOService.saveFileInfo(uploadFile); String picUrlPath =""; if(StringUtils.isNotEmpty(referer)){ - picUrlPath=referer+"uploadPath"+ attFileVo.getFilePath()+attFileVo.getFileName(); + picUrlPath=referer+"file"+ attFileVo.getFilePath()+attFileVo.getFileName(); }else{ - picUrlPath="uploadPath"+attFileVo.getFilePath()+attFileVo.getFileName(); + picUrlPath="file"+attFileVo.getFilePath()+attFileVo.getFileName(); } log.info("Ueditor 上传图片返回路径："+picUrlPath); image.setState("SUCCESS"); From fef874c5cec1936bd57086832eb9d423fb06c9c4 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Thu, 16 Dec 2021 09:48:16 +0800 Subject: [PATCH 133/163] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/login/security/WebMvcConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 492c5ea8..88eba4da 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 @@ -91,6 +91,8 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/activiti/exportProcessDetailInfo"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/getImg"); + // //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); From a642c5eaa53c18bdb60f2b5bce1ef8d814aa6b0a Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 16 Dec 2021 10:40:25 +0800 Subject: [PATCH 134/163] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8E=9F=E5=A7=8B?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FileMaterialController.java | 1 + .../controller/SarStandFileEOController.java | 11 ++++++++++- .../service/SarStandFileEOService.java | 13 +++++++++++++ .../service/impl/SarStandFileEOServiceImpl.java | 14 ++++++++++++++ 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java index 646b7fc1..555d4d4d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -49,6 +49,7 @@ public class FileMaterialController extends BaseController { // SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat); material.setId(UUIDUtils.randomUUID20()); material.setDataUploadTime(new Date()); + material.setDelFlag("0"); boolean save = iFileMaterialService.save(material); return Result.success(save); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java index b1027836..cceb64d5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java @@ -140,7 +140,7 @@ public class SarStandFileEOController extends BaseController { } - @ApiOperation(value = "查询文本信息") + @ApiOperation(value = "查询转换后文本信息") @GetMapping("/queryFileInfo") public ResponseMessage> queryFileInfo(String standId){ @@ -156,4 +156,13 @@ public class SarStandFileEOController extends BaseController { return Result.success(sarStandFileEOS); } + + + @ApiOperation(value = "查询转原始文件信息") + @GetMapping("/querySourceFileInfo") + public ResponseMessage> querySourceFileInfo(String standId){ + + List sarStandFileEOS = sarStandFileEOService.selectFileByStandId(standId); + return Result.success(sarStandFileEOS); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java index acd0004b..78c760dc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java @@ -23,8 +23,21 @@ public interface SarStandFileEOService { List selectFileByAttId(String attId) throws Exception; + /** + * 查询转换后文件的文本信息 + * @param standId + * @return + */ List selectFileByStandId(String standId); List selectFileByStandIdOCR(String standId,String type) throws Exception; + /** + * 查询转原始文件的信息 + * @param standId + * @return + */ + List querySourceFileInfo(String standId); + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 9bfa3851..4214ede6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -78,6 +78,9 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE"); List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); + /** + * 询转换后文件信息 因为文件转换成pdf后会出现文件名位路径的情况,遍历查询文件的原始文件信息从中取出正确的文件名 + */ //开耀这地方我把selectOne改成了批量因为 查单个数据里面出了问题你看看给改一下 sarStandFileEOS.forEach(item->{ QueryWrapper wrapper = new QueryWrapper<>(); @@ -142,4 +145,15 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { return sarStandFileEOS; } + + @Override + public List querySourceFileInfo(String standId){ + QueryWrapper queryWrapper= new QueryWrapper<>(); + + queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","SOURCE_FILE"); + return sarStandFileEODao.selectList(queryWrapper); + + } + + } From 13e373f14870051cecf1183388f15b88d173b706 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 16 Dec 2021 11:03:07 +0800 Subject: [PATCH 135/163] =?UTF-8?q?=E6=96=B0=E6=B5=81=E7=A8=8B=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/FeignClient/workFlowFeignClient.java | 4 ++++ .../workFlowFeignClientImpl.java | 11 +++++++++++ .../workFlow/controller/WorkFlowController.java | 17 +++++++++++++++++ .../da/workFlow/entity/ProcessRollBackEO.java | 17 +++++++++++++++++ 4 files changed, 49 insertions(+) create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessRollBackEO.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ff0bb4f8..f0eab88e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -5,6 +5,7 @@ import com.adc.da.common.Category; import com.adc.da.common.Page; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; import com.adc.da.workFlow.entity.BusProcessModelHis; +import com.adc.da.workFlow.entity.ProcessRollBackEO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -34,6 +35,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET) Wrapper activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId); + @RequestMapping(value = "/bat-wkflow/activiti_define_start_user_rollBack",method = RequestMethod.POST) + Wrapper activiti_define_start_rollBack(@RequestBody ProcessRollBackEO processRollBackEO); + /** * 企标复审流程专用 * @param id diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index d158c2f0..b5679f79 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -10,6 +10,7 @@ import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; import com.adc.da.workFlow.entity.BusProcessModelHis; +import com.adc.da.workFlow.entity.ProcessRollBackEO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; @@ -51,6 +52,16 @@ public class workFlowFeignClientImpl { Wrapper stringWrapper = workFlowFeignClient.activiti_define_start(Id,userId,bpnId); return Result.success(stringWrapper.getResult()); } + + public ResponseMessage activiti_define_start_rollBack(@RequestParam("Id") String Id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId,@RequestParam("json")String json){ + ProcessRollBackEO rollBackEO=new ProcessRollBackEO(); + rollBackEO.setId(Id); + rollBackEO.setBpnId(bpnId); + rollBackEO.setJson(json); + rollBackEO.setUserId(userId); + Wrapper stringWrapper = workFlowFeignClient.activiti_define_start_rollBack(rollBackEO); + return Result.success(stringWrapper.getResult()); + } public Map activiti_define_start1(@RequestParam("Id") String Id, @RequestParam("userId") String userId, @RequestParam("standName") String standName){ Map map = workFlowFeignClient.activiti_define_start1(Id,userId,standName); return map; diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 5949b1ce..97357255 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -116,6 +116,13 @@ public class WorkFlowController { public ResponseMessage activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam(value = "bpnId",required = false) String bpnId){ return workFlowFeignClient.activiti_define_start(id,userId,bpnId); } + + @ApiOperation(value = "启动流程-以流程定义id") + @GetMapping("/activiti_define_start_rollBack") + public ResponseMessage activiti_define_start_rollBack(@RequestParam("id") String id, @RequestParam("userId") String userId, + @RequestParam(value = "bpnId",required = false) String bpnId,@RequestParam(value = "json",required = false)String json){ + return workFlowFeignClient.activiti_define_start_rollBack(id,userId,bpnId,json); + } @ApiOperation(value = "启动流程-以流程定义id") @GetMapping("/activiti_define_start1") public Map activiti_define_start1(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("standName") String standName){ @@ -132,6 +139,16 @@ public class WorkFlowController { } } + @ApiOperation(value = "启动流程-以流程定义id-加上草稿内容（为了实现撤回）") + @PostMapping("/startProcessRollBack") + public ResponseMessage startProcessRollBack(ProcessRollBackEO processRollBackEO){ + if(StringUtils.isNotBlank(processRollBackEO.getType())){ + return this.activiti_define_start_rollBack(ActDefineStartMap.actDefineStartMap(processRollBackEO.getType()), LoginUserUtil.getUserId(),processRollBackEO.getId(),processRollBackEO.getJson()); + }else { + return null; + } + } + @ApiOperation(value = "定时任务启动流程-以流程定义id") @GetMapping("/startProcessNew") public ResponseMessage startProcessNew(@RequestParam("type") String type, @RequestParam(value="userId",required = false) String userId, @RequestParam(value="id",required = false) String id){ diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessRollBackEO.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessRollBackEO.java new file mode 100644 index 00000000..ad3d7256 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessRollBackEO.java @@ -0,0 +1,17 @@ +package com.adc.da.workFlow.entity; + +import lombok.Data; + +@Data +public class ProcessRollBackEO { + + private String json; + + private String type; + + private String id; + + private String userId; + + private String bpnId; +} From a5e00ef286ac35b99905598d51c60d42809c7985 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 16 Dec 2021 15:33:21 +0800 Subject: [PATCH 136/163] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E4=BB=A5=E5=8F=8A=E6=B5=81=E7=A8=8B=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/common/TableToExcel.java | 42 ++++++++++++------- .../sarStandIdea/entity/SarPublicIdea.java | 3 ++ .../sarStandIdea/entity/SarPublicIdeaAll.java | 9 ++++ .../controller/SarStandFileEOController.java | 2 +- .../sarStandIdea/SarPublicIdeaAllMapper.xml | 11 +++-- 5 files changed, 49 insertions(+), 18 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java index 2229e53e..ff511b51 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -47,20 +47,34 @@ public class TableToExcel { if (j<3) hCell.setCellValue(columnMap.get(key)); } - Cell hCellh = headRow.createCell(2); - hCellh.setCellValue("修改意见内容"); - Cell hCell = headRow.createCell(5); - hCell.setCellValue("提出部门"); - Cell hCell1 = headRow.createCell(6); - hCell1.setCellValue("提出人"); - Cell hCell2 = headRow.createCell(7); - hCell2.setCellValue("处理意见"); - Cell nCell = neckRow.createCell(2); - nCell.setCellValue("修改前"); - Cell nCell1 = neckRow.createCell(3); - nCell1.setCellValue("修改后"); - Cell nCell2 = neckRow.createCell(4); - nCell2.setCellValue("修改理由"); + if (null!=columnMap.get("commentText")) { + Cell hCellh = headRow.createCell(2); + hCellh.setCellValue("修改意见内容"); + } + if (null!=columnMap.get("department")) { + Cell hCell = headRow.createCell(5); + hCell.setCellValue("提出部门"); + } + if (null!=columnMap.get("responUserName")) { + Cell hCell1 = headRow.createCell(6); + hCell1.setCellValue("提出人"); + } + if (null!=columnMap.get("stateText")) { + Cell hCell2 = headRow.createCell(7); + hCell2.setCellValue("处理意见"); + } + if (null!=columnMap.get("oldText")) { + Cell nCell = neckRow.createCell(2); + nCell.setCellValue("修改前"); + } + if (null!=columnMap.get("newText")) { + Cell nCell1 = neckRow.createCell(3); + nCell1.setCellValue("修改后"); + } + if (null!=columnMap.get("reason")) { + Cell nCell1 = neckRow.createCell(4); + nCell1.setCellValue("修改理由"); + } //从第三行开始填充数据 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java index 6c21bd31..a3609dcd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java @@ -72,5 +72,8 @@ public class SarPublicIdea extends BaseEntity { @TableField("files_name") private String filesName; + @TableField("wkfiles") + private String wkfiles; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java index c50619dd..59b7b231 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java @@ -63,4 +63,13 @@ public class SarPublicIdeaAll extends BaseEntity { public static final String CID = "cid"; + @TableField("chapter_name") + private String chapterName; + + @TableField(exist = false) + private String department; + + @TableField("wk_flag") + private String wkFlag; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java index cceb64d5..6cd5d163 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java @@ -162,7 +162,7 @@ public class SarStandFileEOController extends BaseController { @GetMapping("/querySourceFileInfo") public ResponseMessage> querySourceFileInfo(String standId){ - List sarStandFileEOS = sarStandFileEOService.selectFileByStandId(standId); + List sarStandFileEOS = sarStandFileEOService.querySourceFileInfo(standId); return Result.success(sarStandFileEOS); } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index c2488f4b..2e872438 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -3,15 +3,20 @@ select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID, - ts_user.INSTITUTION_ID,ts_user.INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE, + ts_user.INSTITUTION_ID,t2.name as INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE, ts_user.POSITION_ID,ts_user.POSITION_NAME,ts_user.SEX,ts_user.SSO_ID,ts_user.STATE,ts_user.UNLOCK_FLAG,ts_user.USER_SOURCE, ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname, ts_institution.name as unit,ts_institution.id as unitId from ts_user left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID) + left join ts_institution t2 on t2.id=ts_user.INSTITUTION_ID WHERE institution_id=#{institutionId} and ( ts_user.ACCOUNT like concat(concat('%',#{userName}),'%') or ts_user.UNAME like concat(concat('%',#{userName}),'%') ) @@ -52,10 +53,11 @@ - SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_user.INSTITUTION_NAME as dept_name,ts_user.INSTITUTION_NAME as department,sar_public_idea_all.old_text, + SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,ts_institution.name as department,sar_public_idea_all.old_text, sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name, sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid, sar_public_idea_all.chapter_name as chapterName FROM sar_public_idea INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id 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 WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index 8261e623..8ecf724e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -61,7 +61,7 @@ c.* FROM ( - SELECT b.*,sar_standards_info.STAND_TYPE as standType , ts_user.UNAME as dutyEngineerName , ts_user.INSTITUTION_NAME as responsibleUnit FROM ( + SELECT b.*,sar_standards_info.STAND_TYPE as standType , ts_user.UNAME as dutyEngineerName , ts_institution.name as responsibleUnit FROM ( SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* FROM sar_stand_unqualified,(SELECT @i:=0)j WHERE @@ -84,6 +84,7 @@ )b left join sar_standards_info on b.STAND_ID = sar_standards_info.id left join ts_user on ts_user.USID = b.DUTY_ENGINEER + left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID )c ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml index 2cc02e2e..da4a390a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml @@ -4,20 +4,22 @@ diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index bf4cd96e..0e6f0f02 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -754,9 +754,10 @@ From e0f4eb3d0fd176ec27cbfbb8a8aef27806d247b7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 16 Dec 2021 17:42:17 +0800 Subject: [PATCH 138/163] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=80=BB=E6=95=B0=E7=9A=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 3 --- 1 file changed, 3 deletions(-) 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 6d089807..7c8e4c57 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 @@ -901,9 +901,6 @@ and stand_name like concat(concat('%',#{standName}),'%') - or STAND_NUMBER like concat(concat('%',#{standName}),'%') - or STAND_YEAR like concat(concat('%',#{standName}),'%') - or STAND_SORT like concat(concat('%',#{standName}),'%') and stand_en_name like concat(concat('%',#{standEnName}),'%') From 71354b944f2c543ecf2bd9926ba1407685dac251 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 16 Dec 2021 17:43:00 +0800 Subject: [PATCH 139/163] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E9=80=9A=E8=BF=87id=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FileMaterialController.java | 2 +- .../fileMaterialCenter/entity/FileMaterialPage.java | 2 ++ .../service/impl/FileMaterialServiceImpl.java | 12 +++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java index 555d4d4d..8fa350fa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -78,7 +78,7 @@ public class FileMaterialController extends BaseController { @PutMapping @ApiOperation("修改文件资料组") - public ResponseMessage updateFileMaterial(FileMaterial fileMaterial){ + public ResponseMessage updateFileMaterial(@RequestBody FileMaterial fileMaterial){ boolean b = iFileMaterialService.updateById(fileMaterial); return Result.success(b); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java index f99ac329..78a7b927 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java @@ -8,6 +8,8 @@ import lombok.Data; @Data public class FileMaterialPage { + private String id; + private String dataTitle; private String dataType; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java index 5692f135..b333c70c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -52,7 +52,17 @@ public class FileMaterialServiceImpl extends ServiceImpl(queryPage.getPage(),queryPage.getPageSize()),queryWrapper); + if (queryPage.getId()!=null && !"".equals(queryPage.getId()) ){ + queryWrapper.eq("id",queryPage.getId()); + } + IPage page=null; + if (queryPage.getPage()==null || queryPage .getPageSize()==null){ + page=new Page<>(1,1); + }else { + page=new Page<>(queryPage.getPage(),queryPage.getPageSize()); + } + + return this.page(page,queryWrapper); } @Override From 391169aeea3fdaeaaad0b4f9b8018e5c131ced97 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 16 Dec 2021 18:07:54 +0800 Subject: [PATCH 140/163] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E9=83=A8=E5=88=86=20=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=8E=A5=E5=8F=A3=E9=A2=84=E5=A4=87=20=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=20=E6=B5=81=E7=A8=8B=E4=B8=AD=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=95=B0=E6=8D=AE=E9=A2=84=E5=A4=87=20?= =?UTF-8?q?=EF=BC=88=E5=90=8E=E7=AB=AF=E8=87=AA=E6=B5=8B=E5=AE=8C=E6=88=90?= =?UTF-8?q?=20=E6=9C=89=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=89=8D=E5=8F=B0=E4=BB=8E=E6=B5=81=E7=A8=8B=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=9B=B4=E6=94=B9=E4=BC=A0=E8=BE=93=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarPublicIdeaAllController.java | 4 ++-- .../sarStandIdea/dao/SarPublicIdeaAllDao.java | 2 +- .../sarStandIdea/SarPublicIdeaAllMapper.xml | 18 ++++++++++++------ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 653cd5a1..4608b4c5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -99,7 +99,7 @@ public class SarPublicIdeaAllController extends BaseController @ApiOperation(value = "导出全部意见") @GetMapping("/tuallStand") - public void getAllStand(HttpServletResponse response,String cid){ + public void getAllStand(HttpServletResponse response,@RequestParam(value = "cid")String cid,@RequestParam(value = "type",required = false)String type){ try { response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); @@ -107,7 +107,7 @@ public class SarPublicIdeaAllController extends BaseController response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); if (!StringUtils.isEmpty(cid)){ - data=sarPublicIdeaAllDao.getPublicAllIdea(cid); + data=sarPublicIdeaAllDao.getPublicAllIdea(cid,type); } List standExcel=new ArrayList<>(); for (SarPublicIdeaAll sarPublicIdeaAll:data){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java index d3fae93a..d361e5ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java @@ -27,5 +27,5 @@ public interface SarPublicIdeaAllDao extends BaseMapper { Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId); - List getPublicAllIdea(@Param("cid") String cid); + List getPublicAllIdea(@Param("cid") String cid,@Param("type")String type); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index f79665b8..0312f1f2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -6,38 +6,44 @@ SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,ts_institution.name as department,sar_public_idea_all.old_text, sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name, sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid, - sar_public_idea_all.chapter_name as chapterName + sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag FROM sar_public_idea INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id 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 - WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique} + WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique} and sar_public_idea_all.wk_flag is null From 90d6c0d4cf6d1670bd1b1b096b9bfc1444050cfb Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 16 Dec 2021 18:13:17 +0800 Subject: [PATCH 141/163] feat: There is no way the, --- .../da/FeignClient/workFlowFeignClient.java | 6 + .../workFlowFeignClientImpl.java | 10 ++ .../controller/WorkFlowController.java | 105 +++++++++++++++++- .../workFlow/entity/BusProcessModelHis.java | 4 + .../adc/da/login/security/WebMvcConfig.java | 6 +- .../att/controller/AttFileEOController.java | 79 ------------- 6 files changed, 127 insertions(+), 83 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ff0bb4f8..1e72e2b1 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -19,6 +19,12 @@ import java.util.Set; //@FeignClient(value = "shan6") public interface workFlowFeignClient { + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOneUpdStatus",method = RequestMethod.GET) + BusProcessModelHis processModelHisOneUpdStatus(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId); + + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOneCount",method = RequestMethod.GET) + BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid); + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOne",method = RequestMethod.GET) BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index d158c2f0..535c9231 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -27,6 +27,16 @@ public class workFlowFeignClientImpl { @Autowired private IUserEOService userEOService; + public BusProcessModelHis processModelHisOneUpdStatus(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId); + return stringWrapper; + } + + public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid){ + BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOneCount(pid); + return stringWrapper; + } + public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOne(pid,taskId); return stringWrapper; diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 5949b1ce..0b8727a7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -25,14 +25,17 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; +import java.io.*; +import java.net.URL; +import java.net.URLConnection; import java.util.*; import java.util.stream.Collectors; @@ -41,12 +44,108 @@ import java.util.stream.Collectors; @Api(tags = "福田标准法规-工作流管理") public class WorkFlowController { + private static final Logger logger = LoggerFactory.getLogger(WorkFlowController.class); + @Autowired private workFlowFeignClientImpl workFlowFeignClient; + @Value("${stand.edit.file.path}") + private String standEditFilePath; + // @Autowired // private ExportExcelMapper exportExcelMapper; + + @ApiOperation(value = "查询在线编辑流程汇总文件编辑对象") + @GetMapping("/processModelHisOneCount") + public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid){ + return workFlowFeignClient.processModelHisOneCount(pid); + } + + @ApiOperation(value = "|onlyOffice接收文件") + @PostMapping("/recieveFile") + public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm,String standNo,String pid,String taskId){ + logger.info("**********进入onlyoffice接收文档接口************"); + try { + PrintWriter writer = response.getWriter(); + String body = ""; + try { + Scanner scanner = new Scanner(request.getInputStream()); + scanner.useDelimiter("\\A"); + body = scanner.hasNext() ? scanner.next() : ""; + scanner.close(); + } catch (Exception ex) { + writer.write("get request.getInputStream error:" + ex.getMessage()); + return; + } + + if (body.isEmpty()) { + writer.write("empty request.getInputStream"); + return; + } + + net.sf.json.JSONObject jsonObj = net.sf.json.JSONObject.fromObject(body); + logger.info("**********onlyoffice接收文档接口获得结果body************" + body); + int status = (Integer) jsonObj.get("status"); + + int saved = 0; + if (status == 2 || status == 3)//MustSave, Corrupted + { + String downloadUri = (String) jsonObj.get("url"); + + try { + logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri); + if (StringUtils.isNotEmpty(downloadUri)) { + File file = new File(standEditFilePath + standNo + "\\" + fileNm); + downloadNetFile(downloadUri, file); + } + + } catch (Exception ex) { + saved = 1; + logger.info("**********onlyoffice接收文档接口异常************" + ex.getMessage()); + logger.error(ex.getMessage(),ex); + } + } else if (status == 4) { + logger.info("**********onlyoffice接收文档接口开始修改文件状态状态4************"); + + logger.info("**********onlyoffice接收文档接口修改文件状态成功状态4************"); + } + logger.info("onlyoffice编辑完成--------------"); + writer.write("{\"error\":" + saved + "}"); + + // 更新在线编辑当前节点编辑状态 + workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId); + } catch (IOException e) { + logger.info("**********onlyoffice接收文档接口异常************" + e.getMessage()); + logger.error(e.getMessage(),e); + return; + } + } + + public void downloadNetFile(String downloadUrl, File file) { + try { + FileOutputStream fileOutputStream = new FileOutputStream(file); + URL url = new URL(downloadUrl); + URLConnection connection = url.openConnection(); + InputStream inputStream = connection.getInputStream(); + int length = 0; + byte[] bytes = new byte[1024]; + while ((length = inputStream.read(bytes)) != -1) { + fileOutputStream.write(bytes, 0, length); + } + fileOutputStream.close(); + inputStream.close(); + } catch (IOException e) { + logger.error("download error ! url :{}, exception:{}", downloadUrl, e); + } + } + + @ApiOperation(value = "更新在线编辑流程当前节点编辑状态") + @GetMapping("/processModelHisOneUpd") + public BusProcessModelHis processModelHisOneUpd(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + return workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId); + } + @ApiOperation(value = "查询在线编辑流程当前节点编辑对象") @GetMapping("/processModelHisOne") public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java index 82b0692a..3435eca4 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java @@ -78,6 +78,10 @@ public class BusProcessModelHis implements Serializable { @TableField("EDIT_FILE_PATH") private String editFilePath; + @ApiModelProperty(value = "onlyOffice 编辑类型 node 节点编辑 count 汇总编辑") + @TableField("EDIT_TYPE") + private String editType; + @ApiModelProperty(value = "逻辑状态") @TableField("FLAG") private String flag; 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 492c5ea8..021570b0 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 @@ -64,7 +64,11 @@ public class WebMvcConfig implements WebMvcConfigurer { //文件预览 addInterceptor.excludePathPatterns("/api/att/attFile/getFileInfo"); // onlyOffice 回调 - addInterceptor.excludePathPatterns("/api/att/attFile/recieveFile"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/recieveFile"); + + addInterceptor.excludePathPatterns("/api/lawss/activiti/processModelHisOne"); + + addInterceptor.excludePathPatterns("/api/lawss/activiti/processModelHisOneCount"); addInterceptor.excludePathPatterns("/api/att/attFile/getSyncPdfFileInfo"); //附件下载 diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index 475d5f7d..3b486bbb 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -59,9 +59,6 @@ public class AttFileEOController { @Value("${file.path}") private String filePath;//文件存储路径 - @Value("${stand.edit.file.path}") - private String standEditFilePath; - // @Autowired // private RoleEOService roleEOService; // @@ -79,82 +76,6 @@ public class AttFileEOController { return Result.success(attFileEO); } - @ApiOperation(value = "|onlyOffice接收文件") - @PostMapping("/recieveFile") - public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm,String standNo){ - logger.info("**********进入onlyoffice接收文档接口************"); - try { - PrintWriter writer = response.getWriter(); - String body = ""; - try { - Scanner scanner = new Scanner(request.getInputStream()); - scanner.useDelimiter("\\A"); - body = scanner.hasNext() ? scanner.next() : ""; - scanner.close(); - } catch (Exception ex) { - writer.write("get request.getInputStream error:" + ex.getMessage()); - return; - } - - if (body.isEmpty()) { - writer.write("empty request.getInputStream"); - return; - } - - net.sf.json.JSONObject jsonObj = net.sf.json.JSONObject.fromObject(body); - logger.info("**********onlyoffice接收文档接口获得结果body************" + body); - int status = (Integer) jsonObj.get("status"); - - int saved = 0; - if (status == 2 || status == 3)//MustSave, Corrupted - { - String downloadUri = (String) jsonObj.get("url"); - - try { - logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri); - if (StringUtils.isNotEmpty(downloadUri)) { - File file = new File(standEditFilePath + standNo + "\\" + fileNm); - downloadNetFile(downloadUri, file); - } - - } catch (Exception ex) { - saved = 1; - logger.info("**********onlyoffice接收文档接口异常************" + ex.getMessage()); - logger.error(ex.getMessage(),ex); - } - } else if (status == 4) { - logger.info("**********onlyoffice接收文档接口开始修改文件状态状态4************"); - - logger.info("**********onlyoffice接收文档接口修改文件状态成功状态4************"); - } - logger.info("onlyoffice编辑完成--------------"); - writer.write("{\"error\":" + saved + "}"); - } catch (IOException e) { - logger.info("**********onlyoffice接收文档接口异常************" + e.getMessage()); - logger.error(e.getMessage(),e); - return; - } - } - - public void downloadNetFile(String downloadUrl, File file) { - try { - FileOutputStream fileOutputStream = new FileOutputStream(file); - URL url = new URL(downloadUrl); - URLConnection connection = url.openConnection(); - InputStream inputStream = connection.getInputStream(); - int length = 0; - byte[] bytes = new byte[1024]; - while ((length = inputStream.read(bytes)) != -1) { - fileOutputStream.write(bytes, 0, length); - } - fileOutputStream.close(); - inputStream.close(); - } catch (IOException e) { - logger.error("download error ! url :{}, exception:{}", downloadUrl, e); - } - } - - @ApiOperation(value="|File|上传文件") @PostMapping(value="/upload",consumes="multipart/*",headers="content-type=multipart/form-data" ) @CrossOrigin(origins = "*", maxAge = 3600) From 3bf802fd75d29eed844a8dfc81e6d010567fe716 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 16 Dec 2021 20:47:45 +0800 Subject: [PATCH 142/163] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandardsInfo/controller/SarStandardsInfoController.java | 2 +- 1 file changed, 1 insertion(+), 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 17b851a6..0182065a 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 @@ -303,7 +303,7 @@ public class SarStandardsInfoController extends BaseController if (result > 0) { return Result.success("0", "删除成功", result); }else if(result == -1) { - return Result.success("-1","所选的标准下挂有标准，无法删除"); + return Result.success("-1","所选的标准下挂有清单，无法删除"); } else { return Result.error("删除失败"); From a8544607de42c7a0ca0f74ec503750ae236c45f6 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 17 Dec 2021 10:55:44 +0800 Subject: [PATCH 143/163] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=20?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandardsInfoEOPage.java | 12 +++++++++++- .../sarStandardsInfo/SarStandardsInfoMapper.xml | 6 +++++- 2 files changed, 16 insertions(+), 2 deletions(-) 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 6b48976e..b9dd21e3 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 @@ -88,8 +88,18 @@ public class SarStandardsInfoEOPage extends BasePage { private String orderBy1 = "SAR_STANDARDS_INFO.issue_time"; private String order1 = ""; -// zhaokaiyao + /** + * zhaokaiyao + */ private String textStatus;//文本状态 + /** + * 日期范围查询发布日期开始 + */ + private String startIssueTime; + /** + * 日期范围查询发布日期结束 + */ + private String endIssueTime; } 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 7c8e4c57..b1312c4c 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 @@ -832,8 +832,12 @@ and SAR_STANDARDS_INFO.STAND_YEAR = #{page.standYear} + - and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{page.issueTime} + and + DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') + between #(page.startIssueTime) + and #(page.endIssueTime) From 773e33988ed17aa9e93b41a649a6e486712af11d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 17 Dec 2021 11:16:02 +0800 Subject: [PATCH 144/163] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B--=E3=80=8B=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarPublicIdeaAllController.java | 58 ++++++++++++++----- .../sarStandIdea/entity/GetExcelDto2.java | 42 ++++++++++++++ .../sarStandIdea/entity/SarPublicIdeaAll.java | 3 + .../sarStandIdea/SarPublicIdeaAllMapper.xml | 6 +- 4 files changed, 93 insertions(+), 16 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 4608b4c5..7c8206fc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -23,7 +23,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -103,23 +105,46 @@ public class SarPublicIdeaAllController extends BaseController try { response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); - String fileName = URLEncoder.encode("意见详情", "UTF-8").replaceAll("\\+", "%20"); + String textName=""; + if ("1".equals(type)){ + textName= "流程意见详情"; + }else { + textName="意见详情"; + } + Map map=new HashMap<>(); + map.put("1","上报"); + map.put("2","处理后上报"); + String fileName = URLEncoder.encode(textName, "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); if (!StringUtils.isEmpty(cid)){ data=sarPublicIdeaAllDao.getPublicAllIdea(cid,type); } List standExcel=new ArrayList<>(); + List standExcel2=new ArrayList<>(); for (SarPublicIdeaAll sarPublicIdeaAll:data){ - GetExcelDto getExcelDto=GetExcelDto.builder() - .partCode(sarPublicIdeaAll.getPartCode()) - .oldText(sarPublicIdeaAll.getOldText()) - .newText(sarPublicIdeaAll.getNewText()) - .reason(sarPublicIdeaAll.getReason()) - .userName(sarPublicIdeaAll.getUserName()) - .deptName(sarPublicIdeaAll.getDeptName()) - .build(); - standExcel.add(getExcelDto); + if ("1".equals(type)) { + GetExcelDto2 getExcelDto = GetExcelDto2.builder() + .partCode(sarPublicIdeaAll.getPartCode()) + .oldText(sarPublicIdeaAll.getOldText()) + .newText(sarPublicIdeaAll.getNewText()) + .reason(sarPublicIdeaAll.getReason()) + .userName(sarPublicIdeaAll.getUserName()) + .deptName(sarPublicIdeaAll.getDeptName()) + .state(map.get(sarPublicIdeaAll.getState())) + .build(); + standExcel2.add(getExcelDto); + }else { + GetExcelDto getExcelDto = GetExcelDto.builder() + .partCode(sarPublicIdeaAll.getPartCode()) + .oldText(sarPublicIdeaAll.getOldText()) + .newText(sarPublicIdeaAll.getNewText()) + .reason(sarPublicIdeaAll.getReason()) + .userName(sarPublicIdeaAll.getUserName()) + .deptName(sarPublicIdeaAll.getDeptName()) + .build(); + standExcel.add(getExcelDto); + } } List> headList=new ArrayList>(); @@ -129,9 +154,16 @@ public class SarPublicIdeaAllController extends BaseController headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改理由")); headList.add(Lists.newArrayList("提出部门")); headList.add(Lists.newArrayList("提出人")); - - EasyExcel.write(response.getOutputStream(),GetExcelDto.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") - .doWrite(standExcel); + if ("1".equals(type)){ + headList.add(Lists.newArrayList("处理意见")); + } + if ("1".equals(type)) { + EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(standExcel2); + }else { + EasyExcel.write(response.getOutputStream(), GetExcelDto.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(standExcel); + } } catch (Exception e) { response.reset(); response.setContentType("application/json"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java new file mode 100644 index 00000000..6d2b104d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java @@ -0,0 +1,42 @@ +package com.adc.da.slrs.sarStandIdea.entity; + +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * //用于导出 + * + * @author ZhangZhiYuan + * @date 2021-07-14 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@HeadRowHeight(20) +@ColumnWidth(15) +public class GetExcelDto2 { + +// @ExcelProperty("章节编号") + private String partCode; +// @ExcelProperty("修改意见内容(包括理由或依据)") +// private String content; + private String oldText; + + private String newText; + + private String reason; +// @ExcelProperty("提出部门") + private String deptName; +// @ExcelProperty("提出人") + private String userName; + + private String state; + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java index 59b7b231..72cfc5f8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java @@ -72,4 +72,7 @@ public class SarPublicIdeaAll extends BaseEntity { @TableField("wk_flag") private String wkFlag; + @TableField("state") + private String state; + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 0312f1f2..7809c344 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -33,16 +33,16 @@ From 904d7a993db6f8fd72ec152a942695fb416d9014 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 17 Dec 2021 14:50:28 +0800 Subject: [PATCH 145/163] =?UTF-8?q?=E4=B8=BA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84excel=20=E8=AE=A1=E5=88=92=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=97=B6=E9=97=B4=E5=8E=BB=E6=8E=89=E6=97=B6=E5=88=86?= =?UTF-8?q?=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandUnqualified.java | 10 +++++++++- .../impl/SarStandUnqualifiedServiceImpl.java | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 5018002c..69ad5b1c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -146,13 +146,21 @@ public class SarStandUnqualified extends BaseEntity { @TableField("DUTY_ENGINEER") private String dutyEngineer; - @ExcelProperty("计划关闭时间") + @ExcelIgnore @ApiModelProperty(value = "计划关闭时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("PLAN_CLOSE_TIME") private Date planCloseTime; + + @ExcelProperty("计划关闭时间") + @ApiModelProperty(value = "计划关闭时间excel导出") + + @TableField(exist = false) + private String planCloseTimeExport; + + @ExcelIgnore @ApiModelProperty(value = "主键") @TableId(type = IdType.UUID) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index aaaff4f2..1e8c240c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -18,6 +18,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.sql.Timestamp; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -165,6 +167,18 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); + // 去掉日期时分秒 + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + + stand.forEach(item->{ + + Optional.ofNullable(item.getPlanCloseTime()) + .ifPresent(time ->{ + item.setPlanCloseTimeExport(sdf.format(time)); + }); + + }); + List a = stand; return a; } From 9856f73052e8dfde231b602c6acbc4ba025d6dc7 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 17 Dec 2021 15:02:02 +0800 Subject: [PATCH 146/163] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E3=80=8B=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsDto.java | 38 +++++++++---------- .../entity/StandAttrInfoDto.java | 24 ++++++------ .../SarStandProjectLibraryServiceImpl.java | 24 ++++++------ 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 743e5356..14460d0e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -86,25 +86,25 @@ public class LawsDto { @ApiModelProperty(value = "适用产品线") private String SYCPX; - @ColumnWidth(20) - @ExcelProperty(value = "乘用车VPPS编码", index = 10) - @ApiModelProperty(value = "乘用车VPPS编码") - private String CYCVPPSBM; - - @ColumnWidth(20) - @ExcelProperty(value = "乘用车vpps中文名称", index = 11) - @ApiModelProperty(value = "乘用车vpps中文名称") - private String CYCVPPSCN; - - @ColumnWidth(20) - @ExcelProperty(value = "卡车VPPS编码", index = 12) - @ApiModelProperty(value = "卡车VPPS编码") - private String KCCVPPSBM; - - @ColumnWidth(20) - @ExcelProperty(value = "卡车vpps中文名称", index = 13) - @ApiModelProperty(value = "卡车vpps中文名称") - private String KCCVPPSCN; +// @ColumnWidth(20) +// @ExcelProperty(value = "乘用车VPPS编码", index = 10) +// @ApiModelProperty(value = "乘用车VPPS编码") +// private String CYCVPPSBM; +// +// @ColumnWidth(20) +// @ExcelProperty(value = "乘用车vpps中文名称", index = 11) +// @ApiModelProperty(value = "乘用车vpps中文名称") +// private String CYCVPPSCN; +// +// @ColumnWidth(20) +// @ExcelProperty(value = "卡车VPPS编码", index = 12) +// @ApiModelProperty(value = "卡车VPPS编码") +// private String KCCVPPSBM; +// +// @ColumnWidth(20) +// @ExcelProperty(value = "卡车vpps中文名称", index = 13) +// @ApiModelProperty(value = "卡车vpps中文名称") +// private String KCCVPPSCN; @ApiModelProperty(value = "责任工程师") // @ExcelProperty(value = "责任工程师", index = 17) 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 5ed171da..0385647a 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,18 +50,18 @@ public class StandAttrInfoDto { //责任部门 @ExcelProperty("责任部门") private String ZRBM; - //关联模块--卡车VPPS编码 - @ExcelProperty("关联模块--卡车VPPS编码") - private String KCCVPPSBM; - //关联模块--卡车vpps中文名称 - @ExcelProperty("关联模块--卡车vpps中文名称") - private String KCCVPPSCN; - //关联模块--乘用车VPPS编码 - @ExcelProperty("关联模块--乘用车VPPS编码") - private String CYCVPPSBM; - //关联模块--乘用车vpps中文名称 - @ExcelProperty("关联模块--乘用车vpps中文名称") - private String CYCVPPSCN; +// //关联模块--卡车VPPS编码 +// @ExcelProperty("关联模块--卡车VPPS编码") +// private String KCCVPPSBM; +// //关联模块--卡车vpps中文名称 +// @ExcelProperty("关联模块--卡车vpps中文名称") +// private String KCCVPPSCN; +// //关联模块--乘用车VPPS编码 +// @ExcelProperty("关联模块--乘用车VPPS编码") +// private String CYCVPPSBM; +// //关联模块--乘用车vpps中文名称 +// @ExcelProperty("关联模块--乘用车vpps中文名称") +// private String CYCVPPSCN; private Long unCount; 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 210feb35..36142a40 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 @@ -352,13 +352,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl Date: Fri, 17 Dec 2021 15:12:58 +0800 Subject: [PATCH 147/163] =?UTF-8?q?=E4=B8=BA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84excel=20=E5=BF=BD=E7=95=A5productId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 69ad5b1c..65dfec0e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -51,6 +51,7 @@ public class SarStandUnqualified extends BaseEntity { @TableField("STAND_NAME") private String standName; + @ExcelIgnore @ApiModelProperty(value = "项目编号") @TableField("product_id") private String productId; From 20877855aaa92578fee8a42adf0a52918f68bd6c Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 17 Dec 2021 16:11:37 +0800 Subject: [PATCH 148/163] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=20=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandardsInfoEOPage.java | 3 ++- .../SarStandardsInfoMapper.xml | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) 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 b9dd21e3..62203ee5 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 @@ -90,8 +90,9 @@ public class SarStandardsInfoEOPage extends BasePage { /** * zhaokaiyao + * 文本状态 */ - private String textStatus;//文本状态 + private String textStatus; /** * 日期范围查询发布日期开始 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 b1312c4c..36647eeb 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 @@ -834,10 +834,16 @@ + and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{page.issueTime} + + + and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') - between #(page.startIssueTime) - and #(page.endIssueTime) + between + DATE_FORMAT(#{page.startIssueTime} ,'%Y-%m-%d') + and + DATE_FORMAT(#{page.endIssueTime} ,'%Y-%m-%d') @@ -968,6 +974,15 @@ and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{issueTime} + + + and + DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') + between + DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d') + and + DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d') + AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0 From ce40aed7cb1d9df9a07b0fd9e1d2f2ab431fef45 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 17 Dec 2021 16:24:40 +0800 Subject: [PATCH 149/163] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java | 3 +++ .../src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java | 2 +- .../mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 9625c6d4..74b61551 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -70,6 +70,9 @@ public class EsRevisePlan extends BasePage { @ApiModelProperty(value = "起草责任单位") private String unit; + @ApiModelProperty(value = "起草责任单位ID") + private String unitName; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java index 545ff443..d709188b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java @@ -41,7 +41,7 @@ public interface TsRoleDao extends BaseMapper { * @param menuId：权限ID */ @Insert("insert into ts_role_menu (role_id,menu_id) values (#{roleId},#{menuId})") - void addMenu(String roleId, String menuId); + void addMenu(@Param("roleId") String roleId, @Param("menuId") String menuId); /** * 删除权限 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 b35fc1d7..0a26ccec 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 @@ -18,6 +18,7 @@ draft_time, release_time, unit, + (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName From e114b10ac5d4889066ed0b90c5a4e3226cef1163 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 17 Dec 2021 16:46:07 +0800 Subject: [PATCH 150/163] feat: There is no way the, del only callback code --- .../controller/WorkFlowController.java | 78 ------------------- 1 file changed, 78 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 0b8727a7..a3cb3a88 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -62,84 +62,6 @@ public class WorkFlowController { return workFlowFeignClient.processModelHisOneCount(pid); } - @ApiOperation(value = "|onlyOffice接收文件") - @PostMapping("/recieveFile") - public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm,String standNo,String pid,String taskId){ - logger.info("**********进入onlyoffice接收文档接口************"); - try { - PrintWriter writer = response.getWriter(); - String body = ""; - try { - Scanner scanner = new Scanner(request.getInputStream()); - scanner.useDelimiter("\\A"); - body = scanner.hasNext() ? scanner.next() : ""; - scanner.close(); - } catch (Exception ex) { - writer.write("get request.getInputStream error:" + ex.getMessage()); - return; - } - - if (body.isEmpty()) { - writer.write("empty request.getInputStream"); - return; - } - - net.sf.json.JSONObject jsonObj = net.sf.json.JSONObject.fromObject(body); - logger.info("**********onlyoffice接收文档接口获得结果body************" + body); - int status = (Integer) jsonObj.get("status"); - - int saved = 0; - if (status == 2 || status == 3)//MustSave, Corrupted - { - String downloadUri = (String) jsonObj.get("url"); - - try { - logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri); - if (StringUtils.isNotEmpty(downloadUri)) { - File file = new File(standEditFilePath + standNo + "\\" + fileNm); - downloadNetFile(downloadUri, file); - } - - } catch (Exception ex) { - saved = 1; - logger.info("**********onlyoffice接收文档接口异常************" + ex.getMessage()); - logger.error(ex.getMessage(),ex); - } - } else if (status == 4) { - logger.info("**********onlyoffice接收文档接口开始修改文件状态状态4************"); - - logger.info("**********onlyoffice接收文档接口修改文件状态成功状态4************"); - } - logger.info("onlyoffice编辑完成--------------"); - writer.write("{\"error\":" + saved + "}"); - - // 更新在线编辑当前节点编辑状态 - workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId); - } catch (IOException e) { - logger.info("**********onlyoffice接收文档接口异常************" + e.getMessage()); - logger.error(e.getMessage(),e); - return; - } - } - - public void downloadNetFile(String downloadUrl, File file) { - try { - FileOutputStream fileOutputStream = new FileOutputStream(file); - URL url = new URL(downloadUrl); - URLConnection connection = url.openConnection(); - InputStream inputStream = connection.getInputStream(); - int length = 0; - byte[] bytes = new byte[1024]; - while ((length = inputStream.read(bytes)) != -1) { - fileOutputStream.write(bytes, 0, length); - } - fileOutputStream.close(); - inputStream.close(); - } catch (IOException e) { - logger.error("download error ! url :{}, exception:{}", downloadUrl, e); - } - } - @ApiOperation(value = "更新在线编辑流程当前节点编辑状态") @GetMapping("/processModelHisOneUpd") public BusProcessModelHis processModelHisOneUpd(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ From 57b19f5c79c5eb475184563373391f75a7e3903d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 18 Dec 2021 13:55:17 +0800 Subject: [PATCH 151/163] feat: There is no way the, iphone --- .../controller/WorkFlowController.java | 39 +++++++++++++++++++ .../adc/da/login/security/WebMvcConfig.java | 3 ++ .../adc/da/slrs/sarUser/entity/TsUser.java | 4 ++ 3 files changed, 46 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index a3cb3a88..279b0e97 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -12,6 +12,9 @@ import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.common.Page; +import com.adc.da.login.util.JwtUtils; +import com.adc.da.slrs.sarUser.entity.TsUser; +import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sys.common.EmailUtils; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; @@ -30,12 +33,14 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import sun.misc.BASE64Encoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URL; import java.net.URLConnection; +import java.net.URLEncoder; import java.util.*; import java.util.stream.Collectors; @@ -52,10 +57,44 @@ public class WorkFlowController { @Value("${stand.edit.file.path}") private String standEditFilePath; + @Autowired + private JwtUtils jwtUtils; + + @Autowired + private ITsUserService userService; + // @Autowired // private ExportExcelMapper exportExcelMapper; + + @ApiOperation(value = "手机获取token") + @PostMapping(value = "/loginMobile") + @ResponseBody + public ResponseMessage loginMobile(String taskIds, String pId) throws UnsupportedEncodingException { + BusProcessNew busProcessNew = workFlowFeignClient.queryDetail(taskIds); + if(busProcessNew == null || StringUtils.isBlank(busProcessNew.getUserId())){ + return Result.error("r0011", "用户不存在"); + } + TsUser userEO = userService.getById(busProcessNew.getUserId()); + if (null == userEO) { + return Result.error("r0011", "用户不存在"); + } + if(userEO.getDisableFlag().equals("1")){ + return Result.error("r0011", "帐号已禁用"); + } + String token = jwtUtils.generateToken(userEO.getUserId()); + userEO.setToken(token); + // 加密重要信息 + BASE64Encoder encoder = new BASE64Encoder(); + String userStr = JSON.toJSONString(userEO); + String userStr2 = URLEncoder.encode(userStr,"UTF-8"); + userStr = encoder.encode(userStr2.getBytes()); + return Result.success(userStr); + } + + + @ApiOperation(value = "查询在线编辑流程汇总文件编辑对象") @GetMapping("/processModelHisOneCount") public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid){ 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 021570b0..f3914238 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 @@ -66,6 +66,9 @@ public class WebMvcConfig implements WebMvcConfigurer { // onlyOffice 回调 addInterceptor.excludePathPatterns("/api/lawss/activiti/recieveFile"); + // 手机获取token + addInterceptor.excludePathPatterns("/api/lawss/activiti/loginMobile"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/processModelHisOne"); addInterceptor.excludePathPatterns("/api/lawss/activiti/processModelHisOneCount"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java index 40166850..3b2bab67 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java @@ -150,6 +150,10 @@ public class TsUser extends BaseEntity { @TableField(exist = false) private Integer size; + @TableField(exist = false) + private String token; + + public TsUser() { } From 09e7e2ffeef3b5e644948ced268316d08b20a6b5 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 20 Dec 2021 13:51:57 +0800 Subject: [PATCH 152/163] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B2=A1=E6=9C=89total=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarStandardsInfoDao.java | 2 + .../impl/SarStandardsInfoServiceImpl.java | 2 +- .../SarStandardsInfoMapper.xml | 123 ++++++++++++++++++ 3 files changed, 126 insertions(+), 1 deletion(-) 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 e3d4b902..fafcea69 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 @@ -25,6 +25,8 @@ public interface SarStandardsInfoDao extends BaseMapper { int getSarStandardsInfoCount(SarStandardsInfoEOPage page); + int getSarStandardsInfoCountWk1(SarStandardsInfoEOPage page); + int insertSelective(SarStandardsInfo page); SarStandardsInfo selectByPrimaryKeyAndModifyTime(SarStandardsInfo page); 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 48b557dc..c4a0878c 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 @@ -342,7 +342,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist = dao.getSarStandardsInfoPage(page,"996"); attrInfoCollect(sarlist); 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 7c8e4c57..c0fa932b 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 @@ -987,6 +987,121 @@ + + + left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id + where 1=1 and SAR_STANDARDS_INFO.valid_flag=0 + + + + and stand_type = #{standType} + + + + + and country = #{country} + + + + and ( + (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', + SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'), + ' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') + or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like + trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) + ) + or (trim(replace(stand_name,' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) ) + ) + + + + and stand_name like concat(concat('%',#{standName}),'%') + + + and stand_en_name like concat(concat('%',#{standEnName}),'%') + + + + and stand_state = #{standState} + + + + + and stand_nature = #{standNature} + + + + and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%') + + + + and replaced_stand_num like concat(concat('%',#{replacedStandNum}),'%') + + + and is_relate_access = #{isRelateAccess} + + + + and SAR_STAND_MENU.MENU_ID in + + #{item} + + + + + + and SAR_STAND_MENU.MENU_ID in + + #{item} + + + + + + + + + + + + and SAR_STANDARDS_INFO.id in + + #{item} + + + + and SAR_STANDARDS_INFO.stand_sort = #{standSort} + + + + and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear} + + + and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{issueTime} + + + + AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0 + + + + + and SAR_STANDARDS_INFO.TEXT_STATUS = #{textStatus} + + + + and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{isRelateAccess} + + + + and SAR_STANDARDS_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 TS_PERSON_COLLECT.user_id=#{userId} + ) + + + @@ -1019,6 +1134,14 @@ GROUP BY SAR_STANDARDS_INFO.id) a + + - SELECT lawId,timeName,DATE_FORMAT(SSRQ,'%Y-%m-%d') as SSRQ FROM + SELECT + lawId, + itemId, + timeName, + DATE_FORMAT(SSRQ, '%Y-%m-%d') AS SSRQ + FROM ( select attr.STAND_ID as lawId,'-1' as itemId,'SSRQ' as timeName, substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ From d05f5eb38854a058f1b18d760efff2a23ef5db3a Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 21 Dec 2021 10:12:55 +0800 Subject: [PATCH 156/163] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=BA=BA=E5=90=8D=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 64 +++++++++++-------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 19eed574..2d8b6f97 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -13,6 +13,7 @@ import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.adc.da.slrs.sarLawsDetailedList.service.ISarLawsDetailedListService; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.service.impl.SarStandardsInfoServiceImpl; +import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; @@ -103,7 +104,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl0){ + if (putTime.length > 0) { if ("-".equals(putTime[a]) || null == putTime[a]) { dto.setSsrq(null); } else { @@ -301,7 +302,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl AllSelectD(Integer page, Integer pageSize, String sortKey, String countryArea, String projectName, - String detailedList, String detailedListName,String carType) { + String detailedList, String detailedListName, String carType) { QueryWrapper wrapper = new QueryWrapper<>(); if ("1".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea). @@ -335,7 +336,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl0) { + if (builder.length() > 0) { completedString = builder.delete(builder.length() - 1, builder.length()).toString(); } list1.setCountryArea(completedString); @@ -348,11 +349,22 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl names = new ArrayList<>(); + userIPage.getRecords().forEach(sarLawsDetailedList -> { + names.add(sarLawsDetailedList.getUpdatePeople()); + }); + List upDTOS = iTsUserService.selectNameById(names, "0"); + Map stringMap = new HashMap<>(); + upDTOS.forEach(upDTO -> { + stringMap.put(upDTO.getId(), upDTO.getValue()); + }); + userIPage.getRecords().forEach(sarLawsDetailedList -> { + if (null != stringMap.get(sarLawsDetailedList.getUpdatePeople())) { + sarLawsDetailedList.setUpdatePeople(stringMap.get(sarLawsDetailedList.getUpdatePeople())); + } + }); System.out.println("总条数" + userIPage.getTotal()); System.out.println("总页数" + userIPage.getPages()); return userIPage; @@ -367,8 +379,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.select("country_area","id"); + wrapper.select("country_area", "id"); //查询清单中的国家地区和清单id List sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper); //2.判断修改的标准的"国家/地区"与清单中的是否一致,一致则添加到清单中,不一致不作处理 String[] split = countryArea.split(","); //拆分标准中的国家地区 - //遍历清单 对比国家地区 for (SarLawsDetailedList lawsDetailed : sarLawsDetailedLists) { - if (lawsDetailed.getCountryArea()==null){ + if (lawsDetailed.getCountryArea() == null) { continue; } String[] sarLawsCounties = lawsDetailed.getCountryArea().split(",");//拆分清单中的国家地区 // 对比清单列表中的国家地区,是否一致 Arrays.sort(split); Arrays.sort(sarLawsCounties); - if ( Arrays.equals(split,sarLawsCounties)){ + if (Arrays.equals(split, sarLawsCounties)) { //一致时插入表并关联detailedListId和standId ArrayList timeDtos = new ArrayList<>(); timeDtos.add(timeDto); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("stand_id",timeDto.getStandId()); + queryWrapper.eq("stand_id", timeDto.getStandId()); //如果目标清单中已存标准在则更新 懒得写更新(⓿_⓿) 直接删掉,再重新插入 - if (sarLawsAttrDetailedListDao.selectCount(queryWrapper)>0) { + if (sarLawsAttrDetailedListDao.selectCount(queryWrapper) > 0) { sarLawsAttrDetailedListDao.delete(queryWrapper); } - sarLawsAttrDetailedListService.insertDetailedList(lawsDetailed.getId(),timeDtos); + sarLawsAttrDetailedListService.insertDetailedList(lawsDetailed.getId(), timeDtos); break; } } From 3880e0c68f67f13051116254c833b3aaed37ae3e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 21 Dec 2021 11:05:26 +0800 Subject: [PATCH 157/163] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=E9=80=89=E6=95=B0=E6=8D=AE=E5=87=BA=E7=8E=B0=E5=85=A8=E7=A9=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandItemsServiceImpl.java | 18 +----------------- .../SarLawsAttrDetailedListMapper.xml | 8 ++++---- 2 files changed, 5 insertions(+), 21 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 0a90890a..304f5632 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 @@ -154,25 +154,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl pageInfo = null; -// try { -// pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page); -// } catch (Exception e) { -// e.printStackTrace(); -// } List standId = new ArrayList<>(); -// for (SarStandardsInfo standardsInfo : pageInfo){ -//// if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){ -// standId.add(standardsInfo.getId()); -//// } -// } + List list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType()); - List list=new ArrayList<>(); -// if (standId==null || standId.size()==0){ -// list = null; -// }else { - list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType()); -// } IPage page1=new Page<>(); page1.setRecords(list); page1.setTotal(sarLawsAttrDetailedListDao.selectLawsByIdCount(standId,findStandDto.getStandName(),findStandDto.getStandType(),findStandDto.getFileType()).size()); 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 66bd900a..836adab6 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 @@ -189,7 +189,7 @@ left join sar_standards_info a on ssi.stand_id = a.id LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID - 1=1 + 1=1 and a.ID is not null and (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') @@ -217,7 +217,7 @@ left join sar_standards_info a on ssi.stand_id = a.id LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID - 1=1 + 1=1 and a.ID is not null and (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') @@ -251,7 +251,7 @@ left join sar_standards_info a on ssi.stand_id = a.id LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID - 1=1 + 1=1 and a.ID is not null and (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') @@ -280,7 +280,7 @@ left join sar_standards_info a on ssi.stand_id = a.id LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID - 1=1 + 1=1 and a.ID is not null and (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') From 1d2fcd4a27b6996614c56b192f6148ed5ca2afa7 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 21 Dec 2021 14:13:44 +0800 Subject: [PATCH 158/163] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarLawsAttrDetailedListServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 6394e360..f06b591c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -61,13 +61,13 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq()) && "null"!=sarLawsAttrDetailedLists.get(0).getSsrq()){ lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); } - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq()) && "null"!=sarLawsAttrDetailedLists.get(0).getXcxssrq()){ lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); } - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq())){ + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq()) && "null"!=sarLawsAttrDetailedLists.get(0).getZccssrq()){ lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); } if ("INLAND".equals(lawsDto.getStandType()))lawsDto.setStandType("INLAND_STAND"); From 382f42b8e578cbe9a06c8af97664464a903ed289 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 21 Dec 2021 14:39:06 +0800 Subject: [PATCH 159/163] feat: There is no way the, --- .../mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 6c9f406d..459621b6 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 @@ -95,7 +95,8 @@ and SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{lawsNumber}),'%') - and (LAWS_NAME like concat(concat('%',#{numberName}),'%') + and (SAR_LAWS_STAND_INFO.LAWS_NAME like concat(concat('%',#{numberName}),'%') + or SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{numberName}),'%') or SAR_LAWS_STAND_INFO.LAWS_EN_NAME like concat(concat('%',#{numberName}),'%')) From 8b225fbb1415960cf31d96c72c8514c7f429fbba Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 21 Dec 2021 17:01:48 +0800 Subject: [PATCH 160/163] feat: There is no way the, --- .../service/impl/SarStandardsInfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 c4a0878c..95671ab9 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 @@ -613,7 +613,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl stringList = tsUserService.listObjs(tsUserQW, o ->o.toString()); - value= String.join(",", stringList); + value= String.join(",", stringList.isEmpty() ? valArr : stringList); break; } //通过id绑定责任部门师名称 @@ -622,14 +622,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl stringList = iTsPositionService.listObjs(tsPositionQW, o -> o.toString()); - value = String.join(",", stringList); + value= String.join(",", stringList.isEmpty() ? valArr : stringList); break; } default:value = dicTypeEODao.getDicNamesByCodes(valArr); } - entry.setValue(value); + entry.setValue(value == null ? String.join(",",valArr) : value); } } } From 22cc39c0e24c224da0946867b14fc0aacea30fa6 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 21 Dec 2021 20:42:06 +0800 Subject: [PATCH 161/163] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=8F=82=E4=BC=9A=E5=85=A5=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java | 2 ++ .../resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java index 1568a4f6..e0a9816a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java @@ -45,5 +45,7 @@ public class SapMeeting{ private String files;//附件 json + private String place; + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml index 533cc110..eb04e434 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml @@ -3,7 +3,7 @@ - id,title,date,content,type,attend,files + id,title,date,content,type,attend,files,place type = #{type} @@ -19,6 +19,7 @@ type, attend, files, + place, values @@ -29,6 +30,7 @@ #{type}, #{attend}, #{files}, + #{place}, From 8c72debb051386dc1adad58fe8bd0d1b10388c71 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 22 Dec 2021 11:09:20 +0800 Subject: [PATCH 162/163] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=92=8C=E6=97=A5=E5=8E=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SapMeetingController.java | 6 +++ .../SarStandProjectLibraryServiceImpl.java | 18 ++----- .../controller/SarStandFileEOController.java | 2 + .../standardSplit/dao/SarStandFileEODao.java | 2 + .../entity/SarStandFileEOPage.java | 3 ++ .../service/SarStandFileEOService.java | 2 + .../impl/SarStandFileEOServiceImpl.java | 5 ++ .../standardSplit/SarStandFileEOMapper.xml | 50 +++++++++++++++++++ 8 files changed, 75 insertions(+), 13 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java index 7ec0369e..da312a7c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java @@ -66,4 +66,10 @@ public class SapMeetingController extends BaseController { public int addMeeting(@RequestBody SapMeeting sapMeeting){ return sapMeetingService.addMeeting(sapMeeting); } + + @ApiOperation(value = "修改会议") + @PostMapping("/updateMeeting") + public boolean updateMeeting(@RequestBody SapMeeting sapMeeting){ + return sapMeetingService.updateById(sapMeeting); + } } 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 36142a40..bed9d1ee 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 @@ -419,13 +419,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME"); + wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME","STAND_TYPE","STAND_YEAR","STAND_SORT"); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'"); List userList1 = SarStandardsInfoDao.selectList(wrapper1); QueryWrapper wrapper2 = new QueryWrapper<>(); @@ -516,24 +512,20 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl { page.setFileSuffixList(suffix.split(",")); } List rows = sarStandFileEOService.getStandFileListByPage(page); + Integer count = sarStandFileEOService.getStandFileListByPageCount(page); + page.getPager().setRowCount(count); for (SarStandFileEO one:rows) { one.setAttId(one.getAttId1()); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java index 7bdbbe20..6e33be7d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java @@ -32,6 +32,8 @@ public interface SarStandFileEODao extends BaseMapper { List getStandFileListByPage(SarStandFileEOPage stand); + Integer getStandFileListByPageCount(SarStandFileEOPage stand); + int queryStandFileListByCount(SarStandFileEOPage stand); List queryByPage(SarStandFileEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java index 02332e62..96d10cca 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.page.BasePage; +import lombok.Data; /** * 功能：SAR_STAND_FILE SarStandFileEOPage
@@ -8,6 +9,7 @@ import com.adc.da.base.page.BasePage; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class SarStandFileEOPage extends BasePage { private String modifyTime; @@ -36,6 +38,7 @@ public class SarStandFileEOPage extends BasePage { private String standName; private String fileType; private String standFileClassify; + private int rowCount; public String getModifyTime() { return this.modifyTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java index 78c760dc..7c6f42e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java @@ -9,6 +9,8 @@ public interface SarStandFileEOService { List getStandFileListByPage(SarStandFileEOPage stand); + Integer getStandFileListByPageCount(SarStandFileEOPage stand); + List queryByPage(SarStandFileEOPage page); List queryByList(SarStandFileEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 4214ede6..cac6a18f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -37,6 +37,11 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { return sarStandFileEODao.getStandFileListByPage(stand); } + @Override + public Integer getStandFileListByPageCount(SarStandFileEOPage stand){ + return sarStandFileEODao.getStandFileListByPageCount(stand); + } + @Override public List queryByPage(SarStandFileEOPage page){ return sarStandFileEODao.queryByPage(page); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml index c36b52f1..ea868ac2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml @@ -312,6 +312,56 @@ ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a + +