1.统计接口调整

tangzy

2021-07-27 ccebbfd35eca5cd24eb3e32f7c1158e0596c471c

1.统计接口调整

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

@@ -681,4 +681,13 @@
        lists.add(map);
        return R.data(lists);
    }

    /**
     * 单位列表
     */
    @PostMapping("/selectIn")
    public R selectIn(String jurisdiction) {
        List<Map<Object, Object>> maps = informationService.selectIn(jurisdiction);
        return R.data(maps);
    }
}

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

@@ -60,6 +60,7 @@
    List<Map<Object,Object>> selectJur();
    List<Map<Object,Object>> selectExtype(String jurisdiction,String deptid);
    List<Map<Object,Object>> selectBx(String jurisdiction,String deptid);
    List<Map<Object,Object>> selectIn(String jurisdiction);

    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

@@ -164,9 +164,7 @@
            and i.jurisdiction =#{jurisdiction}
        </if>
        GROUP BY i.departmentid )
        AND datediff(month
        , insuredtime
        , getdate())=1
        AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( insuredtime, '%Y%m' ) ) = 1
        <if test="deptid!=null and deptid!=''">
            and deptid =#{deptid}
        </if>
@@ -174,7 +172,7 @@
        amount,
        deptid
        ) A
        FULL JOIN (
        left JOIN (
        SELECT COUNT
        (*) AS thismouth,
        amount,
@@ -188,9 +186,7 @@
            and i.jurisdiction =#{jurisdiction}
        </if>
        GROUP BY i.departmentid )
        AND datediff(month
        , insuredtime
        , getdate())=0
        AND DATE_FORMAT( insuredtime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
        <if test="deptid!=null and deptid!=''">
            and deptid =#{deptid}
        </if>
@@ -791,4 +787,12 @@
            and u.dept_id =#{deptid}
        </if>
    </select>

    <select id="selectIn" resultType="java.util.HashMap">
        SELECT enterpriseName, departmentid
        FROM sys_information where 1=1
        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
            and jurisdiction =#{jurisdiction}
        </if>
    </select>
</mapper>

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

@@ -67,4 +67,5 @@
    Map<String, String> queryYearDe(String year,String jurisdiction,String deptid);
    Map selectPcount(String jurisdiction,String deptid);
    Map selectWPcount(String jurisdiction,String deptid);
    List<Map<Object,Object>> selectIn(String jurisdiction);
}

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

@@ -170,5 +170,10 @@
        return baseMapper.selectWPcount(jurisdiction, deptid);
    }

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


}