Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f

 cnas-server/src/main/resources/mapper/CnasAnnualPlanMapper.xml

@@ -4,26 +4,26 @@
    <!--查询审核计划-->
    <select id="selectAllList" resultType="com.yuanchu.limslaboratory.pojo.vo.CnasAnnualPlanVo">
        select id,
               audit_type,
               department,
               audit_purpose,
               audit_leader,
               audit_emp,
               audit_pursuant,
               audit_scope,
               write_user,
               keyboarder,
               plan_time,
               count,
               audit_state,
               state,
               audit_time,
               create_time,
               update_time
        audit_type,
        department,
        audit_purpose,
        audit_leader,
        audit_emp,
        audit_pursuant,
        audit_scope,
        write_user,
        keyboarder,
        plan_time,
        count,
        state,
        audit_time,
        update_time
        from cnas_annual_plan
        where state = 1
          <if test="beginTime != null and endTime != null">
              and plan_time between #{beginTime} and #{endTime}
          </if>
        <if test="year != null and month != null">
            and year(plan_time) = #{year}
            and month(plan_time) = #{month}
        </if>
        order by id desc
    </select>
</mapper>