Merge remote-tracking branch 'origin/master'

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

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

@@ -194,6 +194,20 @@ public class VaccineInfoOperation extends BaseEntity {
      */
     @Excel(name = "疫苗信息")
     private Long vaccineInfoId;
+    /** 编号 */
+    private String code;
+    /** 出生日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date birthday;
+    /** 工作单位 */
+    private String workUnit;
+    /** 人群分类 */
+    private String crowdClassification;
+
+    /** 生产厂家 */
+    private String manufacturer;
+    /** 現在居住地址 */
+    private String nowIn;
 
     public void setId(Long id) {
         this.id = id;
@@ -435,6 +449,54 @@ public class VaccineInfoOperation extends BaseEntity {
         return vaccineInfoId;
     }
 
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getWorkUnit() {
+        return workUnit;
+    }
+
+    public void setWorkUnit(String workUnit) {
+        this.workUnit = workUnit;
+    }
+
+    public String getCrowdClassification() {
+        return crowdClassification;
+    }
+
+    public void setCrowdClassification(String crowdClassification) {
+        this.crowdClassification = crowdClassification;
+    }
+
+    public String getManufacturer() {
+        return manufacturer;
+    }
+
+    public void setManufacturer(String manufacturer) {
+        this.manufacturer = manufacturer;
+    }
+
+    public String getNowIn() {
+        return nowIn;
+    }
+
+    public void setNowIn(String nowIn) {
+        this.nowIn = nowIn;
+    }
+
     @Override
     public String toString() {
         return "VaccineInfoOperation{" +

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

@@ -134,4 +134,15 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         vaccineInfo.setOperationType(DELETE);
         return vaccineInfoMapper.deleteVaccineInfoById(id);
     }
+
+    private void genNowIn(VaccineInfoOperation vaccineInfo) {
+        // 现居地
+        String nowIn = vaccineInfo.getProvince() + vaccineInfo.getCity() + vaccineInfo.getRegion();
+        nowIn += vaccineInfo.getNowIn();
+        vaccineInfo.setNowIn(nowIn);
+
+        // 户籍
+        String domic = vaccineInfo.getVillageTowns() + vaccineInfo.getVillage() + vaccineInfo.getVillagerGroup() + vaccineInfo.getDomicile();
+        vaccineInfo.setDomicile(domic);
+    }
 }

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

@@ -47,7 +47,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectVaccineInfoVo">
-        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,code,birthday,work_unit,crowd_classification,manufacturer,now_in from vaccine_info
+        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,
+        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">
@@ -80,6 +85,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="progress != null  and progress != ''"> and progress = #{progress}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="code != null  and code != ''"> and code = #{code}</if>
+            <if test="birthday != null  and birthday != ''"> and birthday = #{birthday}</if>
+            <if test="workUnit != null  and workUnit != ''"> and work_unit = #{workUnit}</if>
+            <if test="crowdClassification != null  and crowdClassification != ''"> and crowd_classification = #{crowdClassification}</if>
+            <if test="manufacturer != null  and manufacturer != ''"> and manufacturer = #{manufacturer}</if>
+            <if test="nowIn != null  and nowIn != ''"> and now_in = #{nowIn}</if>
         </where>
     </select>
     
@@ -130,6 +141,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="isDel != null and isDel != ''">is_del,</if>
+            <if test="code != null and code != ''">code,</if>
+            <if test="birthday != null and birthday != ''">birthday,</if>
+            <if test="workUnit != null and workUnit != ''">work_unit,</if>
+            <if test="crowdClassification != null and crowdClassification != ''">crowd_classification,</if>
+            <if test="manufacturer != null and manufacturer != ''">manufacturer,</if>
+            <if test="nowIn != null and nowIn != ''">now_in,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="villageTowns != null">#{villageTowns},</if>
@@ -164,6 +181,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDel != null and isDel != ''">#{isDel},</if>
+
+            <if test="code != null and code != ''">#{code},</if>
+            <if test="birthday != null and birthday != ''">#{birthday},</if>
+            <if test="workUnit != null and workUnit != ''">#{workUnit},</if>
+            <if test="crowdClassification != null and crowdClassification != ''">#{crowdClassification},</if>
+            <if test="manufacturer != null and manufacturer != ''">#{manufacturer},</if>
+            <if test="nowIn != null and nowIn != ''">#{nowIn},</if>
          </trim>
     </insert>
 
@@ -202,6 +226,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDel != null and isDel != ''">is_del = #{isDel},</if>
+            <if test="code != null and code != ''">code = #{code},</if>
+            <if test="birthday != null and birthday != ''">birthday = #{birthday},</if>
+            <if test="workUnit != null and workUnit != ''">work_unit = #{workUnit},</if>
+            <if test="crowdClassification != null and crowdClassification != ''">crowd_classification = #{crowdClassification},</if>
+            <if test="manufacturer != null and manufacturer != ''">manufacturer = #{manufacturer},</if>
+            <if test="nowIn != null and nowIn != ''">now_in = #{nowIn},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -40,11 +40,22 @@
         <result property="isDel" column="is_del"/>
         <result property="operationType" column="operation_type"/>
         <result property="vaccineInfoId" column="vaccine_info_id"/>
+        <result property="code"    column="code"    />
+        <result property="birthday"    column="birthday"    />
+        <result property="workUnit"    column="work_unit"    />
+        <result property="crowdClassification"    column="crowd_classification" />
+        <result property="manufacturer"    column="manufacturer"    />
+        <result property="nowIn"    column="now_in" />
     </resultMap>
 
     <sql id="selectVaccineInfoOperationVo">
         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, operation_type, vaccine_info_id from vaccine_info_operation
+               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, operation_type,
+               vaccine_info_id,code,birthday,work_unit,crowd_classification,manufacturer, now_in
+        from vaccine_info_operation
     </sql>
 
     <select id="selectVaccineInfoOperationList" parameterType="VaccineInfoOperation"
@@ -80,6 +91,13 @@
             <if test="isDel != null  and isDel != ''">and is_del = #{isDel}</if>
             <if test="operationType != null  and operationType != ''">and operation_type = #{operationType}</if>
             <if test="vaccineInfoId != null ">and vaccine_info_id = #{vaccineInfoId}</if>
+            <if test="code != null  and code != ''"> and code = #{code}</if>
+            <if test="birthday != null  and birthday != ''"> and birthday = #{birthday}</if>
+            <if test="workUnit != null  and workUnit != ''"> and work_unit = #{workUnit}</if>
+            <if test="crowdClassification != null  and crowdClassification != ''"> and crowd_classification = #{crowdClassification}</if>
+            <if test="manufacturer != null  and manufacturer != ''"> and manufacturer = #{manufacturer}</if>
+            <if test="nowIn != null  and nowIn != ''"> and now_in = #{nowIn}</if>
+
         </where>
     </select>
 
@@ -126,6 +144,12 @@
             <if test="isDel != null and isDel != ''">is_del,</if>
             <if test="operationType != null">operation_type,</if>
             <if test="vaccineInfoId != null">vaccine_info_id,</if>
+            <if test="code != null and code != ''">code,</if>
+            <if test="birthday != null and birthday != ''">birthday,</if>
+            <if test="workUnit != null and workUnit != ''">work_unit,</if>
+            <if test="crowdClassification != null and crowdClassification != ''">crowd_classification,</if>
+            <if test="manufacturer != null and manufacturer != ''">manufacturer,</if>
+            <if test="nowIn != null and nowIn != ''">now_in,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="villageTowns != null">#{villageTowns},</if>
@@ -162,6 +186,12 @@
             <if test="isDel != null and isDel != ''">#{isDel},</if>
             <if test="operationType != null">#{operationType},</if>
             <if test="vaccineInfoId != null">#{vaccineInfoId},</if>
+            <if test="code != null and code != ''">#{code},</if>
+            <if test="birthday != null and birthday != ''">#{birthday},</if>
+            <if test="workUnit != null and workUnit != ''">#{workUnit},</if>
+            <if test="crowdClassification != null and crowdClassification != ''">#{crowdClassification},</if>
+            <if test="manufacturer != null and manufacturer != ''">#{manufacturer},</if>
+            <if test="nowIn != null and nowIn != ''">#{nowIn},</if>
         </trim>
     </insert>
 
@@ -202,6 +232,12 @@
             <if test="isDel != null and isDel != ''">is_del = #{isDel},</if>
             <if test="operationType != null">operation_type = #{operationType},</if>
             <if test="vaccineInfoId != null">vaccine_info_id = #{vaccineInfoId},</if>
+            <if test="code != null and code != ''">code = #{code},</if>
+            <if test="birthday != null and birthday != ''">birthday = #{birthday},</if>
+            <if test="workUnit != null and workUnit != ''">work_unit = #{workUnit},</if>
+            <if test="crowdClassification != null and crowdClassification != ''">crowd_classification = #{crowdClassification},</if>
+            <if test="manufacturer != null and manufacturer != ''">manufacturer = #{manufacturer},</if>
+            <if test="nowIn != null and nowIn != ''">now_in = #{nowIn},</if>
         </trim>
         where id = #{id}
     </update>