diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustdocAutoAllotPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustdocAutoAllotPluginInitializer.java index 7a672085..e8511cd9 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustdocAutoAllotPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustdocAutoAllotPluginInitializer.java @@ -17,6 +17,7 @@ import com.hzya.frame.plugin.lets.queryvo.CustdocRequestVo; import com.hzya.frame.plugin.lets.resultvo.CbdocResultVo; import com.hzya.frame.plugin.lets.u8cdto.ReusltStrDto; import com.hzya.frame.plugin.lets.util.PushDataByU8cUtil; +import com.hzya.frame.plugin.lets.util.QueryU8CEntityUtil; import com.hzya.frame.plugin.lets.util.SaveOrUpdateBusinessLogUtil; import com.hzya.frame.plugin.lets.util.pushData.Attribute; import com.hzya.frame.plugin.lets.util.pushData.PushU8CByApiCode; @@ -86,6 +87,8 @@ public class CustdocAutoAllotPluginInitializer extends PluginBaseEntity { private PushU8CByApiCode pushU8CByApiCode; @Autowired private IBdCubasdocDao bdCubasdocDao; + @Autowired + private QueryU8CEntityUtil queryU8CEntityUtil; @Override public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { @@ -282,7 +285,7 @@ public class CustdocAutoAllotPluginInitializer extends PluginBaseEntity { try { ArrayList assginvolist = new ArrayList<>(); - List bdCorpEntities = null; + List corpAll = null; //查询公司档案 try { // String corpresponse = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("bdcorpQuery"), "{}"); @@ -295,13 +298,26 @@ public class CustdocAutoAllotPluginInitializer extends PluginBaseEntity { String data = attribute.getData(); Map map = JSONObject.parseObject(data, Map.class); Object o = map.get("datas"); - bdCorpEntities = JSONObject.parseArray(JSON.toJSONString(o), BdCorpEntity.class); + corpAll = JSONObject.parseArray(JSON.toJSONString(o), BdCorpEntity.class); } catch (Exception e) { throw new RuntimeException(e); } + //过滤公司 + List bdCorpEntities = new ArrayList<>(); + //查询需要过滤的公司 + String filterCompanyStr = queryU8CEntityUtil.queryBdDefDocByListPk(); + String[] splitFilterCompany = filterCompanyStr.split(","); + List asList = Arrays.asList(splitFilterCompany); + for (BdCorpEntity bdCorpEntity : corpAll) { + String unitCode = bdCorpEntity.getUnitcode(); + if(!asList.contains(unitCode)){ + bdCorpEntities.add(bdCorpEntity); + } + } + for (BdCorpEntity bdCorpEntity : bdCorpEntities) { CustDocAssginVo custDocAssginVo = new CustDocAssginVo(); custDocAssginVo.setPk_cubasdoc(custcode);