人员劣迹接口 返回增加 ryztmc 字段

抓捕判断条件改变

src/main/java/com/rshy/project/hy/manager/impl/RshyJkManagerImpl.java

@@ -172,27 +172,28 @@ public class RshyJkManagerImpl implements RshyJkManager {
 //        if (rshyVo.getNucleic_acid().getStatus() == 0) {
 //            rshyVo.setPassStatus(PassStatusEnum.NON_CONFORMANCE).setKind(PassStatusEnum.NON_CONFORMANCE.getDesc()).setWarning(PassStatusEnum.NON_CONFORMANCE.getDesc());
 //        } else
-        if (rshyVo.getTravel_card() != 0) {
-            //行程码到过中高风险地区
-            rshyVo.setPassStatus(PassStatusEnum.ABNORMAL_TRAVEL_CARD).setKind(PassStatusEnum.ABNORMAL_TRAVEL_CARD.getDesc());
-        } else if (PassStatusEnum.RED_CODE.getDesc().equalsIgnoreCase(jkmInfo.getColor_code_label())) {
+//        if (rshyVo.getTravel_card() != 0) {
+//            //行程码到过中高风险地区
+//            rshyVo.setPassStatus(PassStatusEnum.ABNORMAL_TRAVEL_CARD).setKind(PassStatusEnum.ABNORMAL_TRAVEL_CARD.getDesc());
+//        } else
+        if (PassStatusEnum.RED_CODE.getDesc().equalsIgnoreCase(jkmInfo.getColor_code_label())) {
             //红码
             rshyVo.setPass(PassStatusEnum.RED_CODE.getCode()).setTts(PassStatusEnum.RED_CODE.getTts()).setDisplayMsg(PassStatusEnum.RED_CODE.getDesc()).setWarning(PassStatusEnum.RED_CODE.getDesc()).setKind("健康码" + PassStatusEnum.RED_CODE.getDesc());
         } else if (PassStatusEnum.YELLOW_CODE.getDesc().equalsIgnoreCase(jkmInfo.getColor_code_label())) {
             //黄码
             rshyVo.setPassStatus(PassStatusEnum.YELLOW_CODE).setKind("健康码" + PassStatusEnum.YELLOW_CODE.getDesc()).setWarning(PassStatusEnum.YELLOW_CODE.getDesc());
-        } else if (resultDTO.getPctgkryDTO().getPctztDTO() != null || StrUtil.containsAnyIgnoreCase(hcjg, RchljgEnum.CAPTURE.getDesc()) || StrUtil.containsAnyIgnoreCase(hcjg, RchljgEnum.INTERCEPT.getDesc())) {
-            //在逃 或者 人车核录接口返回 抓捕或者拦截
+        } else if ((resultDTO.getPctgkryDTO().getPctztDTO() != null && resultDTO.getPctgkryDTO().getPctztDTO().getRyztmc().equalsIgnoreCase("在逃"))
+                || StrUtil.containsAnyIgnoreCase(hcjg, RchljgEnum.CAPTURE.getDesc()) || StrUtil.containsAnyIgnoreCase(hcjg, RchljgEnum.INTERCEPT.getDesc())) {
+            //在逃接口返回并且ryztmc字段为在逃 或 人车核录接口返回抓捕或者拦截
             rshyVo.setPassStatus(PassStatusEnum.NO_PASSING).setKind(kind(resultDTO)).setWarning(warning(resultDTO));
         } else if (!ObjectUtils.allFieldIsNULL(resultDTO.getPctgkryDTO()) || StrUtil.containsAnyIgnoreCase(hcjg, RchljgEnum.IN_DOUBT.getDesc())) {
-            //七大类管控人员(在逃除外)和人车核录接口返回存疑人员
+            //七大类管控人员和人车核录接口返回存疑人员
             rshyVo.setPassStatus(PassStatusEnum.RIGHT_WAY).setKind(kind(resultDTO)).setWarning(warning(resultDTO));
         } else if (resultDTO.getPctzdrydkResultDTO() != null && resultDTO.getPctzdrydkResultDTO().getTotal() > 0) {
             //杭州市重点人员底库查询接口
             rshyVo.setPassStatus(PassStatusEnum.RIGHT_WAY).setKind(resultDTO.getPctzdrydkResultDTO().getData().get(0).getRyflList()[0]);
         } else if (quickRshyVo.get() != null && StrUtil.isNotEmpty(quickRshyVo.get().getSfzh())) {
             //依图接口
-            //rshyVo = quickRshyVo.get().setTimes(times(rshyParam.getSfzh()));
             rshyVo.copySomeValues(quickRshyVo.get());
         } else {
             //正常通过
@@ -304,12 +305,11 @@ public class RshyJkManagerImpl implements RshyJkManager {
      */
     private String kind(ResultDTO resultDTO) {
         StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(resultDTO.getPctgkryDTO().getPctztDTO() != null ? resultDTO.getPctgkryDTO().getPctztDTO().getZtrylxmc() + "、" : StrUtil.EMPTY);
+        stringBuilder.append(resultDTO.getPctgkryDTO().getPctztDTO() != null ? resultDTO.getPctgkryDTO().getPctztDTO().getRyztmc() + "、" : StrUtil.EMPTY);
         stringBuilder.append(resultDTO.getPctgkryDTO().getPctdfkDTO() != null ? HyTypeEnum.pctdfk.getDesc() + "、" : StrUtil.EMPTY);
         stringBuilder.append(resultDTO.getPctgkryDTO().getPctjsryDTO() != null ? HyTypeEnum.pctjsry.getDesc() + "、" : StrUtil.EMPTY);
         stringBuilder.append(resultDTO.getPctgkryDTO().getPctxdryDTO() != null ? HyTypeEnum.pctxdry.getDesc() + "、" : StrUtil.EMPTY);
         stringBuilder.append(resultDTO.getPctgkryDTO().getPctqkryDTO() != null ? HyTypeEnum.pctqkry.getDesc() + "、" : StrUtil.EMPTY);
-        //stringBuilder.append(resultDTO.getPctjkmInfoDTO() != null ? HyTypeEnum.pctjkm.getDesc() : StrUtil.EMPTY);
         stringBuilder.append(resultDTO.getPctgkryDTO().getPctzfbaDTO() != null ? HyTypeEnum.pctzfba.getDesc() + "、" : StrUtil.EMPTY);
         stringBuilder.append(resultDTO.getPctgkryDTO().getPctzdryDTO() != null ? HyTypeEnum.pctzdry.getDesc() + "、" : StrUtil.EMPTY);
         stringBuilder.append(resultDTO.getPctrchlDTO() != null ? resultDTO.getPctrchlDTO().getRylb() : StrUtil.EMPTY);

src/main/java/com/rshy/project/hy/server/dto/PctztDTO.java

@@ -12,4 +12,6 @@ public class PctztDTO {
     private String ztrylxmc;
 
     private String jyaq;
+
+    private String ryztmc;
 }