1.统计接口调整

tangzy

2021-08-18 62f265b5f230b199dd82253443e568f80cd5d800

1.统计接口调整

 src/main/java/org/springblade/modules/information/controller/InformationController.java

@@ -835,8 +835,8 @@
     * 公司运营情况进入图表
     */
    @PostMapping("/selectTb")
    public R selectTb(String jurisdiction,String enterpriseName) {
        List<Map<Object, Object>> list = informationService.selectTb(jurisdiction, enterpriseName);
    public R selectTb(String jurisdiction,String enterpriseName,Integer current,Integer size) {
        List<Map<Object, Object>> list = informationService.selectTb(jurisdiction, enterpriseName,current,size);
        return R.data(list);
    }

@@ -844,8 +844,8 @@
     * 公司经济情况进入图表
     */
    @PostMapping("/selectJj")
    public R selectJj(String jurisdiction,String enterpriseName) {
        List<Map<Object, Object>> list = informationService.selectJj(jurisdiction, enterpriseName);
    public R selectJj(String jurisdiction,String enterpriseName,Integer current,Integer size) {
        List<Map<Object, Object>> list = informationService.selectJj(jurisdiction, enterpriseName,current,size);
        return R.data(list);
    }

@@ -871,9 +871,57 @@
     *     业务统计明细
     */
    @PostMapping("/selectDis")
    public R selectDis(String jurisdiction,String name,String fwname) {
        List<Map<Object, Object>> list = informationService.selectDis(jurisdiction, name, fwname);
    public R selectDis(String jurisdiction,String deptid,String fid,Integer current,Integer size) {
        List<Map<Object, Object>> list = informationService.selectDis(jurisdiction,deptid,fid,current,size);
        return R.data(list);
    }


    /**
     *     服务单位下拉
     */
    @PostMapping("/selectFw")
    public R selectFw() {
        List<Map<Object, Object>> list = informationService.selectFw();
        return R.data(list);
    }

    /**
     * 公司处罚数量统计
     */
    @PostMapping("/selectCf")
    public R selectCf(String jurisdiction) {
        Map<String, Object> map = new HashMap<String, Object>();
        Integer count = 0;
        List<Map<String, Object>> lists = new ArrayList<>();
        List<Map<Object, Object>> maps = informationService.selectCf(jurisdiction);
        for (int i = 0; i < maps.size(); i++) {
            String num = maps.get(i).get("num").toString();
            count += Integer.valueOf(num);
        }
        map.put("count", count);
        map.put("list", maps);
        lists.add(map);
        return R.data(lists);
    }

    /**
     * 公司材料不全数量统计
     */
    @PostMapping("/selectCl")
    public R selectCl(String jurisdiction) {
        Map<String, Object> map = new HashMap<String, Object>();
        Integer count = 0;
        List<Map<String, Object>> lists = new ArrayList<>();
        List<Map<Object, Object>> maps = informationService.selectCl(jurisdiction);
        for (int i = 0; i < maps.size(); i++) {
            String num = maps.get(i).get("num").toString();
            count += Integer.valueOf(num);
        }
        map.put("count", count);
        map.put("list", maps);
        lists.add(map);
        return R.data(lists);
    }

}

 src/main/java/org/springblade/modules/information/mapper/InformationMapper.java

@@ -64,14 +64,17 @@
    List<Map<Object,Object>> selectJur();
    int selectExtypeUser();
    List<Map<Object,Object>> selectExtype(String jurisdiction,String deptid,String type);
    List<Map<Object,Object>> selectCf(String jurisdiction);
    List<Map<Object,Object>> selectCl(String jurisdiction);
    List<Map<Object,Object>> selectBx(String jurisdiction,String deptid,String type);
    List<Map<Object,Object>> seCountI(String jurisdiction,String deptid);
    String seCountUm(String jurisdiction,String deptid);
    String seCountUg(String jurisdiction,String deptid);
    List<Map<Object,Object>> selectIn(String jurisdiction);
    List<Map<Object,Object>> selectTb(String jurisdiction,String enterpriseName);
    List<Map<Object,Object>> selectJj(String jurisdiction,String enterpriseName);
    List<Map<Object,Object>> selectDis(String jurisdiction,String name,String fwname);
    List<Map<Object,Object>> selectTb(String jurisdiction,String enterpriseName,Integer current,Integer size);
    List<Map<Object,Object>> selectJj(String jurisdiction,String enterpriseName,Integer current,Integer size);
    List<Map<Object,Object>> selectDis(String jurisdiction,String deptid,String fid,Integer current,Integer size);
    List<Map<Object,Object>> selectFw();

    Map<String, String> queryYearZ(String year,String jurisdiction,String deptid);
    Map<String, String> queryYearZc(String year,String jurisdiction,String deptid);

 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml

@@ -856,6 +856,7 @@
        SELECT COUNT
        (*) as num,
        d.dept_name,
        u.real_name,
        j.dept_name AS jurname
        FROM blade_user u
        LEFT JOIN blade_dept d ON d.id = u.dept_id
@@ -873,7 +874,7 @@
        <if test="type!=null and type=='2'">
            and DATE_FORMAT(u.update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
        </if>
        GROUP BY d.dept_name,
        GROUP BY d.dept_name,u.real_name,
        j.dept_name
    </select>
    <!--表现差的数量-->
@@ -1160,7 +1161,8 @@
            and J.enterpriseName like concat('%', #{enterpriseName},'%')
        </if>
        GROUP BY J.enterpriseName,
        J.departmentid, J.cznum, J.ghnum, J.ghnum, J.pcnum, J.sbnum, J.zcnum, J.znum, J.jurname,J.jurisdiction
        J.departmentid, J.cznum, J.ghnum, J.ghnum, J.pcnum, J.sbnum, J.zcnum, J.znum, J.jurname,J.jurisdiction limit
        #{current},#{size};
    </select>

    <!--公司经济情况进入图表-->
@@ -1214,6 +1216,7 @@
            and J.enterpriseName like concat('%', #{enterpriseName},'%')
        </if>
        GROUP BY J.departmentid, J.enterpriseName, J.jurisdiction, J.jurname, J.pcnum, J.sbcount, J.sbnum, J.zb, J.znum
        limit #{current},#{size};
    </select>


@@ -1280,21 +1283,56 @@
        SELECT d.dept_name AS gsname,
        di.dispatcherTime,
        di.end_time,
        de.dept_name as fwname,
        u.name AS fwname,
        di.num,
        j.dept_name as jurname
        FROM sys_dispatcher di
        LEFT JOIN blade_dept d ON d.id = di.dept_id
        LEFT JOIN blade_dept de ON de.id = di.dispatcher_unit_id
        LEFT JOIN sys_dispatcher_unit u ON u.id = di.dispatcher_unit_id
        LEFT JOIN sys_jurisdiction j ON j.id = di.jurisdiction where 1=1
        <if test="name!=null and name!=''">
            and di.dept_name like concat('%', #{name},'%')
        </if>
        and di.dept_id=#{deptid}
        <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
            and di.jurisdiction =#{jurisdiction}
        </if>
        <if test="fwname!=null and name!=''">
            and de.dept_name like concat('%', #{fwname},'%')
        <if test="fid!=null and fid!=''">
            and di.dispatcher_unit_id=#{fid}
        </if>
        limit #{current},#{size};
    </select>
    <!--服务单位下拉-->
    <select id="selectFw" resultType="java.util.HashMap">
        SELECT id, name
        FROM `sys_dispatcher_unit`
    </select>

    <!--单位处罚数量-->
    <select id="selectCf" resultType="java.util.HashMap">
        SELECT COUNT(*) AS num,
        i.enterpriseName,
        j.dept_name as jurname,
        i.departmentid
        FROM `sys_punish` p
        LEFT JOIN sys_information i ON i.departmentid = p.deptid
        LEFT JOIN sys_jurisdiction j ON j.id = p.jurisdiction where 1=1
        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
            and p.jurisdiction =#{jurisdiction}
        </if>
        GROUP BY i.enterpriseName, i.departmentid, j.dept_name
    </select>

    <!--单位材料不全数量-->
    <select id="selectCl" resultType="java.util.HashMap">
        SELECT
        COUNT( * ) AS num,
        i.enterpriseName,
        j.dept_name as jurname
        FROM
        sys_information i
        LEFT JOIN sys_jurisdiction j ON j.id=i.jurisdiction WHERE i.creditCode is NULL
        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
            and i.jurisdiction =#{jurisdiction}
        </if>
        GROUP BY
        i.enterpriseName,j.dept_name
    </select>
</mapper>

 src/main/java/org/springblade/modules/information/service/IInformationService.java

@@ -75,9 +75,12 @@
    String seCountUm(String jurisdiction,String deptid);
    String seCountUg(String jurisdiction,String deptid);
    Map<String, String> queryYearPz(String year,String jurisdiction,String deptid);
    List<Map<Object,Object>> selectTb(String jurisdiction,String enterpriseName);
    List<Map<Object,Object>> selectJj(String jurisdiction,String enterpriseName);
    List<Map<Object,Object>> selectTb(String jurisdiction,String enterpriseName,Integer current,Integer size);
    List<Map<Object,Object>> selectJj(String jurisdiction,String enterpriseName,Integer current,Integer size);
    List<Map<Object,Object>> selectYw(String jurisdiction,String deptid);
    List<Map<Object,Object>> selectUIn(String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil);
    List<Map<Object,Object>> selectDis(String jurisdiction,String name,String fwname);
    List<Map<Object,Object>> selectDis(String jurisdiction,String deptid,String fid,Integer current,Integer size);
    List<Map<Object,Object>> selectFw();
    List<Map<Object,Object>> selectCf(String jurisdiction);
    List<Map<Object,Object>> selectCl(String jurisdiction);
}

 src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java

@@ -211,13 +211,13 @@
    }

    @Override
    public List<Map<Object, Object>> selectTb(String jurisdiction,String enterpriseName) {
        return baseMapper.selectTb(jurisdiction, enterpriseName);
    public List<Map<Object, Object>> selectTb(String jurisdiction,String enterpriseName,Integer current,Integer size) {
        return baseMapper.selectTb(jurisdiction, enterpriseName,current,size);
    }

    @Override
    public List<Map<Object, Object>> selectJj(String jurisdiction,String enterpriseName) {
        return baseMapper.selectJj(jurisdiction, enterpriseName);
    public List<Map<Object, Object>> selectJj(String jurisdiction,String enterpriseName,Integer current,Integer size) {
        return baseMapper.selectJj(jurisdiction, enterpriseName,current,size);
    }

    @Override
@@ -231,8 +231,23 @@
    }

    @Override
    public List<Map<Object, Object>> selectDis(String jurisdiction, String name, String fwname) {
        return baseMapper.selectDis(jurisdiction, name, fwname);
    public List<Map<Object, Object>> selectDis(String jurisdiction,String deptid,String fid,Integer current,Integer size) {
        return baseMapper.selectDis(jurisdiction,deptid,fid,current,size);
    }

    @Override
    public List<Map<Object, Object>> selectFw() {
        return baseMapper.selectFw();
    }

    @Override
    public List<Map<Object, Object>> selectCf(String jurisdiction) {
        return baseMapper.selectCf(jurisdiction);
    }

    @Override
    public List<Map<Object, Object>> selectCl(String jurisdiction) {
        return baseMapper.selectCl(jurisdiction);
    }



 src/main/java/org/springblade/modules/punish/entity/Punish.java

@@ -67,6 +67,7 @@
    @ApiModelProperty(value = "处罚结果")
    private String punishresult;
    private String punisnum;
    private String jurisdiction;
    /**
     * 处罚日期
     */

 src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml

@@ -11,6 +11,7 @@
        <result column="punishresult" property="punishresult"/>
        <result column="punishtime" property="punishtime"/>
        <result column="punisnum" property="punisnum"/>
        <result column="jurisdiction" property="jurisdiction"/>
    </resultMap>