b9c0799e by 肖初晴

【DAOP-1.0】企业认证

【功能点】测试问题处理
1 parent 40c81b58
......@@ -17,6 +17,7 @@ import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
import com.csbr.cloud.workflow.util.ApprovalFlowUtil;
import com.csbr.cloud.workflow.util.FlowAbstractImpl;
import com.csbr.qingcloud.portal.domain.vo.*;
import com.csbr.qingcloud.portal.feign.ConfigureFeign;
import com.csbr.qingcloud.portal.feign.PersonelFeign;
import com.csbr.qingcloud.portal.feign.UserFeign;
import com.csbr.qingcloud.portal.mybatis.entity.MfDemand;
......@@ -81,6 +82,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
@Resource
private UserFeign userFeign;
@Resource
private ConfigureFeign configureFeign;
/**
* 企业信息分页查询
* @author xcq
......@@ -140,6 +144,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
}
List<ChangeApproveBean> beanList = getChangeBeanList(approveList);
try {
if(CollectionUtils.isEmpty(ChangeInfoUtil.areaList)){
ChangeInfoUtil.areaList = configureFeign.getBoroughCodeName().getData();
}
return ChangeInfoUtil.getChangeList(beanList);
} catch (IllegalAccessException e) {
e.printStackTrace();
......
......@@ -23,9 +23,6 @@ import java.util.stream.Collectors;
@Component
public class ChangeInfoUtil {
@Resource
private static ConfigureFeign configureFeign;
public static List<BoroughPOJO> areaList;
/** 计算变更信息 */
......@@ -125,9 +122,6 @@ public class ChangeInfoUtil {
}
private static String getName(String code){
if(CollectionUtils.isEmpty(areaList)){
areaList = configureFeign.getBoroughCodeName().getData();
}
List<String> names = areaList.stream().filter(x->x.getCode().equals(code)).map(BoroughPOJO::getName).collect(Collectors.toList());
if(CollectionUtils.isEmpty(names)){
return "";
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!