From 9f88cc2af7eb19939aa312d300c7389747ee74d7 Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Thu, 31 Oct 2019 11:43:27 +0800
Subject: [PATCH] bug update
---
.../resources/mainOrm/master/FolviteMapper.xml | 147 ++++++++++-----------
platform-dal/pom.xml | 8 +-
.../com/lyms/platform/pojo/FolviteRecordModel.java | 12 +-
platform-operate-api/pom.xml | 17 +++
.../operate/web/controller/FolviteController.java | 23 +++-
.../operate/web/service/FolviteService.java | 2 +
.../web/service/impl/FolviteServiceImpl.java | 5 +
7 files changed, 134 insertions(+), 80 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 4229aed..f941d8c 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
@@ -136,80 +136,79 @@
-INSERT INTO lyms_folvite_Info (
- id,
- NAME,
- sex,
- birthday,
- nationality,
- nation,
- marital_status,
- certificate_type,
- card_no,
- census_type,
- live_type,
- education,
- occupation,
- phone,
- work_unit,
- habitation_province,
- habitation_city,
- habitation_area,
- habitation_country,
- habitation_address,
- domicile_province,
- domicile_city,
- domicile_area,
- domicile_country,
- domicile_address,
- woman_id,
- isconceive,
- lastmenstrual,
- ispregnancy,
- operation_doctor,
- created,
- vc_card,
- hospitalid,
- receivesum,
- drawTime
-)
-VALUES
- (
- #{id,jdbcType=VARCHAR},
- #{name,jdbcType=VARCHAR},
- #{sex,jdbcType=BIGINT},
- #{birthday,jdbcType=TIMESTAMP},
- #{nationality,jdbcType=VARCHAR},
- #{nation,jdbcType=VARCHAR},
- #{maritalStatus,jdbcType=VARCHAR},
- #{certificateType,jdbcType=VARCHAR},
- #{cardNo,jdbcType=VARCHAR},
- #{censusType,jdbcType=VARCHAR},
- #{liveType,jdbcType=VARCHAR},
- #{education,jdbcType=VARCHAR},
- #{occupation,jdbcType=VARCHAR},
- #{phone,jdbcType=VARCHAR},
- #{workUnit,jdbcType=VARCHAR},
- #{habitationProvince,jdbcType=VARCHAR},
- #{habitationCity,jdbcType=VARCHAR},
- #{habitationArea,jdbcType=VARCHAR},
- #{habitationCountry,jdbcType=VARCHAR},
- #{habitationAddress,jdbcType=VARCHAR},
- #{domicileProvince,jdbcType=VARCHAR},
- #{domicileCity,jdbcType=VARCHAR},
- #{domicileArea,jdbcType=VARCHAR},
- #{domicileCountry,jdbcType=VARCHAR},
- #{domicileAddress,jdbcType=VARCHAR},
- #{womanId,jdbcType=VARCHAR},
- #{isconceive,jdbcType=BIGINT},
- #{lastmenstrual,jdbcType=TIMESTAMP},
- #{ispregnancy,jdbcType=BIGINT},
- #{operationDoctor,jdbcType=VARCHAR},
- #{created,jdbcType=TIMESTAMP},
- #{vcCard,jdbcType=VARCHAR},
- #{hospitalid,jdbcType=VARCHAR},
- #{receivesum,jdbcType=INTEGER})
- #{drawTime,jdbcType=TIMESTAMP}
+INSERT INTO lyms_folvite_Info(
+id,
+name,
+sex,
+birthday,
+nationality,
+nation,
+marital_status,
+certificate_type,
+card_no,
+census_type,
+live_type,
+education,
+occupation,
+phone,
+work_unit,
+habitation_province,
+habitation_city,
+habitation_area,
+habitation_country,
+habitation_address,
+domicile_province,
+domicile_city,
+domicile_area,
+domicile_country,
+domicile_address,
+woman_id,
+isconceive,
+lastmenstrual,
+ispregnancy,
+operation_doctor,
+created,
+vc_card,
+hospitalid,
+receivesum,
+modify,
+drawTime ) VALUES (
+#{id,jdbcType=VARCHAR},
+#{name,jdbcType=VARCHAR},
+#{sex,jdbcType=BIGINT},
+#{birthday,jdbcType=TIMESTAMP},
+#{nationality,jdbcType=VARCHAR},
+#{nation,jdbcType=VARCHAR},
+#{maritalStatus,jdbcType=VARCHAR},
+#{certificateType,jdbcType=VARCHAR},
+#{cardNo,jdbcType=VARCHAR},
+#{censusType,jdbcType=VARCHAR},
+#{liveType,jdbcType=VARCHAR},
+#{education,jdbcType=VARCHAR},
+#{occupation,jdbcType=VARCHAR},
+#{phone,jdbcType=VARCHAR},
+#{workUnit,jdbcType=VARCHAR},
+#{habitationProvince,jdbcType=VARCHAR},
+#{habitationCity,jdbcType=VARCHAR},
+#{habitationArea,jdbcType=VARCHAR},
+#{habitationCountry,jdbcType=VARCHAR},
+#{habitationAddress,jdbcType=VARCHAR},
+#{domicileProvince,jdbcType=VARCHAR},
+#{domicileCity,jdbcType=VARCHAR},
+#{domicileArea,jdbcType=VARCHAR},
+#{domicileCountry,jdbcType=VARCHAR},
+#{domicileAddress,jdbcType=VARCHAR},
+#{womanId,jdbcType=VARCHAR},
+#{isconceive,jdbcType=BIGINT},
+#{lastmenstrual,jdbcType=TIMESTAMP},
+#{ispregnancy,jdbcType=BIGINT},
+#{operationDoctor,jdbcType=VARCHAR},
+#{created,jdbcType=TIMESTAMP},
+#{vcCard,jdbcType=VARCHAR},
+#{hospitalId,jdbcType=VARCHAR},
+#{receiveSum,jdbcType=INTEGER},
+#{modify,jdbcType=TIMESTAMP},
+#{drawTime,jdbcType=TIMESTAMP})
diff --git a/platform-dal/pom.xml b/platform-dal/pom.xml
index 40c0e8a..e608865 100644
--- a/platform-dal/pom.xml
+++ b/platform-dal/pom.xml
@@ -16,7 +16,13 @@
platform-common
1.0.1
-
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ 2.9.0
+ compile
+
+
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteRecordModel.java
index 2b5cd04..aaaf330 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteRecordModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteRecordModel.java
@@ -1,7 +1,10 @@
package com.lyms.platform.pojo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang.time.DateUtils;
+
import java.util.Date;
-import java.util.UUID;
/**
* 叶酸建档记录
@@ -105,7 +108,8 @@ public class FolviteRecordModel {
private String operationDoctor;
//建档日期
- private String drawTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date drawTime;
//创建时间
private Date created;
@@ -128,11 +132,11 @@ public class FolviteRecordModel {
}
- public String getDrawTime() {
+ public Date getDrawTime() {
return drawTime;
}
- public void setDrawTime(String drawTime) {
+ public void setDrawTime(Date drawTime) {
this.drawTime = drawTime;
}
diff --git a/platform-operate-api/pom.xml b/platform-operate-api/pom.xml
index 4008994..7de452a 100644
--- a/platform-operate-api/pom.xml
+++ b/platform-operate-api/pom.xml
@@ -102,6 +102,23 @@
jxl
2.6.12
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ 2.8.8
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ 2.8.8
+
+
+
+ org.codehaus.jackson
+ jackson-mapper-asl
+ 1.9.13
+