From 19bb7fa3894b8d95ff93901bf66a8cd3f6c63a87 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 16:26:15 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml | 6 +++---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComPbCheckUnitDto.java | 4 ++--
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPbCheckUnitApi.java | 10 +++++++---
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComPbCheckUnitDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComPbCheckUnitDto.java
index 7b5afb1..edf7036 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComPbCheckUnitDto.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComPbCheckUnitDto.java
@@ -97,8 +97,8 @@
@ApiModelProperty(value = "社区id集合")
private List<Long> communityIds;
- @ApiModelProperty(value = "农行账号集合")
- private String[] accounts;
+ @ApiModelProperty(value = "农行单位id集合")
+ private Long[] ids;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPbCheckUnitApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPbCheckUnitApi.java
index e1bc192..8c464c1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPbCheckUnitApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPbCheckUnitApi.java
@@ -83,8 +83,12 @@
public R queryByPage(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
//comPbCheckUnit.setCommunityId(this.getCommunityId());
String[] area={"东区","仁和区","米易县","盐边县","西区","钒钛高新区"};
- String[] accounts = {"NXPZHFXB","NXPZHBCG","NXPZHFXY","NHPZHBCG","NXPZHDFF","NXPZHXYL","NHPZHXYL","NXPZHGZP","NXPZHZSZ","NXYBZGFL","NXPZHDSJ","NXPZHPJF",
- "NXPZHJBF","NXPZHRHZ","NHPZHRHZ","NXPZHQDF","NXPZHDHZ","NXPZHYHF","NXMYXZXB","NXMYXZXY","NXMYCGFL","NXMYHXFL","NXYBXZXB","NXYBXZXY","NXYBANFL","NXYBHGFL","NXYBYMZX","NXPZHJJF"};
+ Long[] ids = {1584725574201409537L,1584725574771834881L,1584725575031881730L,1584725575593918466L,
+ 1584725576118206466L,1584725576416002050L,1584725576667660289L,1584725576952872961L,1584725577238085633L,
+ 1584725577854648322L,1584725578626400258L,1584725579213602817L,1584725579867914241L,1584725580505448449L,
+ 1584725580815826946L,1584725581386252289L,1584725581671464962L,1584726087093485569L,1584726087433224193L,
+ 1584726088058175490L,1584726088880259073L,1584726089442295809L,1584726091128406018L,1584726091694637058L,
+ 1584726092537692162L,1584726093053591554L,1584726093779206146L,1584726094655815681L};
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
if(ArrayUtil.contains(area, loginUserInfo.getName())){
comPbCheckUnit.setBelongTo(loginUserInfo.getName());
@@ -98,7 +102,7 @@
}
//攀枝花中国农业银行
if ("PZHZGNYYH".equals(loginUserInfo.getAccount())){
- comPbCheckUnit.setAccounts(accounts);
+ comPbCheckUnit.setIds(ids);
}
return this.comPbCheckUnitService.queryByPage(comPbCheckUnit);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml
index a5516d5..983a248 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml
@@ -42,9 +42,9 @@
#{item}
</foreach>
</if>
- <if test="dto.accounts != null and dto.accounts.length != 0">
- AND cpcu.accounts IN
- <foreach collection="dto.accounts" item="item" open="(" separator="," close=")">
+ <if test="dto.ids != null and dto.ids.length != 0">
+ AND cpcu.ids IN
+ <foreach collection="dto.ids" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
--
Gitblit v1.7.1