新增暂存及图片功能

heheng

4 days ago f038e7d0338375025baa96986c5f1990abd990b9

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

@@ -23,6 +23,8 @@
        <result column="update_by" property="updateBy"/>
        <result column="update_time" property="updateTime"/>
        <result column="check_type" property="checkType"/>
        <result column="scratchpad" property="scratchpad"/>
        <result column="check_pics" property="checkPics"/>

        <!--        <collection  property="dailySafetyInspectionUsers"   ofType="com.gkhy.system.domain.DailySafetyInspectionUser"  column="id = id" select="selectDailySafetyInspectionUsers" />-->
        <collection property="dailySafetyInspectionDepts" ofType="com.gkhy.system.domain.DailySafetyInspectionDept"
@@ -66,8 +68,14 @@
<!--        <if test="researchGroup != null ">-->
<!--            and a.research_group = #{researchGroup}-->
<!--        </if>-->
        <if test="createById != null ">
            and a.create_by_id = #{createById}
        </if>
        <if test="checkType != null ">
            and a.check_type = #{checkType}
        </if>
        <if test="scratchpad != null ">
            and a.scratchpad = #{scratchpad}
        </if>
        <if test="checkBeginDate != null ">
            <!-- 开始时间检索 -->
@@ -111,7 +119,19 @@
        from daily_safety_inspection_dept a
            inner join daily_safety_inspection b on a.daily_safety_inspection_id = b.id
        where b.del_flag = 0
          and a.dept_id = #{deptId}
          and a.dept_id = #{deptId} and b.scratchpad = 2
          and date_format(b.check_date, '%Y%m') = date_format(now(), '%Y%m')
    </select>

    <select id="getCheckCountList" parameterType="java.util.List" resultType="int">
        select count(*)
        from daily_safety_inspection_dept a
                 inner join daily_safety_inspection b on a.daily_safety_inspection_id = b.id and b.scratchpad = 2
        where b.del_flag = 0
        and a.dept_id in
        <foreach collection="list" item="deptId" open="(" separator="," close=")">
            #{deptId}
        </foreach>
          and date_format(b.check_date, '%Y%m') = date_format(now(), '%Y%m')
    </select>
</mapper>