新增学历统计接口

Administrator

2021-12-31 4fa826960b4a4d758733715a19ce0d2abdf77ba7

新增学历统计接口

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

@@ -429,6 +429,8 @@
        return R.data(list);
    }



    /**
     * 导入单位信息
     */
@@ -532,4 +534,15 @@
        return R.data(list);
    }

    /**
     * 查询学历统计信息
     * @param deptid 部门id
     * @param jurisdiction 辖区
     * @return
     */
    @PostMapping("/getEducationStatistics")
    public R getEducationStatistics(String deptid, String jurisdiction) {
        return R.data(informationService.getEducationStatistics(deptid, jurisdiction));
    }

}

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

@@ -215,4 +215,12 @@
     * @return
     */
    List<List> selectUIn(IPage<List> page, String deptid, String name, String hold, String photo, String examinationtype, String dispatch, String soil);

    /**
     * 查询学历统计信息
     * @param deptid 部门id
     * @param jurisdiction 辖区
     * @return
     */
    List<Map<String, Object>> getEducationStatistics(@Param("deptId") String deptid, @Param("jurisdiction") String jurisdiction);
}

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

@@ -1314,4 +1314,30 @@
        </if>
    </select>

    <!--查询学历统计信息-->
    <select id="getEducationStatistics" resultType="java.util.HashMap">
        SELECT
        ifnull(b.num,0) value,a.dict_value name
        FROM
        ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = "educationType" AND parent_id = 1442114073897521153 ) a
        LEFT JOIN (
        SELECT
        count( * ) num,
        education
        FROM
        blade_user bu
        left join blade_dept bd on bu.dept_id = bd.id
        left join sys_information si on si.departmentid = bd.id
        left join sys_jurisdiction sj on sj.id = si.jurisdiction
        where 1=1
        <if test="jurisdiction!=null and jurisdiction != '' and jurisdiction!='1372091709474910209'">
            and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
        </if>
        <if test="deptId!=null and deptId != ''">
            and bu.dept_id = #{deptId}
        </if>
        GROUP BY
        education ) b ON a.dict_key = b.education
    </select>

</mapper>

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

@@ -126,4 +126,14 @@
     * @return
     */
    IPage selectUIn(IPage<List> page, String deptid, String name, String hold, String photo, String examinationtype, String dispatch, String soil);



    /**
     * 查询学历统计信息
     * @param deptid 部门id
     * @param jurisdiction 辖区
     * @return
     */
    Object getEducationStatistics(String deptid, String jurisdiction);
}

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

@@ -407,4 +407,17 @@
    public IPage selectUIn(IPage<List> page, String deptid, String name, String hold, String photo, String examinationtype, String dispatch, String soil) {
        return page.setRecords(baseMapper.selectUIn(page,deptid, name, hold, photo, examinationtype, dispatch,soil));
    }

    /**
     * 查询学历统计信息
     * @param deptid 部门id
     * @param jurisdiction 辖区
     * @return
     */
    @Override
    public Object getEducationStatistics(String deptid, String jurisdiction) {
        //查询学历分布情况，按学历分组统计对应的人数
        List<Map<String,Object>> mapList = baseMapper.getEducationStatistics(deptid,jurisdiction);
        return mapList;
    }
}

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -1419,4 +1419,37 @@
//        ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
    }


    /**
     * 保安员账号校验
     * @param user
     * @return
     */
    @GetMapping("/checkAccount")
    public void checkAccount(User user) {
        //根据身份证号查询用户
        User user1 = new User();
        user1.setAccount(user.getCardid());
        user1.setIsDeleted(0);
        user1.setStatus(1);
        User user2 = userService.getOne(Condition.getQueryWrapper(user1));
        if (null!=user2){
            //判断是单位否一致
            if (null!=user.getDeptId() && !user.getDeptId().equals("")) {
                if (!user2.getDeptId().equals(user.getDeptId())) {
                    throw new ServiceException(StringUtil.format("当前用户 [{}] 已在其他单位录入!", user.getCardid()));
                } else {
                    throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));
                }
            }else {
                //没有传 deptId 的情况
                throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));
            }
        }
    }





}

 src/main/java/org/springblade/modules/system/mapper/UserMapper.java

@@ -248,4 +248,6 @@
     * @param experienceList
     */
    void batchExperienceList(@Param("list") List<Experience> experienceList);


}

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -893,4 +893,6 @@
        </foreach>
    </insert>



</mapper>

 src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -365,4 +365,5 @@
     * @return
     */
    List<Map<String, Object>> selectEquipent();

}

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -23,6 +23,7 @@
import com.google.zxing.WriterException;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
@@ -1694,4 +1695,7 @@
    public List<Map<String, Object>> selectEquipent() {
        return baseMapper.selectEquipent();
    }



}