zhonghui %!s(int64=3) %!d(string=hai) anos
pai
achega
fc1947e603

+ 2 - 1
boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoServiceImpl.java

@@ -102,7 +102,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         }
         List<VaccineInfoOperation> vaccineInfoOperations = vaccineInfoMapper.selectVaccineInfoList(vaccineInfoOperation);
 
-        StringBuilder sbNowIn = new StringBuilder();
+
         if (vaccineInfoOperations != null && vaccineInfoOperations.size() > 0) {
             for (VaccineInfoOperation infoOperation : vaccineInfoOperations) {
                 //省
@@ -124,6 +124,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
                 infoOperation.setDomicileSelect(sbDomicile.toString());
                 //现居地
                 String nowIn = infoOperation.getNowIn();
+                StringBuilder sbNowIn = new StringBuilder();
                 sbNowIn.append(province).append(city).append(region).append(nowIn);
                 infoOperation.setNowInSelect(sbNowIn.toString());
                 //最后一次的接种时间

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

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="suspendUrl"    column="suspend_url"    />
         <result property="otherUrl"    column="other_url"    />
         <result property="shouldSlow"    column="should_slow"    />
+        <result property="vaccinationTime"    column="vaccination_time"    />
         <result property="progress"    column="progress"    />
         <collection  property="vaccineInfoUserList"   javaType="java.util.List"        resultMap="VaccineInfoUser" />
     </resultMap>
@@ -59,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectVaccineInfoVo">
         select vi.id, vi.village_towns, vi.village, vi.villager_group, vi.house_type, vi.domicile, vi.province, vi.city,
         vi.region, vi.user_name, vi.gender, vi.id_card, vi.phone_num, vi.key_industries, vi.is_vaccination, vi.vaccine_name, vi.jici,
-        vi.vaccination_time, vi.vaccination_place, vi.contraindication, vi.suspend,vi.suspend_url,vi.other_url,
+        vi.vaccination_time, vi.vaccination_place, vi.contraindication, vi.suspend,vi.suspend_url,vi.other_url,vi.vaccination_time,
         vi.should_be, vi.other, vi.progress, vi.remark, vi.status, vi.create_by, vi.create_time, vi.update_by, vi.update_time,
                vi.is_del,vi.code,vi.birthday,vi.work_unit,vi.crowd_classification,vi.manufacturer,vi.now_in,vi.url,
                viu.id as id_user,viu.id_card as id_card_user,viu.vaccine_name as vaccine_name_user,viu.jici as jici_user,viu.vaccination_time as vaccination_time_user,
@@ -71,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectVaccineInfoList" parameterType="VaccineInfoOperation" resultMap="VaccineInfoResult">
         select vi.id, vi.village_towns, vi.village, vi.villager_group, vi.house_type, vi.domicile, vi.province, vi.city,vi.should_slow,
         vi.region, vi.user_name, vi.gender, vi.id_card, vi.phone_num, vi.key_industries, vi.is_vaccination, vi.vaccine_name, vi.jici,
-        vi.vaccination_time, vi.vaccination_place, vi.contraindication, vi.suspend,vi.suspend_url,vi.other_url,
+        vi.vaccination_time, vi.vaccination_place, vi.contraindication, vi.suspend,vi.suspend_url,vi.other_url,vi.vaccination_time,
         vi.should_be, vi.other, vi.progress, vi.remark, vi.status, vi.create_by, vi.create_time, vi.update_by, vi.update_time,
         vi.is_del,vi.code,vi.birthday,vi.work_unit,vi.crowd_classification,vi.manufacturer,vi.now_in,vi.url from vaccine_info vi
         <where>