From b9086588c215b7493682d65d49ed1070d88c3058 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 26 Sep 2023 15:49:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
new file mode 100644
index 0000000..ee948ea
--- /dev/null
+++ b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.api.mapper.AllocationExtensionMapper">
+
+ <!-- ������������������������ deyt template generate -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.AllocationExtension">
+ <id column="id" property="id" />
+ <result column="allocation_id" property="allocationId" />
+ <result column="extension_num" property="extensionNum" />
+ <result column="remake" property="remake" />
+ <result column="state" property="state" />
+ <result column="invalid_reason" property="invalidReason" />
+ </resultMap>
+
+ <!-- ��������������������� -->
+ <sql id="Base_Column_List">
+ id, allocation_id, extension_num, remake, state, is_del, is_invalid, invalid_reason, create_id, create_name, create_time, update_id, update_name, update_time
+ </sql>
+
+ <!-- ��������������������� -->
+ <sql id="AllocationExtension_Column_List">
+ allocationextension.id, allocationextension.allocation_id, allocationextension.extension_num, allocationextension.remake, allocationextension.state, allocationextension.is_del, allocationextension.is_invalid, allocationextension.invalid_reason, allocationextension.create_id, allocationextension.create_name, allocationextension.create_time, allocationextension.update_id, allocationextension.update_name, allocationextension.update_time
+ </sql>
+
+
+ <select id="extOne" resultType="com.moral.api.pojo.ext.allocationextension.AllocationExtensionExt">
+ SELECT
+ <include refid="AllocationExtension_Column_List"/>
+ FROM allocation_extension allocationextension
+ where allocationextension.id = #{id} and allocationextension.is_del = 0
+ </select>
+
+
+ <select id="extPage" resultType="com.moral.api.pojo.ext.allocationextension.AllocationExtensionPageExt">
+ SELECT
+ <include refid="AllocationExtension_Column_List"/>,
+ t1.allocation_num,t1.escalation_time,t1.unit_id,t1.pollute_type,t1.change_type,t1.change_day,t1.escalation_unit_id,t1.escalation_name
+ FROM allocation_extension allocationextension
+ left join allocation t1 on allocationextension.allocation_id = t1.allocation_id
+ <where>
+ 1 = 1 and allocationextension.is_del = 0
+
+ <if test="allocation.unitId != null and allocation.unitId != 0">
+ and t1.unit_id = #{allocation.unitId}
+ </if>
+ <if test="allocation.polluteType != null and allocation.polluteType != 0">
+ and t1.pollute_type = #{allocation.polluteType}
+ </if>
+ <if test="allocation.state != null and allocation.state != 0">
+ and t1.state = #{allocation.state}
+ </if>
+ <if test="allocation.investigationType != null and allocation.investigationType != 0">
+ and t1.investigation_type = #{allocation.investigationType}
+ </if>
+ <if test="allocation.changeType != null and allocation.changeType != 0">
+ and t1.change_type = #{allocation.changeType}
+ </if>
+
+ <if test="allocation.startTime != null and allocation.startTime != '' ">
+ and date(t1.escalation_time) <![CDATA[>=]]> #{allocation.startTime}
+ </if>
+ <if test="allocation.endTime != null and allocation.endTime !='' ">
+ and date(t1.escalation_time) <![CDATA[<=]]> #{allocation.endTime}
+ </if>
+
+ </where>
+ order by t1.escalation_time desc,t1.allocation_id desc
+ </select>
+</mapper>
--
Gitblit v1.8.0