Merge remote-tracking branch 'origin/master'

zengh

2021-08-27 8c28e0e9d71b84eb18a3b40a9afc46ab50269aa2

Merge remote-tracking branch 'origin/master'

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

@@ -303,8 +303,8 @@
     * 保安派遣数量统计
     */
    @PostMapping("/selectDisp")
    public R selectDisp(String deptid) {
        List<Map<Object, Object>> lists = informationService.selectDisp(deptid);
    public R selectDisp(String deptid,String jurisdiction) {
        List<Map<Object, Object>> lists = informationService.selectDisp(deptid,jurisdiction);
        return R.data(lists);
    }


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

@@ -51,7 +51,7 @@
    List<Map<Object,Object>> selectExtype(String deptid,String jurisdiction);
    List<Map<Object,Object>> selectHold(String deptid,String jurisdiction);
    List<Map<Object,Object>> selectDis(String deptid);
    List<Map<Object,Object>> selectDisp(String deptid);
    List<Map<Object,Object>> selectDisp(String deptid,String jurisdiction);
    List<Map<Object,Object>> selectSoil(String deptid);

    /**

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

@@ -198,12 +198,24 @@
    </select>

    <select id="selectDisp" resultType="java.util.HashMap">
        SELECT COUNT(d.NAME) AS num,
               u.real_name
        FROM sys_dispatcher d
                 LEFT JOIN blade_user u ON u.cardid = d.cardid
        WHERE d.dept_id = #{deptid}
        GROUP BY u.real_name
        SELECT IFNULL(A.thisnum, 0) AS pnum,
        IFNULL(B.lastnum, 0) AS wpnum
        FROM (SELECT COUNT(*) AS thisnum, dept_id,jurisdiction
        FROM blade_user
        WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
        AND dispatch = 0
        GROUP BY dept_id,jurisdiction) A
        LEFT JOIN (SELECT COUNT(*) AS lastnum, dept_id,jurisdiction
        FROM blade_user
        WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
        AND dispatch = 0
        GROUP BY dept_id,jurisdiction) B ON A.dept_id = B.dept_id
        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
            WHERE A.jurisdiction = #{jurisdiction}
        </if>
        <if test="deptid!=null and deptid==''">
            WHERE A.dept_id = #{deptid}
        </if>
    </select>

    <select id="selectSoil" resultType="java.util.HashMap">

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

@@ -52,7 +52,7 @@
    List<Map<Object,Object>> selectExtype(String deptid,String jurisdiction);
    List<Map<Object,Object>> selectHold(String deptid,String jurisdiction);
    List<Map<Object,Object>> selectDis(String deptid);
    List<Map<Object,Object>> selectDisp(String deptid);
    List<Map<Object,Object>> selectDisp(String deptid,String jurisdiction);
    List<Map<Object,Object>> selectSoil(String deptid);
    Map<String, String> queryYearKh(String year,String jurisdiction,String deptid);


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

@@ -113,8 +113,8 @@
    }

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

    @Override