fix 新增疫苗操作记录

boman-web-core/src/main/java/com/boman/web/core/domain/VaccineInfoOperation.java

@@ -119,7 +119,7 @@ public class VaccineInfoOperation extends BaseEntity {
     /**
      * 接种时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "接种时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date vaccinationTime;
 
@@ -197,8 +197,7 @@ public class VaccineInfoOperation extends BaseEntity {
     /** 编号 */
     private String code;
     /** 出生日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date birthday;
+    private String birthday;
     /** 工作单位 */
     private String workUnit;
     /** 人群分类 */
@@ -457,11 +456,11 @@ public class VaccineInfoOperation extends BaseEntity {
         this.code = code;
     }
 
-    public Date getBirthday() {
+    public String getBirthday() {
         return birthday;
     }
 
-    public void setBirthday(Date birthday) {
+    public void setBirthday(String birthday) {
         this.birthday = birthday;
     }
 

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/AdministrativeInfoServiceImpl.java

@@ -76,7 +76,7 @@ public class AdministrativeInfoServiceImpl implements AdministrativeInfoService
         {
             returnList = administrativeInfoList;
         }
-        return administrativeInfoList;
+        return returnList;
     }
 
 

boman-web-core/src/main/resources/mapper/VaccineInfoMapper.xml

@@ -48,11 +48,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectVaccineInfoVo">
         select id, village_towns, village, villager_group, house_type, domicile, province, city,
-        area, user_name, gender, id_card, phone_num, key_industries, is_vaccination, vaccine_name, jici,
+        region, user_name, gender, id_card, phone_num, key_industries, is_vaccination, vaccine_name, jici,
         vaccination_time, vaccination_place, contraindication, suspend, death, lost_in_missing,
         should_be, other, progress, remark, status, create_by, create_time, update_by, update_time,
                is_del,code,birthday,work_unit,crowd_classification,manufacturer,now_in from vaccine_info
-        select id, village_towns, village, villager_group, house_type, domicile, province, city, region, user_name, gender, id_card, phone_num, key_industries, is_vaccination, vaccine_name, jici, vaccination_time, vaccination_place, contraindication, suspend, death, lost_in_missing, should_be, other, progress, remark, status, create_by, create_time, update_by, update_time, is_del from vaccine_info
     </sql>
 
     <select id="selectVaccineInfoList" parameterType="VaccineInfoOperation" resultMap="VaccineInfoResult">
@@ -68,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="region != null  and region != ''"> and region = #{region}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
             <if test="gender != null  and gender != ''"> and gender = #{gender}</if>
-            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
+            <if test="idCard != null  and idCard != ''"> and id_card like concat('%', #{idCard}, '%')</if>
             <if test="phoneNum != null  and phoneNum != ''"> and phone_num = #{phoneNum}</if>
             <if test="keyIndustries != null  and keyIndustries != ''"> and key_industries = #{keyIndustries}</if>
             <if test="isVaccination != null  and isVaccination != ''"> and is_vaccination = #{isVaccination}</if>