From e79d8c8f9679839bf983341fe2cf3212e1bb3001 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Mon, 28 Oct 2024 14:44:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/CaseDispMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/CaseDispMapper.xml b/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/CaseDispMapper.xml
index 35044aa..e4edf22 100644
--- a/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/CaseDispMapper.xml
+++ b/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/CaseDispMapper.xml
@@ -5,10 +5,10 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-09-03 10:20:49
+ * @time:2024-09-08 15:33:39
* @version 1.0.0
-->
-<mapper namespace="cn.huge.module.disp.dao.mapper.CaseDispMapper">
+<mapper namespace="cn.huge.module.casedisp.dao.mapper.CaseDispMapper">
<!-- 结果集 -->
<resultMap id="dataResult" type="cn.huge.module.casedisp.domain.po.CaseDisp">
<result property="id" column="id"/>
@@ -25,6 +25,8 @@
<result property="targetTypeName" column="target_type_name"/>
<result property="targetId" column="target_id"/>
<result property="targetName" column="target_name"/>
+ <result property="targetUnitGrade" column="target_unit_grade"/>
+ <result property="targetUnitType" column="target_unit_type"/>
<result property="dispTime" column="disp_time"/>
<result property="dispStatus" column="disp_status"/>
<result property="custId" column="cust_id"/>
@@ -50,6 +52,8 @@
target_type_name,
target_id,
target_name,
+ target_unit_grade,
+ target_unit_type,
disp_time,
disp_status,
cust_id,
@@ -72,6 +76,8 @@
<if test="entity.targetTypeName != null">target_type_name = #{entity.targetTypeName},</if>
<if test="entity.targetId != null">target_id = #{entity.targetId},</if>
<if test="entity.targetName != null">target_name = #{entity.targetName},</if>
+ <if test="entity.targetUnitGrade != null">target_unit_grade = #{entity.targetUnitGrade},</if>
+ <if test="entity.targetUnitType != null">target_unit_type = #{entity.targetUnitType},</if>
<if test="entity.dispTime != null">disp_time = #{entity.dispTime},</if>
<if test="entity.dispStatus != null">disp_status = #{entity.dispStatus},</if>
<if test="entity.custId != null">cust_id = #{entity.custId},</if>
@@ -125,6 +131,12 @@
<if test="terms.targetName != null and terms.targetName !=''">
and target_name = #{terms.targetName}
</if>
+ <if test="terms.targetUnitGrade != null and terms.targetUnitGrade !=''">
+ and target_unit_grade = #{terms.targetUnitGrade}
+ </if>
+ <if test="terms.targetUnitType != null and terms.targetUnitType !=''">
+ and target_unit_type = #{terms.targetUnitType}
+ </if>
<if test="terms.dispTime != null and terms.dispTime !=''">
and disp_time = #{terms.dispTime}
</if>
--
Gitblit v1.8.0