Merge remote-tracking branch 'origin/master'

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java

@@ -277,5 +277,12 @@ public class IcVaccineController  implements ResultDataResolver {
         return new Result<>();
     }
 
+    @PostMapping("initVaccineLocal")
+    public Result initVaccineLocal(){
+        icVaccineService.initVaccineLocal();
+        return new Result();
+    }
+
+
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java

@@ -7,6 +7,7 @@ import com.epmet.dto.form.MyNatListFormDTO;
 import com.epmet.dto.form.VaccineListFormDTO;
 import com.epmet.dto.result.IcVaccineListResultDTO;
 import com.epmet.dto.result.MyNatListResultDTO;
+import com.epmet.dto.result.RelationAndNatResultDTO;
 import com.epmet.entity.IcVaccineEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -72,4 +73,9 @@ public interface IcVaccineDao extends BaseDao<IcVaccineEntity> {
      */
     List<IcVaccineEntity> getVaccineListByIdCard(@Param("idCard") String idCard,@Param("time") String time);
 
+    List<RelationAndNatResultDTO> initVaccineLocal();
+
+    void updateRelation(List<RelationAndNatResultDTO> list);
+
+    void updateRelationOther(@Param("isLocalResiUser") String isLocalResiUser);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java

@@ -68,4 +68,6 @@ public interface IcVaccineService extends BaseService<IcVaccineEntity> {
     void edit(AddIcVaccineFormDTO formDTO);
 
     void del(IcVaccineFormDTO formDTO);
+
+    void initVaccineLocal();
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java

@@ -18,6 +18,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.constants.ImportTaskConstants;
+import com.epmet.dao.IcNatDao;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcVaccineDao;
 import com.epmet.dao.IcVaccineRelationDao;
@@ -79,6 +80,8 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
     private UserService userService;
     @Autowired
     private IcNoticeService icNoticeService;
+    @Autowired
+    private IcNatDao icNatDao;
 
     /**
      * @Author sun
@@ -568,4 +571,46 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
         icVaccineRelationDao.delRelation(formDTO.getVaccineId(), null);
     }
 
+    @Override
+    public void initVaccineLocal() {
+        Integer no = NumConstant.ONE;
+        Integer size;
+        // 查询关系表
+        do {
+            PageInfo<RelationAndNatResultDTO> pageInfo = PageHelper.startPage(no, NumConstant.ONE_THOUSAND).doSelectPageInfo(() -> baseDao.initVaccineLocal());
+            List<RelationAndNatResultDTO> list = pageInfo.getList();
+            size = list.size();
+            if (CollectionUtils.isNotEmpty(list)){
+                List<IcResiUserEntity> users = icNatDao.getResiByIdCards(list.stream().map(m -> m.getIdCard()).distinct().collect(Collectors.toList()));
+                if (CollectionUtils.isNotEmpty(users)){
+                    for (RelationAndNatResultDTO l : list) {
+                        for (IcResiUserEntity u : users) {
+                            if (l.getStaffAgencyIdPath().contains(u.getAgencyId())){
+                                l.setIsLocalResiUser(NumConstant.ONE_STR);
+                                break;
+                            }
+                        }
+                    }
+                    updateRelation(list,NumConstant.ONE_STR);
+                }
+            }
+            no++;
+        }while (size == NumConstant.ONE_THOUSAND);
+        // 其他类型的userType直接是居民的组织信息，所以直接赋值 is_local_resi_user = '1'
+        updateRelation(null,NumConstant.TWO_STR);
+        log.error("/epmetuser/icNat/initNatLocal更新核酸检测记录关系表，是否是本辖区居民标志 end");
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void updateRelation(List<RelationAndNatResultDTO> list,String type){
+        if (NumConstant.ONE_STR.equals(type)){
+            if (CollectionUtils.isNotEmpty(list)){
+                baseDao.updateRelation(list);
+            }
+        }else {
+            baseDao.updateRelationOther("1");
+            baseDao.updateRelationOther("0");
+        }
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml

@@ -184,4 +184,46 @@
         and ID_CARD = #{idCard}
         and DATE_FORMAT( INOCULATE_TIME, '%Y-%m-%d' ) = #{time}
     </select>
+
+    <select id="initVaccineLocal" resultType="com.epmet.dto.result.RelationAndNatResultDTO">
+        SELECT
+            r.id AS relationId,
+            i.id AS natId,
+            i.id_card,
+            r.pids AS staffAgencyIdPath
+        FROM ic_vaccine_relation r
+        INNER JOIN ic_vaccine i ON i.ID = r.ic_vaccine_id AND i.del_flag = 0
+        WHERE r.del_flag = 0
+          AND r.user_type = 'import'
+    </select>
+
+    <update id="updateRelation">
+        UPDATE ic_vaccine_relation
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="is_local_resi_user =(case" suffix="end),">
+                <foreach collection="list" item="l">
+                    when ID = #{l.relationId} then #{l.isLocalResiUser}
+                </foreach>
+            </trim>
+            updated_time = NOW()
+        </trim>
+        WHERE ID IN(
+        <foreach collection="list" item="l" separator=",">
+            #{l.relationId}
+        </foreach>)
+    </update>
+    <update id="updateRelationOther">
+        UPDATE ic_vaccine_relation a
+        INNER JOIN ic_vaccine b ON a.ic_vaccine_id = b.id
+        set a.is_local_resi_user = #{isLocalResiUser},
+        a.updated_time = NOW()
+        where a.user_type != 'import'
+        <if test="isLocalResiUser == '1'">
+            and b.USER_ID is not null
+            and b.USER_ID != ''
+        </if>
+        <if test="isLocalResiUser == '0'">
+            and (b.USER_ID is null or b.USER_ID ='')
+        </if>
+    </update>
 </mapper>