From aa13451ac61608235a39a42ac65a00b7486221af Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Tue, 23 Aug 2022 10:14:05 +0800 Subject: [PATCH 1/8] 56708 --- .../SarStandardComplianceAssessResultController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 15a9d592..4a0efcba 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 @@ -57,8 +57,8 @@ public class SarStandardComplianceAssessResultController { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select(" STAND_ID,ANY_VALUE(STAND_NUMBER) as STAND_NUMBER, STAND_NAME, STAND_TYPE"); - if (eo.getStandName() != null ) { - queryWrapper.like("STAND_NAME", eo.getStandName().replace(" ","")); + if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); From 819d937d720b55883a7234098e09893c51da1135 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Tue, 23 Aug 2022 13:46:28 +0800 Subject: [PATCH 2/8] 56694 --- .../SarStandProjectLibraryServiceImpl.java | 74 ++++++++++++++++++- 1 file changed, 70 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 6b899a2a..8504e688 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 @@ -465,7 +465,34 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl page1 = new Page<>(current, pageSize); IPage userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1); System.out.println("总条数"+userIPage1.getTotal()); @@ -473,7 +500,14 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl 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+"'"); + wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID " + + "WHERE r.project_id ='"+ standId+"'" + + "union all " + + "SELECT r.STAND_ID,'' as SSRQ,'' as XCXSSRQ,'' as ZCCSSRQ,'' as ZRBM,KCVPPSBMBUSS as KCCVPPSBM," + + "KCVPPSCNBUSS as KCCVPPSCN, CYCVPPSBMBUSS as CYCVPPSBM,CYCVPPSCNBUSS as CYCVPPSCN " + + "FROM sar_buss_stand_attr_info " + + "INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_buss_stand_attr_info.STAND_ID " + + "WHERE r.project_id ='" + standId + "'"); Page page2 = new Page<>(current, pageSize); IPage userIPage2 = sarStandAttrInfoDao.selectPage(page2, wrapper2); @@ -569,11 +603,43 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl wrapper1 = new QueryWrapper<>(); 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+"'"); +// 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+"'"); + 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+"'" + + "union all " + + "SELECT " + + "ID, " + + "STAND_NUMBER, " + + "STAND_NAME, " + + "STAND_EN_NAME, " + + "'' as STAND_TYPE, " + + "STAND_YEAR, " + + "STAND_SORT " + + "FROM " + + "sar_bussioness_stand " + + "INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_bussioness_stand.ID " + + "WHERE " + + "r.stand_id IN ( '5iy8azycsw8vl5tfqckk', 'x0ncqakb4kajf9zdhg2p' ) " + + "AND r.project_id = '5DYWDVEQTNH5PXSP6LWQ'" +// "union all " + +// "SELECT " + +// "ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME","STAND_TYPE","STAND_YEAR","STAND_SORT" + +// "FROM " + +// "sar_bussioness_stand " + +// "INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_bussioness_stand.ID " + +// "WHERE " + +// "r.project_id = '" + standId + "'" + ); List userList1 = SarStandardsInfoDao.selectList(wrapper1); 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.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'"); + wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID " + + "WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'" + + "union all " + + "SELECT r.STAND_ID,'' as SSRQ,'' as XCXSSRQ,'' as ZCCSSRQ,'' as ZRBM,KCVPPSBMBUSS as KCCVPPSBM," + + "KCVPPSCNBUSS as KCCVPPSCN, CYCVPPSBMBUSS as CYCVPPSBM,CYCVPPSCNBUSS as CYCVPPSCN " + + "FROM sar_buss_stand_attr_info " + + "INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_buss_stand_attr_info.STAND_ID " + + "WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'"); List userList2 = sarStandAttrInfoDao.selectList(wrapper2); Map map= iDicTypeEOService.getDicTypeListCode(); From 1687202ef57b2d80ee5c4aac24353cc4cd5dd12b Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Tue, 23 Aug 2022 14:19:32 +0800 Subject: [PATCH 3/8] 56983 --- .../sarStandProjectLibrary/SarStandProjectLibraryMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 0abda4a1..6458713f 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 @@ -420,7 +420,9 @@ From 122e639e79026a9a72f0b508d86f54676b9c81ea Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 25 Aug 2022 12:41:25 +0800 Subject: [PATCH 6/8] 57017 --- .../controller/EsRevisePlanController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 1cd406ea..051f9b3f 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 @@ -7,6 +7,7 @@ import com.adc.da.http.Result; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -44,6 +45,16 @@ public class EsRevisePlanController extends BaseController { @PostMapping("queryAllPlans") public ResponseMessage queryAllPlans(EsRevisePlan esRevisePlan){ List esRevisePlans = iEsRevisePlanService.queryAllPlans(esRevisePlan); + for (EsRevisePlan revisePlan : esRevisePlans){ + String area = revisePlan.getArea(); + if (StringUtils.isNotBlank(area)){ + if (area.startsWith("[") && area.endsWith("]")){ + area = area.substring(1,area.length() - 1); + area = area.replace("\"",""); + } + } + revisePlan.setArea(area); + } PageInfo pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans); return Result.success(pageInfo); } From 84c941612ba4e3d2b66c78287b472ae48a8f2e39 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Thu, 25 Aug 2022 16:07:39 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E6=97=B6=EF=BC=8C=E6=96=87=E4=BB=B6=E4=B8=AD=E5=8C=85?= =?UTF-8?q?=E5=90=AB.=E7=9A=84=E6=97=B6=E5=80=99=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E4=B8=8D=E5=AF=B9=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/att/service/impl/AttFileEOServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index 6ade5957..30004a37 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -340,15 +340,17 @@ public class AttFileEOServiceImpl extends ServiceImpl i */ AttFileEO attFileEO = new AttFileEO(); AttFileEO attFileInfo=null; - Integer flag=0; try { attFileEO.setId(attId); attFileInfo = this.baseMapper.selectFileInfoById(attFileEO); if (name.contains(".")) { - if (name.split("\\.")[1].equals(attFileInfo.getFileSuffix())) { + int suffixIndex = name.lastIndexOf("."); + String newSuffix = name.substring(suffixIndex+1).trim(); + if (StringUtils.equals(newSuffix.toUpperCase(),attFileInfo.getFileSuffix().toUpperCase())) { attFileInfo.setOldFileName(name); }else { - attFileInfo.setOldFileName(name.split("\\.")[0].trim()+"."+attFileInfo.getFileSuffix()); + String filename = name.substring(0,suffixIndex).trim(); + attFileInfo.setOldFileName(filename+"."+attFileInfo.getFileSuffix()); } }else { attFileInfo.setOldFileName(name.trim()+"."+attFileEO.getFileSuffix()); @@ -361,6 +363,7 @@ public class AttFileEOServiceImpl extends ServiceImpl i return attFileInfo; } + /** * @Author super_liu * @Description 多文件查询 From 075cd4768c706c01d1c2ec7a0c4275aa58900f75 Mon Sep 17 00:00:00 2001 From: zyd Date: Thu, 25 Aug 2022 16:34:09 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E7=BA=BF=E4=B8=8AES?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91=E4=B8=AD=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=96=87=E4=BB=B6ID=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84BUG,?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E7=9C=8B=E4=B8=8D=E5=88=B0=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E6=AD=A4=E5=A4=84=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=BE=93=E5=87=BA=EF=BC=8C=E5=90=8E=E7=BB=AD?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index bc7c78a3..ff10623f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -216,6 +216,7 @@ public class SendStandMQService { saveMap.put(field+"Name",fieldValue); }catch (Exception e){ logger.info("国内外标准 消息队列: "+addOrUpdate+", 标准ID:"+infoEO.getId()+",问题字段:"+field); + logger.error(e.getMessage(),e); saveMap.put(field+"Name",fieldValue); }