From 3e73044e15a9df4d95c937fef30339a874e1925f Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Thu, 31 Oct 2019 10:16:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B6=E9=85=B8update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mainOrm/master/FolviteMapper.xml     | 27 ++++++++++++++--------
 .../mainOrm/master/FolviteReceiveMapper.xml        | 24 +++++++++++++++----
 .../operate/web/controller/FolviteController.java  |  1 -
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
index 7e50c9d..4229aed 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
@@ -38,6 +38,7 @@
         <result column="hospitalid" property="hospitalId"/>
         <result column="modify" property="modify"/>
         <result column="receivesum" property="receiveSum"/>
+        <result column="drawTime" property="drawTime"/>
     </resultMap>
 
 
@@ -76,20 +77,22 @@
         created AS created,
         vc_card AS vcCard,
         receivesum as receiveSum,
-        hospitalid as hospitalId
+        hospitalid as hospitalId,
+        drawTime as drawTime
         FROM
         lyms_folvite_Info
-        <include refid="sqlWhere"/>
+        <include refid="whereSql"/>
     </select>
 
-    <select id="queryFolviteListCount" parameterType="com.lyms.platform.permission.model.FolviteQuery" resultType="java.lang.Integer">
-        select count(id) from  lyms_folvite_Info
-        <include refid="sqlWhere"/>
+    <select id="queryFolviteListCount" parameterType="com.lyms.platform.permission.model.FolviteQuery"
+            resultType="java.lang.Integer">
+        select count(id) from lyms_folvite_Info
+        <include refid="whereSql"/>
     </select>
 
 
-
-    <select id="queryFolviteList" parameterType="com.lyms.platform.permission.model.FolviteQuery" resultMap="folviteResultMap">
+    <select id="queryFolviteList" parameterType="com.lyms.platform.permission.model.FolviteQuery"
+            resultMap="folviteResultMap">
         SELECT
         id AS id,
         NAME AS NAME,
@@ -124,7 +127,8 @@
         created AS created,
         vc_card AS vcCard,
         receivesum as receiveSum,
-        hospitalid as hospitalId
+        hospitalid as hospitalId,
+        drawTime as drawTime
         FROM
         lyms_folvite_Info
         <include refid="whereSql"/>
@@ -166,7 +170,8 @@ INSERT INTO lyms_folvite_Info (
 	created,
 	vc_card,
 	hospitalid,
-	receivesum
+	receivesum,
+	drawTime
 )
 VALUES
 	(
@@ -204,6 +209,7 @@ VALUES
 		#{vcCard,jdbcType=VARCHAR},
 		#{hospitalid,jdbcType=VARCHAR},
 		#{receivesum,jdbcType=INTEGER})
+		#{drawTime,jdbcType=TIMESTAMP}
     </insert>
 
 
@@ -341,6 +347,9 @@ VALUES
             <if test="modify != null">
                 modify=#{modify,jdbcType=TIMESTAMP},
             </if>
+            <if test="drawTime !=null">
+                drawTime=#{drawTime,jdbcType=TIMESTAMP}
+            </if>
 
         </set>
     </sql>
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
index 9f0930f..ddd40b9 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -26,7 +26,8 @@ INSERT INTO lyms_folvite_provide (
 	ISSUER,
 	receive_date,
 	creation_date,
-	modified
+	modified,
+	isconceive
 )
 VALUES
 	(
@@ -40,9 +41,11 @@ VALUES
 		#{receiveDate,jdbcType=TIMESTAMP},
 		#{creationDate,jdbcType=TIMESTAMP},
 		#{modified,jdbcType=TIMESTAMP})
+		#{isconceive,jdbcType=INTEGER}
     </insert>
 
-    <select id="queryFolviteReceiveList" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"  resultMap="folviteReceiveResultMap">
+    <select id="queryFolviteReceiveList" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
+            resultMap="folviteReceiveResultMap">
         SELECT
         id AS id,
         folvite_id AS folviteId,
@@ -53,7 +56,8 @@ VALUES
         ISSUER AS ISSUER,
         receive_date AS receiveDate,
         creation_date AS creationDate,
-        modified AS modified
+        modified AS modified,
+        isconceive as isconceive
         FROM
         lyms_folvite_provide
         <include refid="whereSql"/>
@@ -70,7 +74,12 @@ VALUES
     <sql id="whereSql">
         1=1
         <where>
-
+            <if test="folviteId != null">
+                and folviteId=#{folviteId}
+            </if>
+            <if test="">
+                and id=#{id}
+            </if>
 
         </where>
 
@@ -116,6 +125,10 @@ VALUES
             <if test="modified != null">
                 modified=#{modified,jdbcType=TIMESTAMP},
             </if>
+            <if test="isconceive != null">
+                isconceive=#{isconceive,jdbcType=INTEGER}
+            </if>
+
         </set>
     </sql>
 
@@ -131,7 +144,8 @@ SELECT
 	ISSUER AS ISSUER,
 	receive_date AS receiveDate,
 	creation_date AS creationDate,
-	modified AS modified
+	modified AS modified,
+	isconceive as  isconceive
 FROM
 	lyms_folvite_provide
 where id=#{id,jdbcType=VARCHAR}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
index 79ba5ad..2b1f112 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
@@ -6,7 +6,6 @@ import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.operate.web.service.FolviteService;
 import com.lyms.platform.pojo.FolviteReceiveRecordModel;
 import com.lyms.platform.pojo.FolviteRecordModel;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-- 
1.8.3.1