Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs-api

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;
+
     /**
      * 年报公示信息异议反馈
      */

src/main/java/com/chinaweal/aiccs/aiccs/business/entity/TSTaskList.java

@@ -206,6 +206,12 @@ public class TSTaskList extends Model<TSTaskList> {
     @TableField("IS_SMART_PROCESSING")
     private String isSmartProcessing;
 
+    /**
+     * 数据来源，0或null：系统生成的数据（线下申请），1：年报系统（线上申请）
+     */
+    @TableField("ORIGIN")
+    private String origin;
+
     /**
      * 主体类型
      */

src/main/java/com/chinaweal/aiccs/aiceps/annual/controller/AnModifyPermitController.java

@@ -0,0 +1,24 @@
+package com.chinaweal.aiccs.aiceps.annual.controller;
+
+import com.chinaweal.aiccs.aiceps.annual.service.AnModifyPermitService;
+import com.chinaweal.aiccs.common.base.controller.BaseController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 年报修改许可 前端控制器
+ * </p>
+ *
+ * @author lcc
+ * @since 2026-01-03
+ */
+@ApiOperation("年报修改许可接口")
+@RestController
+@RequestMapping("/anModify")
+public class AnModifyPermitController extends BaseController  {
+    @Autowired
+    private AnModifyPermitService anModifyPermitService;
+}

src/main/java/com/chinaweal/aiccs/aiceps/annual/entity/AnModifyPermit.java

@@ -0,0 +1,77 @@
+package com.chinaweal.aiccs.aiceps.annual.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 年报修改许可
+ *
+ * @author lcc
+ * @since 2026/1/3 15:12
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel("年报修改许可")
+@TableName("AN_MODIFY_PERMIT")
+public class AnModifyPermit implements Serializable {
+    private final static long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private String id;
+
+    /**
+     * 统一社会信用代码
+     */
+    @ApiModelProperty("统一社会信用代码")
+    @TableField("UNISCID")
+    private String uniscid;
+
+    /**
+     * 年报年度
+     */
+    @ApiModelProperty("年报年度")
+    @TableField("ANCHEYEAR")
+    private String ancheyear;
+
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty("开始时间")
+    @TableField("BEGIN_TIME")
+    private LocalDateTime begintime;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty("结束时间")
+    @TableField("END_TIME")
+    private LocalDateTime endtime;
+
+    /**
+     * 允许次数
+     */
+    @TableField("ALLOW_TIME")
+    @ApiModelProperty(value = "允许次数")
+    private Integer allowTime;
+
+    /**
+     * 同步标志
+     */
+    @ApiModelProperty("同步标志")
+    @TableField("ISYNC")
+    private String isync;
+}

src/main/java/com/chinaweal/aiccs/aiceps/annual/mapper/AnModifyPermitMapper.java

@@ -0,0 +1,23 @@
+package com.chinaweal.aiccs.aiceps.annual.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chinaweal.aiccs.aiceps.annual.entity.AnModifyPermit;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 年报修改许可 Mapper
+ *
+ * @author lcc
+ * @since 2026/1/3 15:52
+ **/
+public interface AnModifyPermitMapper extends BaseMapper<AnModifyPermit> {
+
+    /**
+     * 按统一码查询年报修改许可
+     * @param uniscid
+     * @return
+     */
+    List<AnModifyPermit> selectByUniscid(@Param("uniscid") String uniscid);
+}

src/main/java/com/chinaweal/aiccs/aiceps/annual/service/AnModifyPermitService.java

@@ -0,0 +1,23 @@
+package com.chinaweal.aiccs.aiceps.annual.service;
+
+import com.chinaweal.aiccs.aiceps.annual.entity.AnModifyPermit;
+import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 年报修改许可 Service
+ *
+ * @author lcc
+ * @since 2026/1/3 15:52
+ **/
+@Service
+public interface AnModifyPermitService extends BaseService<AnModifyPermit> {
+    /**
+     * 按统一码取年报修改许可
+     * @param uniscid
+     * @return
+     */
+    List<AnModifyPermit> selectByUniscid(String uniscid);
+}

src/main/java/com/chinaweal/aiccs/aiceps/annual/service/impl/AnModifyPermitServiceImpl.java

@@ -0,0 +1,27 @@
+package com.chinaweal.aiccs.aiceps.annual.service.impl;
+
+import com.chinaweal.aiccs.aiceps.annual.entity.AnModifyPermit;
+import com.chinaweal.aiccs.aiceps.annual.mapper.AnModifyPermitMapper;
+import com.chinaweal.aiccs.aiceps.annual.service.AnModifyPermitService;
+import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 年报修改许可 ServiceImpl
+ *
+ * @author lcc
+ * @since 2026/1/3 15:52
+ **/
+@Repository
+public class AnModifyPermitServiceImpl extends BaseServiceImpl<AnModifyPermitMapper, AnModifyPermit> implements AnModifyPermitService {
+    @Autowired
+    private AnModifyPermitMapper anModifyPermitMapper;
+
+    @Override
+    public List<AnModifyPermit> selectByUniscid(String uniscid) {
+        return anModifyPermitMapper.selectByUniscid(uniscid);
+    }
+}

src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml

@@ -579,36 +579,48 @@
         <if test="customParamMap.bustype == 'abnormal' ">
             sum(abnlrnum) as abnlrnum,
             sum(abnycnum) as abnycnum,
+            sum(abnycnumon) as abnycnumon,
+            sum(abnycnumoff) as abnycnumoff,
             sum(abnyynum) as abnyynum
         </if>
         <if test="customParamMap.bustype == 'illegal' ">
             sum(leglrnum) as leglrnum,
             sum(legyynum) as legyynum,
-            sum(legycnum) as legycnum
+            sum(legycnum) as legycnum,
+            sum(legycnumon) as legycnumon,
+            sum(legycnumoff) as legycnumoff
         </if>
         from (
         select rs2.orgn, rs2.orgunitname,
         <if test="customParamMap.bustype == 'abnormal' ">
             rs1.abnlrnum,
             rs1.abnycnum,
+            rs1.abnycnumon,
+            rs1.abnycnumoff,
             rs1.abnyynum
         </if>
         <if test="customParamMap.bustype == 'illegal' ">
             rs1.leglrnum,
             rs1.legyynum,
-            rs1.legycnum
+            rs1.legycnum,
+            rs1.legycnumon,
+            rs1.legycnumoff
         </if>
         from (
         select SIGNUSERID,
         <if test="customParamMap.bustype == 'abnormal' ">
             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
         </if>
         <if test="customParamMap.bustype == 'illegal' ">
             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
         </if>
         from
         (select BIZSEQID,BUSTYPE,max(SIGNUSERID) SIGNUSERID from aiccs.tstasklist where BUSSTATUS !=4

src/main/resources/mybatis/mapper/aiccs/annual/AnModifyPermitMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chinaweal.aiccs.aiceps.annual.mapper.AnModifyPermitMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID,UNISCID,ANCHEYEAR,BEGIN_TIME,END_TIME,ALLOW_TIME,ISYNC
+    </sql>
+    <select id="selectByUniscid" resultType="com.chinaweal.aiccs.aiceps.annual.entity.AnModifyPermit">
+        select * from AN_MODIFY_PERMIT where UNISCID = #{uniscid,jdbcType=VARCHAR}
+    </select>
+</mapper>