From b75217bcd8f1b7cac917945f1d4d4f725e4e958e Mon Sep 17 00:00:00 2001 From: liaocc Date: Sat, 10 Jan 2026 12:24:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8C=89=E7=BA=A7=E5=88=AB=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EBaseinfoController.java | 5 +++ .../service/impl/EBaseinfoServiceImpl.java | 2 + .../mapper/aiccs/abnormal/EBaseinfoMapper.xml | 41 +++++++++++++++++-- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java index b066115..efe63b8 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java @@ -627,6 +627,11 @@ public class EBaseinfoController extends BaseController { @RequestMapping("queryCphStatistics") public RestResult queryCphStatistics(@RequestBody Map customParamMap, HttpServletRequest request) { + AICUser aicUser = getLoginUser(request); + if (aicUser != null) { + String regionId = aicUser.getRegionID(); + customParamMap.put("regionId", regionId); + } List rs = eBaseinfoService.queryCphStat(customParamMap); return RestResult.ok(rs); } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java index 8876d00..979f9ef 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java @@ -688,6 +688,7 @@ public class EBaseinfoServiceImpl extends BaseServiceImpl rs = baseMapper.queryCphStat(customParamMap); // 一笔业务包含多个主体的要统计主体数量,xiangwu +/* for (ComprehensiveStat each : rs) { each.setAbnlrnum(baseMapper.countabnlrnum(each.getOrgn(), customParamMap)); each.setLeglrnum(baseMapper.countleglrnum(each.getOrgn(), customParamMap)); @@ -695,6 +696,7 @@ public class EBaseinfoServiceImpl extends BaseServiceImpl regulatoryVOS = regulatoryMapper.queryParentRegulatory(); List orgnList = new ArrayList<>(); diff --git a/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml b/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml index 5d6cc26..ba8e250 100644 --- a/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml +++ b/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml @@ -654,10 +654,14 @@ select orgn, orgunitname, sum(abnlrnum) as abnlrnum, sum(abnycnum) as abnycnum, + sum(abnycnumon) as abnycnumon, + sum(abnycnumoff) as abnycnumoff, sum(abnyynum) as abnyynum, sum(leglrnum) as leglrnum, sum(legyynum) as legyynum, sum(legycnum) as legycnum, + sum(legycnumon) as legycnumon, + sum(legycnumoff) as legycnumoff, sum(ualfknum) as ualfknum, sum(mytrnum) as mytrnum, sum(wtcznum) as wtcznum, @@ -675,10 +679,14 @@ select rs2.orgn, rs2.orgunitname, rs1.abnlrnum, rs1.abnycnum, + rs1.abnycnumon, + rs1.abnycnumoff, rs1.abnyynum, rs1.leglrnum, rs1.legyynum, rs1.legycnum, + rs1.legycnumon, + rs1.legycnumoff, rs1.ualfknum, rs1.mytrnum, rs1.wtcznum, @@ -696,10 +704,14 @@ select SIGNUSERID, count(case when bustype in ('5','13','11') then 1 else null end) as abnlrnum, count(case when bustype in ('7','14','12') then 1 else null end) as abnycnum, + count(case when bustype in ('7','14','12') and origin='1' then 1 else null end) as abnycnumon, + count(case when bustype in ('7','14','12') and (origin is null or origin!='1') then 1 else null end) as abnycnumoff, count(case when bustype='6' then 1 else null end) as abnyynum, count(case when bustype='15' then 1 else null end) as leglrnum, count(case when bustype='16' then 1 else null end) as legyynum, count(case when bustype='17' then 1 else null end) as legycnum, + count(case when bustype='17' and origin='1' then 1 else null end) as legycnumon, + count(case when bustype='17' and (origin is null or origin!='1') then 1 else null end) as legycnumoff, count(case when bustype='30' then 1 else null end) as ualfknum, count(case when bustype='31' then 1 else null end) as mytrnum, count(case when bustype='32' then 1 else null end) as wtcznum, @@ -714,7 +726,7 @@ count(case when bustype='61' then 1 else null end) as locknum, count(case when bustype='62' then 1 else null end) as unlocknum from - (select BIZSEQID,BUSTYPE,max(SIGNUSERID) SIGNUSERID from aiccs.tstasklist where BUSSTATUS !=4 + (select BIZSEQID,BUSTYPE,max(SIGNUSERID) SIGNUSERID,origin from aiccs.tstasklist where BUSSTATUS !=4 and BUSSTATUS = '2' @@ -727,16 +739,39 @@ and date_format(SIGNTIME,'%Y-%m-%d') <= #{customParamMap.endDate} - group by bizseqid,BUSTYPE + group by bizseqid,BUSTYPE,origin ) t2 group by SIGNUSERID ) rs1 left join ( select rs.*, tog.orgunitname from ( - select tu.userid, left(tog.orgNumber,6) as orgn from cxaicorg.t_users tu + select tu.userid, + + + left(tog.orgNumber,4)||'00' + + + left(tog.orgNumber,6) + + + tog.orgNumber + + + as orgn from cxaicorg.t_users tu left join cxaicorg.t_orgunits tog on tu.orgunitid = tog.orgunitid ) rs left join cxaicorg.t_orgunits tog on rs.orgn = tog.orgNumber )rs2 on rs1.SIGNUSERID = rs2.userid where rs2.orgn is not null and rs2.orgunitname is not null + + + and rs2.orgn like '15%' + + + and rs2.orgn like #{customParamMap.regionId.substring(0,4)}||'%' + + + and rs2.orgn like #{customParamMap.regionId.substring(0,6)}||'%' + + ) jg group by orgn, orgunitname order by orgn asc From 78e3574f7cb396c50f5dfa5d88a5beb3c4b278c8 Mon Sep 17 00:00:00 2001 From: liaocc Date: Sat, 10 Jan 2026 15:41:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8C=89=E7=BA=A7=E5=88=AB=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EBaseinfoController.java | 3 +++ .../service/impl/EBaseinfoServiceImpl.java | 21 ++++++++++++++++++- .../mapper/aiccs/abnormal/EBaseinfoMapper.xml | 7 +++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java index efe63b8..61fdde0 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java @@ -629,8 +629,11 @@ public class EBaseinfoController extends BaseController { public RestResult queryCphStatistics(@RequestBody Map customParamMap, HttpServletRequest request) { AICUser aicUser = getLoginUser(request); if (aicUser != null) { + log.debug("orgId: {} regionId: {}", aicUser.getOrgID(), aicUser.getRegionID()); String regionId = aicUser.getRegionID(); customParamMap.put("regionId", regionId); + } else { + log.error("用户未登录"); } List rs = eBaseinfoService.queryCphStat(customParamMap); return RestResult.ok(rs); diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java index 979f9ef..3e5cf03 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java @@ -686,6 +686,7 @@ public class EBaseinfoServiceImpl extends BaseServiceImpl queryCphStat(Map customParamMap) { customParamMap = checkSearchDate(customParamMap); List rs = baseMapper.queryCphStat(customParamMap); + String regionId = (String) customParamMap.get("regionId"); // 一笔业务包含多个主体的要统计主体数量,xiangwu /* @@ -704,7 +705,25 @@ public class EBaseinfoServiceImpl extends BaseServiceImpl - and rs2.orgn like #{customParamMap.regionId.substring(0,4)}||'%' + and rs2.orgn like left(#{customParamMap.regionId},4)||'%' + + + and rs2.orgn like left(#{customParamMap.regionId},6)||'%' - and rs2.orgn like #{customParamMap.regionId.substring(0,6)}||'%' + and rs2.orgn like #{customParamMap.regionId}||'%' ) jg group by orgn, orgunitname From d7b4c168bd7eaf863234235fd74f3e9c88a554bd Mon Sep 17 00:00:00 2001 From: liaocc Date: Sat, 10 Jan 2026 17:57:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=8C=E6=94=BF=E5=A4=84=E7=BD=9A=E4=BF=A1?= =?UTF-8?q?=E7=94=A8=E4=BF=AE=E5=A4=8D=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../abnormal/entity/dto/ComprehensiveStat.java | 15 +++++++++++++++ .../mapper/aiccs/abnormal/EBaseinfoMapper.xml | 9 +++++++++ 2 files changed, 24 insertions(+) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/dto/ComprehensiveStat.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/dto/ComprehensiveStat.java index 0a507ab..fd80080 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/dto/ComprehensiveStat.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/dto/ComprehensiveStat.java @@ -66,6 +66,21 @@ public class ComprehensiveStat implements Serializable { */ private int legycnumoff; + /** + * 行政处罚信用修复 + */ + private int penxfnum; + + /** + * 行政处罚信用修复（线上申请） + */ + private int penxfnumon; + + /** + * 行政处罚信用修复（线下申请） + */ + private int penxfnumoff; + /** * 年报公示信息异议反馈 */ diff --git a/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml b/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml index 80ad395..981244e 100644 --- a/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml +++ b/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml @@ -662,6 +662,9 @@ sum(legycnum) as legycnum, sum(legycnumon) as legycnumon, sum(legycnumoff) as legycnumoff, + sum(penxfnum) as penxfnum, + sum(penxfnumon) as penxfnumon, + sum(penxfnumoff) as penxfnumoff, sum(ualfknum) as ualfknum, sum(mytrnum) as mytrnum, sum(wtcznum) as wtcznum, @@ -687,6 +690,9 @@ rs1.legycnum, rs1.legycnumon, rs1.legycnumoff, + rs1.penxfnum, + rs1.penxfnumon, + rs1.penxfnumoff, rs1.ualfknum, rs1.mytrnum, rs1.wtcznum, @@ -712,6 +718,9 @@ count(case when bustype='17' then 1 else null end) as legycnum, count(case when bustype='17' and origin='1' then 1 else null end) as legycnumon, count(case when bustype='17' and (origin is null or origin!='1') then 1 else null end) as legycnumoff, + count(case when bustype='27' then 1 else null end) as penxfnum, + count(case when bustype='27' and origin='1' then 1 else null end) as penxfnumon, + count(case when bustype='27' and (origin is null or origin!='1') then 1 else null end) as penxfnumoff, count(case when bustype='30' then 1 else null end) as ualfknum, count(case when bustype='31' then 1 else null end) as mytrnum, count(case when bustype='32' then 1 else null end) as wtcznum,