whycrzh
2021-01-23 d1491636bcc06c9bb23b4955c3d8d0bfe7749e6d
update userInf.byCondition
6个文件已修改
56 ■■■■■ 已修改文件
src/main/java/com/fgkj/controller/User_infController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/mapper/impl/User_ChartMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/mapper/impl/User_infMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/services/User_ChartService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/services/User_infService.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/UserInfMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/controller/User_infController.java
@@ -76,23 +76,19 @@
        return model;
    }
    @GetMapping("byCondition")
    public ServiceModel serchByCondition() {
        ServiceModel model = new ServiceModel();
        //System.out.println(result);
        return model;
    public ServiceModel serchByCondition(@RequestBody User_inf uif) {
        return service.serchByCondition(uif);
    }
    @GetMapping("all")
    public ServiceModel searchAll(@RequestBody Batt_User_Permit bup) {
        ServiceModel model = new ServiceModel();
        if(bup==null){
            model=service.searchAll();
        }else{
            model = service.searchAll2(bup);
        System.out.println("bup = " + bup);
        if (bup.getPageBean() == null) {
            model = service.searchAll();
        } else {
            model = service.searchAll(bup);
        }
        //System.out.println(result);
        return model;
    }    
    //根据员工信息和员工编号去匹配合适的员工
src/main/java/com/fgkj/mapper/impl/User_ChartMapper.java
@@ -28,7 +28,7 @@
   //根据用户id查图表
    @Select("select distinct(chart_file) from web_site.tb_user_Chart,db_user.tb_user_inf " +
            " where web_site.tb_user_Chart.chart_name=db_user.tb_user_inf.ujobgroup  " +
            " and db_user.tb_user_inf.uname=#{UName}")
            " and db_user.tb_user_inf.uname=#{uName}")
    public List<User_Chart> serchByCondition(User_inf obj);
   //根据chart_file和列名查询图片(Chart_name放列名字)
src/main/java/com/fgkj/mapper/impl/User_infMapper.java
@@ -32,7 +32,8 @@
    public int del(User_inf obj);
    
    //首页会根据uname查询用户信息
    public List serchByCondition(Object obj);
    @Select("select uid,uname,uSnId,upassword,unote from db_user.tb_user_inf where uname=#{uName}")
    public List<User_inf> serchByCondition(User_inf obj);
    //查询当前库中存在的name名字的排序(模糊)
    public List serchinfoUname() ;
src/main/java/com/fgkj/services/User_ChartService.java
@@ -55,6 +55,7 @@
    }
    //查询所有图标
    public ServiceModel searchAll(){
        ServiceModel model = new ServiceModel();
        List list=mapper.searchAll();
        if(list!=null&&list.size()>0){
            model.setCode(1);
@@ -71,6 +72,7 @@
    }
    //根据用户id查图表
    public ServiceModel serchByCondition(User_inf obj){
        ServiceModel model = new ServiceModel();
        List list=mapper.serchByCondition(obj);
        if(list!=null&&list.size()>0){
            model.setCode(1);
@@ -85,6 +87,7 @@
    
    //根据chartfile和列名查具体的图片
    public ServiceModel serchByInfo(User_Chart obj){
        ServiceModel model = new ServiceModel();
        List list=mapper.serchByInfo(obj);//TODO java.lang.NoSuchMethodException: java.sql.Blob.<init>()
        if(list!=null&&list.size()>0){
            model.setCode(1);
src/main/java/com/fgkj/services/User_infService.java
@@ -83,7 +83,7 @@
        return model;
    }
    
    public ServiceModel serchByCondition(Object obj) {
    public ServiceModel serchByCondition(User_inf obj) {
        List list = mapper.serchByCondition(obj);
        /*
         * for (Object object : list) { System.out.println(object); }
@@ -99,9 +99,6 @@
    public ServiceModel searchAll() {
        List<User_inf> list = mapper.searchAll();
        /*
         * for (User_inf u : list) { System.out.println(u); }
         */
        if (list != null && list.size() > 0) {
            model.setCode(1);
@@ -158,36 +155,25 @@
    }
    // 5.1查询员工的所有信息
    public ServiceModel searchAll2(Batt_User_Permit bup) {
        // System.out.println((Batt_User_Permit)obj);
    public ServiceModel searchAll(Batt_User_Permit bup) {
        ServiceModel model = new ServiceModel();
        //分页
        PageBean pageBean = bup.getPageBean();
        PageHelper.startPage(pageBean.getPageNum(),pageBean.getPageSize(),true);
        List<Batt_User_Permit> list = mapper.searchAll2(bup);// 存放的是员工信息
        List<Batt_User_Permit> listd =new ArrayList<>();
        int index=0;
        for(int i=(bup.getPageBean().getPageCurr()-1)*bup.getPageBean().getPageSize();i<bup.getPageBean().getPageSize()*bup.getPageBean().getPageCurr()&&i<list.size();i++){
//            listd.add((Batt_User_Permit) list.get(i));
            Batt_User_Permit batt_user_permit = list.get(i);
            batt_user_permit.setPageBean(new PageBean());
            listd.add(batt_user_permit);
            System.out.println(list.get(i));
            ((Batt_User_Permit)listd.get(index++)).getPageBean().setPageAll(list.size());
        }
        list=listd;
        if (list != null && list.size() > 0) {
            model.setCode(1);
            for (int i = 0; i < list.size(); i++) {
                ServiceModelImpl model1 = upservice.serchByCondition(list.get(i).getUinf());// 存放权限
                // System.out.println(model1.getMsgN());
                if (model1.getCode() > 0) {
                    //TODO perry
                     list.get(i).getUinf().setPermitgroupName(model1.getMsgN());
                } else {
                    list.get(i).getUinf().setPermitgroupName("");
                }
            }
            model.setData(list);
            PageInfo<Batt_User_Permit> pageInfo = new PageInfo<>(list);
            model.setData(pageInfo);
        }
        // System.out.println(model);
        return model;
src/main/resources/mapper/UserInfMapper.xml
@@ -609,7 +609,7 @@
<!--    <update id="updatePassword"></update>-->
<!--    <update id="resetPassword"></update>-->
<!--    <delete id="del"></delete>-->
    <select id="serchByCondition" resultType="java.util.List"></select>
<!--    <select id="serchByCondition" resultType="java.util.List"></select>-->
    <select id="serchinfoUname" resultType="java.util.List"></select>
<!--    <select id="serchByInfo" resultType="java.util.List"></select>-->
<!--    <select id="searchByBattGroupId" resultType="java.util.List"></select>-->