2 次代码提交 5b3c331704 ... 3d8abf1734

作者 SHA1 备注 提交日期
  zhonghui 3d8abf1734 Merge remote-tracking branch 'origin/master' 3 年之前
  zhonghui 3eb8762714 新增字段和删除多余字段 3 年之前

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

@@ -230,6 +230,12 @@ public class VaccineInfoOperation extends BaseEntity {
      */
     private String url;
 
+    /** 暂缓接种附件 */
+    private String suspendUrl;
+
+    /** 暂缓接种附件 */
+    private String otherUrl;
+
     private String shouldSlow;
 
     /**
@@ -242,6 +248,22 @@ public class VaccineInfoOperation extends BaseEntity {
      */
     private List<String> idCardS;
 
+    public String getSuspendUrl() {
+        return suspendUrl;
+    }
+
+    public void setSuspendUrl(String suspendUrl) {
+        this.suspendUrl = suspendUrl;
+    }
+
+    public String getOtherUrl() {
+        return otherUrl;
+    }
+
+    public void setOtherUrl(String otherUrl) {
+        this.otherUrl = otherUrl;
+    }
+
     public Date getVaccinationTimeNext() {
         return vaccinationTimeNext;
     }

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

@@ -22,7 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isVaccination"    column="is_vaccination"  />
         <result property="contraindication"    column="contraindication"    />
         <result property="suspend"    column="suspend"    />
-        <result property="death"    column="death"    />
         <result property="lostInMissing"    column="lost_in_missing"    />
         <result property="shouldBe"    column="should_be"    />
         <result property="other"    column="other"    />
@@ -40,6 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="manufacturer"    column="manufacturer"    />
         <result property="nowIn"    column="now_in"    />
         <result property="url"    column="url"    />
+        <result property="suspendUrl"    column="suspend_url"    />
+        <result property="otherUrl"    column="other_url"    />
         <result property="shouldSlow"    column="should_slow"    />
         <result property="progress"    column="progress"    />
         <collection  property="vaccineInfoUserList"   javaType="java.util.List"        resultMap="VaccineInfoUser" />
@@ -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.death, vi.lost_in_missing,
+        vi.vaccination_time, vi.vaccination_place, vi.contraindication, vi.suspend, vi.lost_in_missing,vi.suspend_url,vi.other_url,
         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.death, vi.lost_in_missing,
+        vi.vaccination_time, vi.vaccination_place, vi.contraindication, vi.suspend, vi.lost_in_missing,vi.suspend_url,vi.other_url,
         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>
@@ -94,7 +95,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.endAge != null  and params.endAge != ''"> and vi.age &lt;= #{params.endAge}</if>
             <if test="contraindication != null  and contraindication != ''"> and vi.contraindication = #{contraindication}</if>
             <if test="suspend != null  and suspend != ''"> and vi.suspend = #{suspend}</if>
-            <if test="death != null  and death != ''"> and vi.death = #{death}</if>
             <if test="lostInMissing != null  and lostInMissing != ''"> and vi.lost_in_missing = #{lostInMissing}</if>
             <if test="shouldBe != null  and shouldBe != ''"> and vi.should_be = #{shouldBe}</if>
             <if test="other != null  and other != ''"> and vi.other = #{other}</if>
@@ -157,7 +157,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="vaccinationPlace != null">vaccination_place,</if>
             <if test="contraindication != null">contraindication,</if>
             <if test="suspend != null">suspend,</if>
-            <if test="death != null">death,</if>
             <if test="lostInMissing != null">lost_in_missing,</if>
             <if test="shouldBe != null">should_be,</if>
             <if test="other != null">other,</if>
@@ -176,6 +175,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nowIn != null and nowIn != ''">now_in,</if>
             <if test="url != null and url != ''">url,</if>
             <if test="shouldSlow != null and shouldSlow != ''">should_slow,</if>
+            <if test="suspendUrl != null and suspendUrl != ''">suspend_url,</if>
+            <if test="otherUrl != null and otherUrl != ''">suspend_url,</if>
             create_time
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -199,7 +200,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="vaccinationPlace != null">#{vaccinationPlace},</if>
             <if test="contraindication != null">#{contraindication},</if>
             <if test="suspend != null">#{suspend},</if>
-            <if test="death != null">#{death},</if>
             <if test="lostInMissing != null">#{lostInMissing},</if>
             <if test="shouldBe != null">#{shouldBe},</if>
             <if test="other != null">#{other},</if>
@@ -218,6 +218,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nowIn != null and nowIn != ''">#{nowIn},</if>
             <if test="url != null and url != ''">#{url},</if>
             <if test="shouldSlow != null and shouldSlow != ''">#{shouldSlow},</if>
+            <if test="suspendUrl != null and suspendUrl != ''">#{suspendUrl},</if>
+            <if test="otherUrl != null and otherUrl != ''">#{otherUrl},</if>
             sysdate()
          </trim>
     </insert>
@@ -245,7 +247,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="vaccinationPlace != null">vaccination_place = #{vaccinationPlace},</if>
             <if test="contraindication != null">contraindication = #{contraindication},</if>
             <if test="suspend != null">suspend = #{suspend},</if>
-            <if test="death != null">death = #{death},</if>
             <if test="lostInMissing != null">lost_in_missing = #{lostInMissing},</if>
             <if test="shouldBe != null">should_be = #{shouldBe},</if>
             <if test="other != null">other = #{other},</if>
@@ -265,6 +266,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nowIn != null and nowIn != ''">now_in = #{nowIn},</if>
             <if test="url != null and url != ''">url = #{url},</if>
             <if test="shouldSlow != null and shouldSlow != ''">should_slow = #{shouldSlow},</if>
+            <if test="suspendUrl != null and suspendUrl != ''">suspend_url = #{suspendUrl},</if>
+            <if test="otherUrl != null and otherUrl != ''">other_url = #{otherUrl},</if>
         </trim>
         where id = #{id}
     </update>