1.首页接口调整

tangzy

2021-08-23 9ddf06bee3dbd1dde785e2ac7be808c8ee22d56d

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

@@ -26,6 +26,8 @@
        <result column="representativecell" property="representativecell"/>
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
        <result column="businessLicense" property="businessLicense"/>
        <result column="licence" property="licence"/>
    </resultMap>


@@ -861,7 +863,7 @@
        FROM blade_user u
        LEFT JOIN blade_dept d ON d.id = u.dept_id
        LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction
        WHERE u.examination_type = 1
        WHERE u.examination_type = 1 and u.is_deleted=0
        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
            and u.jurisdiction =#{jurisdiction}
        </if>
@@ -1059,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">
@@ -1162,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>

    <!--公司经济情况进入图表-->
@@ -1217,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>


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

    <!--保安人员详情-->
@@ -1299,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">