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 @@ + @@ -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 - + - + select count(id) from lyms_folvite_Info + - - 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 @@ -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} @@ -341,6 +347,9 @@ VALUES modify=#{modify,jdbcType=TIMESTAMP}, + + drawTime=#{drawTime,jdbcType=TIMESTAMP} + 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} - 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 @@ -70,7 +74,12 @@ VALUES 1=1 - + + and folviteId=#{folviteId} + + + and id=#{id} + @@ -116,6 +125,10 @@ VALUES modified=#{modified,jdbcType=TIMESTAMP}, + + isconceive=#{isconceive,jdbcType=INTEGER} + + @@ -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.*;