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,