1.单位

tangzy

2021-08-22 fc079917ee5e1dddfc2e873acdefc33483b9fe44

1.单位

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

@@ -29,6 +29,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.jurisdiction.service.JurisdictionService;
import org.springblade.modules.jurisdiction.vo.JurisdictionVO;
import org.springblade.modules.system.entity.Dept;
@@ -799,8 +800,8 @@
     * 保安员统计
     */
    @PostMapping("/selectLi")
    public R selectLi(String jurisdiction, String deptid,Integer current,Integer size) {
        List<Map<Object, Object>> list = informationService.selectLi(jurisdiction, deptid,current,size);
    public R<IPage> selectLi(String jurisdiction, String deptid, Query query) {
        IPage list = informationService.selectLi(Condition.getPage(query),jurisdiction, deptid);
        return R.data(list);
    }


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

@@ -17,6 +17,7 @@
package org.springblade.modules.information.mapper;

import org.apache.ibatis.annotations.Param;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.vo.InformationVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -53,7 +54,7 @@
    Map<String, String> queryYearPz(String year,String jurisdiction,String deptid);
    Map<String, String> queryYearAn(String year,String jurisdiction,String deptid);
    List<Map<Object,Object>> queryCountB(String jurisdiction,String deptid);
    List<Map<Object,Object>> selectLi(String jurisdiction,String deptid,Integer current,Integer size);
    List selectLi(IPage page, String jurisdiction, String deptid);
    List<Map<Object,Object>> queryCountZc(String jurisdiction,String deptid);
    List<Map<Object,Object>> queryCountCz(String jurisdiction,String deptid);
    List<Map<Object,Object>> queryCountSb(String jurisdiction,String deptid);

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

@@ -1061,7 +1061,6 @@
        <if test="deptid!=null and deptid!=''">
            and A.dept_id =#{deptid}
        </if>
        limit #{current},#{size};
    </select>

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

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

@@ -17,6 +17,7 @@
package org.springblade.modules.information.service;

import org.apache.ibatis.annotations.Param;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.vo.InformationVO;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -70,7 +71,7 @@
    Map selectWPcount(String jurisdiction,String deptid);
    List<Map<Object,Object>> selectIn(String jurisdiction);
    void deleteDept(String ids);
    List<Map<Object,Object>> selectLi(String jurisdiction,String deptid,Integer current,Integer size);
    IPage selectLi(IPage<DispatcherVO> page,String jurisdiction, String deptid);
    List<Map<Object,Object>> seCountI(String jurisdiction,String deptid);
    String seCountUm(String jurisdiction,String deptid);
    String seCountUg(String jurisdiction,String deptid);

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

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.information.service.impl;

import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.information.mapper.InformationMapper;
@@ -186,8 +187,8 @@
    }

    @Override
    public List<Map<Object, Object>> selectLi(String jurisdiction, String deptid,Integer current,Integer size) {
        return baseMapper.selectLi(jurisdiction, deptid,current,size);
    public IPage selectLi(IPage page,String jurisdiction, String deptid) {
        return page.setRecords(baseMapper.selectLi(page,jurisdiction, deptid));
    }

    @Override