Merge remote-tracking branch 'origin/master'

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

@@ -204,6 +204,10 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         return remoteDictDataService.selectDictLabel(dictType, dictValue);
     }
 
+    /**
+     * 放查询地址
+     * @param vaccineInfoOperation
+     */
     private void setAddrCondition(VaccineInfoOperation vaccineInfoOperation) {
         // 当前登陆人所在部门，有可能是县，有可能是镇，有可能是村
         Long deptId = AuthUtils.getLoginUser().getSysUser().getDeptId();

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

@@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="vaccinationTime"    column="vaccination_time_user"    />
         <result property="vaccinationPlace"    column="vaccination_place_user"    />
         <result property="progress"    column="progress_user"    />
+        <result property="url"    column="url_user"    />
         <result property="status"    column="status_user"    />
     </resultMap>
 
@@ -65,8 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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,
-               viu.vaccination_place as vaccination_place_user,viu.progress as progress_user,viu.status as status_user
+               viu.vaccination_place as vaccination_place_user,viu.progress as progress_user,viu.status as status_user,viu.url as url_user
                from vaccine_info vi left join vaccine_info_user viu
                on vi.id_card = viu.id_card and viu.is_del = 'N'
     </sql>
@@ -80,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             vi.is_del = 'N'
             <if test="villageTowns != null  and villageTowns != ''">
-                and (vi.village_towns = #{villageTowns} or vi.city = #{villageTowns} or vi.region = #{villageTowns})
+                and (vi.village_towns = #{villageTowns} or vi.city = #{villageTowns} or vi.region = #{villageTowns} or vi.province = #{villageTowns} or vi.city = #{villageTowns} or vi.region = #{villageTowns})
             </if>
             <if test="village != null  and village != ''"> and vi.village = #{village}</if>
             <if test="villagerGroup != null  and villagerGroup != ''"> and vi.villager_group = #{villagerGroup}</if>