Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSyst...

郑永安

2023-07-24 0645153dfa233b51a749db73f9bd5a8c5127c595

 src/main/java/com/gk/hotwork/Mapper/mybatis/SafetySelfInspectionMapper.xml

@@ -14,7 +14,7 @@

    <result column="inspection_name" property="inspectionName" jdbcType="BIGINT" />
    <result column="inspection_time" property="inspectionTime" jdbcType="BIGINT" />
    <result column="inspector" property="inspector" jdbcType="VARCHAR" />
    <result column="inspector" property="inspector" jdbcType="BIGINT" />
    <result column="status" property="status" jdbcType="VARCHAR" />
    <result column="inspector_name" property="inspectorName" jdbcType="VARCHAR" />

@@ -27,14 +27,14 @@
    LEFT JOIN userroles as c on b.id = c.userid
    left join company as co on a.checked_company_id = co.id
    where a.valid_flag = 1
    <if test="params.flag != null  and params.flag != '' ">
      and a.flag = #{params.flag}
    </if>
    <if test="params.inspectionName != null  and params.inspectionName != ''">
      and a.inspection_name like concat("%",#{params.inspectionName},"%")
    </if>
    <if test="params.companyid != null  and params.companyid != ''">
      and b.companyid = #{params.companyid}
    </if>
    <if test="params.checkedCompanyId != null">
      and b.checkedCompanyId = #{params.checkedCompanyId}
      and a.checked_company_id = #{params.checkedCompanyId}
    </if>
    <if test="params.roleid != null ">
      and c.roleid = #{params.roleid}