智慧保安后台管理-外网项目备份
tangzy
2021-08-27 4f3f12b7a0abbaa4984ff41d775efd412836de75
1.统计
2 files modified
6 ■■■■ changed files
src/main/java/org/springblade/modules/information/controller/InformationController.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -346,7 +346,7 @@
     *
     * @return
     */
    @GetMapping("/queryYearKh")
    @PostMapping("/queryYearKh")
    public R queryYearKh(String jurisdiction, String deptid) {
        Calendar cal = Calendar.getInstance();
        String year = String.valueOf(cal.get(Calendar.YEAR));
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -157,7 +157,7 @@
        WHERE u.examination_type = 1
        GROUP BY u.dept_id,u.jurisdiction
        ) B ON A.dept_id = B.dept_id
        <if test="jurisdiction!=null and jurisdiction==''">
        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
            WHERE A.jurisdiction = #{jurisdiction}
        </if>
        <if test="deptid!=null and deptid==''">
@@ -180,7 +180,7 @@
        WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
        AND hold = 2
        GROUP BY dept_id,jurisdiction) B ON A.dept_id = B.dept_id
        <if test="jurisdiction!=null and jurisdiction==''">
        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
            WHERE A.jurisdiction = #{jurisdiction}
        </if>
        <if test="deptid!=null and deptid==''">