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 62a9b6e..0a507ab 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 @@ -26,6 +26,16 @@ public class ComprehensiveStat implements Serializable { */ private int abnycnum; + /** + * 列异移出(线上申请) + */ + private int abnycnumon; + + /** + * 列异移出(线下申请) + */ + private int abnycnumoff; + /** * 列异异议 */ @@ -46,6 +56,16 @@ public class ComprehensiveStat implements Serializable { */ private int legycnum; + /** + * 严重违法失信移出(线上申请) + */ + private int legycnumon; + + /** + * 严重违法失信移出(线下申请) + */ + private int legycnumoff; + /** * 年报公示信息异议反馈 */ diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/business/entity/TSTaskList.java b/src/main/java/com/chinaweal/aiccs/aiccs/business/entity/TSTaskList.java index 0903193..e061e99 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/business/entity/TSTaskList.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/business/entity/TSTaskList.java @@ -206,6 +206,12 @@ public class TSTaskList extends Model { @TableField("IS_SMART_PROCESSING") private String isSmartProcessing; + /** + * 数据来源,0或null:系统生成的数据(线下申请),1:年报系统(线上申请) + */ + @TableField("ORIGIN") + private String origin; + /** * 主体类型 */ diff --git a/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml b/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml index 03b70e1..5d6cc26 100644 --- a/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml +++ b/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml @@ -579,36 +579,48 @@ 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(legycnum) as legycnum, + sum(legycnumon) as legycnumon, + sum(legycnumoff) as legycnumoff from ( select rs2.orgn, rs2.orgunitname, rs1.abnlrnum, rs1.abnycnum, + rs1.abnycnumon, + rs1.abnycnumoff, rs1.abnyynum rs1.leglrnum, rs1.legyynum, - rs1.legycnum + rs1.legycnum, + rs1.legycnumon, + rs1.legycnumoff from ( 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' 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 from (select BIZSEQID,BUSTYPE,max(SIGNUSERID) SIGNUSERID from aiccs.tstasklist where BUSSTATUS !=4