From 03b4ba0d1ef7af01a89beee77a98defc0f0d7206 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 23 Jun 2022 14:35:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BD=E5=86=85=20=E6=B8=85=E5=8D=95bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/AddDetailedDto.java | 2 + .../impl/SarLawsDetailedListServiceImpl.java | 121 +++++++++++------- 2 files changed, 74 insertions(+), 49 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java index 4c9dee62..4ce5f080 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java @@ -42,4 +42,6 @@ public class AddDetailedDto { private String inforlist2; @ApiModelProperty(value = "新车型实施时间") private String inforlist3; + @ApiModelProperty(value = "适用认证") + private String inforlist4; } 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 7dcfedc0..a50e0f70 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 @@ -323,30 +323,50 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl 0) { - if ("-".equals(putTime[a]) || null == putTime[a]) { - dto.setSsrq(null); - } else { - dto.setSsrq(putTime[a]); - } - if ("-".equals(putTime[a]) || null == xcx[a]) { - dto.setXcxssrqgj(null); - } else { - dto.setXcxssrqgj(xcx[a]); - } - if ("-".equals(putTime[a]) || null == zcc[a]) { - dto.setZccssrqgj(null); - } else { - dto.setZccssrqgj(zcc[a]); - } + + if (putTime.length <= a) { + dto.setSsrq(null); + } else { + dto.setSsrq(putTime[a]); + } + if (xcx.length <= a) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if (zcc.length <= a) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + if (syrz.length <= a) { + dto.setSyrz(null); + } else { + dto.setSyrz(syrz[a]); } timeDto.add(dto); } @@ -356,22 +376,25 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl sarStandardsInfos = new ArrayList<>(); - timeDto.forEach(timeDto1 -> { - SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); - sarStandardsInfo.setId(timeDto1.getStandId()); - sarStandardsInfo.setIsRelateAccess("1"); - sarStandardsInfos.add(sarStandardsInfo); - }); - sarStandardsInfoService.updateBatchById(sarStandardsInfos); + List list1 = new ArrayList<>(); + List list2 = new ArrayList<>(); + //避免出现数据丢失 处理一下适用认证信息 + list1.addAll(Arrays.asList(addDetailedDto.getInforlist().split(","))); + Hashtable hashtable = new Hashtable<>(); + for (TimeDto dto:timeDto) { + if (StringUtils.isNotBlank(dto.getSyrz())) { + hashtable.put(dto.getStandId(), dto.getSyrz()); + } } + //下面写消息队列了开始 + createUpdateMQService.sendMQ(hashtable, list2, list1); } catch (Exception e) { e.printStackTrace(); @@ -656,16 +679,16 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl 0) { QueryWrapper wrapper1 = new QueryWrapper<>(); wrapper1.in("stand_id", list1); - List res = sarLawsAttrDetailedListDao.selectList(wrapper); + List res = sarLawsAttrDetailedListDao.selectList(wrapper1); if (res.size() > 0) { res.forEach(sarLawsAttrDetailedList -> { dealWithHashTableData(list1, list2, hashtable, sarLawsAttrDetailedList); @@ -869,20 +892,20 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl Date: Thu, 23 Jun 2022 14:56:47 +0800 Subject: [PATCH 2/3] feat: There is no way the, bug #55693 --- .../sarBussionessStandState/SarBussionessStandStateMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml index f5c10855..b084de85 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml @@ -34,7 +34,7 @@ - where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL + where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0' and STAND_CODE like concat(concat('%',#{standCode}),'%') From c6a229f0e4b1afb9e55a7a989e0b8c21864e3612 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 23 Jun 2022 15:02:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandIdea/SarPublicIdeaAllMapper.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 722f5ea0..bdee27dd 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,7 +3,7 @@ @@ -32,7 +33,7 @@ FROM ( SELECT (@i:=@i+1) as rows, - sar_public_idea_all.id,sar_public_idea_all.reason,concat(t2.name,'_',ts_institution.name) as dept_name,sar_public_idea_all.old_text, + sar_public_idea_all.id,sar_public_idea_all.reason,concat(t3.name,'_',t2.name,'_',ts_institution.name) as dept_name,sar_public_idea_all.old_text, sar_public_idea_all.wk_flag,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, @@ -41,6 +42,7 @@ left join ts_user on sar_public_idea_all.user_id=ts_user.USID left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID left join ts_institution t2 on ts_institution.parent_id=t2.id + left join ts_institution t3 on t2.parent_id=t3.id WHERE sar_public_idea_all.idea_id = #{ideaId} )c @@ -55,12 +57,13 @@