功能改造

heheng

2025-09-23 733d48f803a002033c5f1d6c22dcc799bf1b724c

 gkhy-system/src/main/resources/mapper/system/DailySafetyInspectionMapper.xml

@@ -15,6 +15,7 @@
        <result column="rectification_measures" property="rectificationMeasures" />
        <result column="examination_results" property="examinationResults" />
        <result column="re_check_user_id" property="reCheckUserId" />
        <result column="check_user" property="checkUser" />
        <result column="re_check_user" property="reCheckUser" />
        <result column="re_check_date" property="reCheckDate" />
        <result column="remark" property="remark" />
@@ -23,8 +24,9 @@
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="check_type" property="checkType" />

        <collection  property="dailySafetyInspectionUsers"   ofType="com.gkhy.system.domain.DailySafetyInspectionUser"  column="id = id" select="selectDailySafetyInspectionUsers" />
<!--        <collection  property="dailySafetyInspectionUsers"   ofType="com.gkhy.system.domain.DailySafetyInspectionUser"  column="id = id" select="selectDailySafetyInspectionUsers" />-->

    </resultMap>

@@ -48,9 +50,37 @@
        <if test="researchGroup != null ">
            and a.research_group = #{researchGroup}
        </if>
        <if test="searchCheckUserId != null ">
            and a.id in (select daily_safety_inspection_id from daily_safety_inspection_user where check_user_id = #{searchCheckUserId})
        <if test="checkType != null ">
            and a.check_type = #{checkType}
        </if>
        <if test="checkBeginDate != null "><!-- 开始时间检索 -->
            AND date_format(a.check_date,'%Y%m%d') &gt;= date_format(#{checkBeginDate},'%Y%m%d')
        </if>
        <if test="checkEndDate != null "><!-- 结束时间检索 -->
            AND date_format(a.check_date,'%Y%m%d') &lt;= date_format(#{checkEndDate},'%Y%m%d')
        </if>
        <if test="haveMainHazard != null and haveMainHazard == 0 ">
            and (a.main_hazard = '无' or a.main_hazard = ' ')
        </if>
        <if test="haveMainHazard != null and haveMainHazard == 1 ">
            and (a.main_hazard != '无' and a.main_hazard != ' ')
        </if>
        <if test="checkUser != null and checkUser != ''">
            and a.check_user like concat('%',#{checkUser},'%')
        </if>
<!--        <if test="searchCheckUserIds != null and !searchCheckUserIds.isEmpty()">-->
<!--            and a.id in (-->
<!--            select distinct daily_safety_inspection_id from daily_safety_inspection_user-->
<!--            where check_user_id in    <foreach collection="searchCheckUserIds" item="group" open="(" separator="," close=")">-->
<!--            #{group}-->
<!--        </foreach>-->
<!--            )-->
<!--        </if>-->
        order by a.create_time desc
    </select>


    <select id="getCheckCount" parameterType="long" resultType="int">
        select count(*) from daily_safety_inspection where del_flag = 0 and research_group = #{deptId} and date_format(check_date,'%Y%m') = date_format(now(),'%Y%m')
    </select>
</mapper>