1.首页接口调整

tangzy

2021-08-23 9ddf06bee3dbd1dde785e2ac7be808c8ee22d56d

1.首页接口调整

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

@@ -834,8 +834,8 @@
     * 公司运营情况进入图表
     */
    @PostMapping("/selectTb")
    public R selectTb(String jurisdiction, String enterpriseName, Integer current, Integer size) {
        List<Map<Object, Object>> list = informationService.selectTb(jurisdiction, enterpriseName, current, size);
    public R<IPage> selectTb(String jurisdiction, String enterpriseName, Query query) {
        IPage list =informationService.selectTb(Condition.getPage(query),jurisdiction, enterpriseName);
        return R.data(list);
    }

@@ -843,8 +843,8 @@
     * 公司经济情况进入图表
     */
    @PostMapping("/selectJj")
    public R selectJj(String jurisdiction, String enterpriseName, Integer current, Integer size) {
        List<Map<Object, Object>> list = informationService.selectJj(jurisdiction, enterpriseName, current, size);
    public R<IPage> selectJj(String jurisdiction, String enterpriseName, Query query) {
        IPage list = informationService.selectJj(Condition.getPage(query),jurisdiction, enterpriseName);
        return R.data(list);
    }

@@ -852,8 +852,8 @@
     * 业务统计情况
     */
    @PostMapping("/selectYw")
    public R selectYw(String jurisdiction, String deptid,Integer current,Integer size) {
        List<Map<Object, Object>> list = informationService.selectYw(jurisdiction, deptid,current,size);
    public R<IPage> selectYw(String jurisdiction, String deptid, Query query) {
        IPage list = informationService.selectYw(Condition.getPage(query),jurisdiction, deptid);
        return R.data(list);
    }

@@ -870,8 +870,8 @@
     * 业务统计明细
     */
    @PostMapping("/selectDis")
    public R selectDis(String jurisdiction, String deptid, String fid, Integer current, Integer size) {
        List<Map<Object, Object>> list = informationService.selectDis(jurisdiction, deptid, fid, current, size);
    public R<IPage> selectDis(String jurisdiction, String deptid, String fid, Query query) {
        IPage list = informationService.selectDis(Condition.getPage(query),jurisdiction, deptid, fid);
        return R.data(list);
    }


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

@@ -60,7 +60,7 @@
    List<Map<Object,Object>> queryCountSb(String jurisdiction,String deptid);
    List<Map<Object,Object>> queryCountKh(String jurisdiction,String deptid);
    List<Map<Object,Object>> queryCountPq(String jurisdiction,String deptid);
    List<Map<Object,Object>> selectYw(String jurisdiction,String deptid,Integer current,Integer size);
    List selectYw(IPage page,String jurisdiction,String deptid);
    List<Map<Object,Object>> selectUIn(String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil);
    List<Map<Object,Object>> selectJur();
    int selectExtypeUser();
@@ -72,9 +72,9 @@
    String seCountUm(String jurisdiction,String deptid);
    String seCountUg(String jurisdiction,String deptid);
    List<Map<Object,Object>> selectIn(String jurisdiction);
    List<Map<Object,Object>> selectTb(String jurisdiction,String enterpriseName,Integer current,Integer size);
    List<Map<Object,Object>> selectJj(String jurisdiction,String enterpriseName,Integer current,Integer size);
    List<Map<Object,Object>> selectDis(String jurisdiction,String deptid,String fid,Integer current,Integer size);
    List selectTb(IPage page, String jurisdiction,String enterpriseName);
    List selectJj(IPage page, String jurisdiction,String enterpriseName);
    List selectDis(IPage page,String jurisdiction,String deptid,String fid);
    List<Map<Object,Object>> selectFw();

    Map<String, String> queryYearZ(String year,String jurisdiction,String deptid);

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

@@ -1163,8 +1163,7 @@
            and J.enterpriseName like concat('%', #{enterpriseName},'%')
        </if>
        GROUP BY J.enterpriseName,
        J.departmentid, J.cznum, J.ghnum, J.ghnum, J.pcnum, J.sbnum, J.zcnum, J.znum, J.jurname,J.jurisdiction limit
        #{current},#{size};
        J.departmentid, J.cznum, J.ghnum, J.ghnum, J.pcnum, J.sbnum, J.zcnum, J.znum, J.jurname,J.jurisdiction
    </select>

    <!--公司经济情况进入图表-->
@@ -1218,7 +1217,6 @@
            and J.enterpriseName like concat('%', #{enterpriseName},'%')
        </if>
        GROUP BY J.departmentid, J.enterpriseName, J.jurisdiction, J.jurname, J.pcnum, J.sbcount, J.sbnum, J.zb, J.znum
        limit #{current},#{size};
    </select>


@@ -1234,6 +1232,7 @@
        SELECT
        i.enterpriseName,
        i.departmentid,
        i.jurisdiction,
        j.dept_name
        FROM
        sys_information i
@@ -1252,7 +1251,6 @@
        <if test="deptid!=null and deptid!=''">
            and A.departmentid=#{deptid}
        </if>
        limit #{current},#{size};
    </select>

    <!--保安人员详情-->
@@ -1300,7 +1298,6 @@
        <if test="fid!=null and fid!=''">
            and di.dispatcher_unit_id=#{fid}
        </if>
        limit #{current},#{size};
    </select>
    <!--服务单位下拉-->
    <select id="selectFw" resultType="java.util.HashMap">

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

@@ -71,16 +71,16 @@
    Map selectWPcount(String jurisdiction,String deptid);
    List<Map<Object,Object>> selectIn(String jurisdiction);
    void deleteDept(String ids);
    IPage selectLi(IPage<DispatcherVO> page,String jurisdiction, String deptid);
    IPage selectLi(IPage<List> 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);
    Map<String, String> queryYearPz(String year,String jurisdiction,String deptid);
    List<Map<Object,Object>> selectTb(String jurisdiction,String enterpriseName,Integer current,Integer size);
    List<Map<Object,Object>> selectJj(String jurisdiction,String enterpriseName,Integer current,Integer size);
    List<Map<Object,Object>> selectYw(String jurisdiction,String deptid,Integer current,Integer size);
    IPage selectTb(IPage<List> page,String jurisdiction,String enterpriseName);
    IPage  selectJj(IPage<List> page,String jurisdiction,String enterpriseName);
    IPage selectYw(IPage<List> page,String jurisdiction,String deptid);
    List<Map<Object,Object>> selectUIn(String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil);
    List<Map<Object,Object>> selectDis(String jurisdiction,String deptid,String fid,Integer current,Integer size);
    IPage selectDis(IPage<List> page,String jurisdiction,String deptid,String fid);
    List<Map<Object,Object>> selectFw();
    List<Map<Object,Object>> selectCf(String jurisdiction);
    List<Map<Object,Object>> selectCl(String jurisdiction);

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

@@ -212,18 +212,18 @@
    }

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

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

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

    @Override
@@ -232,8 +232,8 @@
    }

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

    @Override