【政策】-

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java

@@ -15,6 +15,7 @@ import com.epmet.dto.form.policy.IcPolicyFormDTO;
 import com.epmet.dto.form.policy.IcPolicyPageFormDTO;
 import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO;
 import com.epmet.service.IcPolicyService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -48,9 +49,46 @@ public class IcPolicyController {
 
     @PostMapping("resiuserlist")
     public Result listResiUserByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) {
+        // 调整错位的逻辑符号位置
+        //adjustMalpositionLogicalOperatorPosition(input);
         icPolicyService.listResiUserByPolicyRules(input);
         return null;
     }
+
+    /**
+     * 调整错位的逻辑运算符
+     * @param input
+     */
+    //private void adjustMalpositionLogicalOperatorPosition(ResisByPolicyRulesFormDTO input) {
+    //    List<ResisByPolicyRulesFormDTO.ResiRule> resiRule = input.getRuleList().getResiRule();
+    //    List<ResisByPolicyRulesFormDTO.HouseRule> houseRule = input.getRuleList().getHouseRule();
+    //    List<ResisByPolicyRulesFormDTO.StatRule> statRule = input.getRuleList().getStatRule();
+    //
+    //    if (CollectionUtils.isNotEmpty(resiRule)) {
+    //        for (int i = 1; i < resiRule.size() - 1; i++) {
+    //            ResisByPolicyRulesFormDTO.ResiRule current = resiRule.get(i);
+    //            ResisByPolicyRulesFormDTO.ResiRule last = resiRule.get(i - 1);
+    //            current.setLastLogicalRel(last.getLastLogicalRel());
+    //        }
+    //    }
+    //
+    //    if (CollectionUtils.isNotEmpty(houseRule)) {
+    //        for (int i = 1; i < houseRule.size() - 1; i++) {
+    //            ResisByPolicyRulesFormDTO.HouseRule current = houseRule.get(i);
+    //            ResisByPolicyRulesFormDTO.HouseRule last = houseRule.get(i - 1);
+    //            current.setLastLogicalRel(last.getLastLogicalRel());
+    //        }
+    //    }
+    //
+    //    if (CollectionUtils.isNotEmpty(statRule)) {
+    //        for (int i = 1; i < statRule.size() - 1; i++) {
+    //            ResisByPolicyRulesFormDTO.StatRule current = statRule.get(i);
+    //            ResisByPolicyRulesFormDTO.StatRule last = statRule.get(i - 1);
+    //            current.setLastLogicalRel(last.getLastLogicalRel());
+    //        }
+    //    }
+    //}
+
     /**
      * 政策管理-新增/修改
      *

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java

@@ -369,7 +369,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
 
         List<com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO> resis = getResultDataOrReturnNull(dataAggregatorOpenFeignClient.listByPolicyRules(aggForm), ServiceConstant.DATA_AGGREGATOR_SERVER);
         return resis.stream()
-                .map((r) -> new ResiByPolicyInfoResultDTO(r.getName(), r.getMobile(), r.getIdCard(), r.getNeighborhoodFullName(), r.getAge()))
+                .map((r) -> new ResiByPolicyInfoResultDTO(r.getName(), r.getMobile(), r.getIdCard(), r.getNeighborHoodName(), r.getAge()))
                 .collect(Collectors.toList());
     }
 }