From fcc62c9f3b829b51eb8f0607d9276c49b63c6331 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 14:24:57 +0800
Subject: [PATCH] 零件统计问题修复
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
index e491501..1552fe3 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWorkCalendarMapper">
-
+
<resultMap type="ApsWorkCalendar" id="ApsWorkCalendarResult">
<result property="id" column="id" />
<result property="description" column="description" />
@@ -29,8 +29,8 @@
<where>
<if test="description != null and description != ''"> and description like '%' || #{description} || '%'</if>
<if test="type != null and type != ''"> and type = #{type}</if>
- <if test="effectiveDate != null "> and effective_date = #{effectiveDate}</if>
- <if test="expiringDate != null "> and expiring_date = #{expiringDate}</if>
+ <if test="effectiveDate != null "> and effective_date >= #{effectiveDate}</if>
+ <if test="expiringDate != null "> and expiring_date <= #{expiringDate}</if>
<if test="content != null and content != ''"> and content = #{content}</if>
<if test="applicableFactory != null and applicableFactory != ''"> and applicable_factory = #{applicableFactory}</if>
<if test="applicableWorkshop != null and applicableWorkshop != ''"> and applicable_workshop = #{applicableWorkshop}</if>
@@ -66,7 +66,7 @@
<if test="type != null">#{type},</if>
<if test="effectiveDate != null">#{effectiveDate},</if>
<if test="expiringDate != null">#{expiringDate},</if>
- <if test="content != null">#{content},</if>
+ <if test="content != null">#{content, typeHandler=com.aps.core.typeHandler.JsonTypeHandler, jdbcType=OTHER},</if>
<if test="applicableFactory != null">#{applicableFactory},</if>
<if test="applicableWorkshop != null">#{applicableWorkshop},</if>
<if test="applicableProcess != null">#{applicableProcess},</if>
@@ -84,7 +84,7 @@
<if test="type != null">type = #{type},</if>
<if test="effectiveDate != null">effective_date = #{effectiveDate},</if>
<if test="expiringDate != null">expiring_date = #{expiringDate},</if>
- <if test="content != null">content = #{content},</if>
+ <if test="content != null">content = #{content , typeHandler=com.aps.core.typeHandler.JsonTypeHandler, jdbcType=OTHER},</if>
<if test="applicableFactory != null">applicable_factory = #{applicableFactory},</if>
<if test="applicableWorkshop != null">applicable_workshop = #{applicableWorkshop},</if>
<if test="applicableProcess != null">applicable_process = #{applicableProcess},</if>
--
Gitblit v1.9.3