|
|
@@ -449,9 +449,7 @@ public class WebpageController extends BaseController {
|
|
|
|
|
|
|
|
|
//企业技术需求
|
|
|
- List<DemandListBo> companyDemand=demandService.companyDemand();
|
|
|
- int minSize=companyDemand.size()>8?8:companyDemand.size();
|
|
|
- List <DemandListBo>eightMaxCompanyDemand=companyDemand.subList(0,minSize);
|
|
|
+ List<DemandListBo> eightMaxCompanyDemand=demandService.companyDemand(8);
|
|
|
for(DemandListBo demandListBo:eightMaxCompanyDemand) {
|
|
|
if(demandListBo.getPictureUrl()==null || !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
|
|
|
else demandListBo.setPictureUrl(demandListBo.getPictureUrl().split(",")[0]);
|
|
|
@@ -459,8 +457,7 @@ public class WebpageController extends BaseController {
|
|
|
modelview.addObject("companyDemandList",eightMaxCompanyDemand);
|
|
|
|
|
|
//地区产业需求 最多4个
|
|
|
- List<DemandListBo> areaDemand=demandService.areaDemand();
|
|
|
- List <DemandListBo>fourMaxareaDemand=areaDemand.subList(0,Math.min(4, areaDemand.size()));
|
|
|
+ List<DemandListBo> fourMaxareaDemand=demandService.areaDemand(4);
|
|
|
for(DemandListBo demandListBo:fourMaxareaDemand) {
|
|
|
if(demandListBo.getPictureUrl()==null || !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
|
|
|
else demandListBo.setPictureUrl(demandListBo.getPictureUrl().split(",")[0]);
|
|
|
@@ -469,8 +466,7 @@ public class WebpageController extends BaseController {
|
|
|
modelview.addObject("areaDemandList",fourMaxareaDemand);
|
|
|
|
|
|
//产学研需求 最多9个
|
|
|
- List<DemandListBo> proLearnStudyDemand=demandService.proLearnStudyDemand();
|
|
|
- List <DemandListBo>nightMaxProLearnStudyDemand=proLearnStudyDemand.subList(0,Math.min(9, proLearnStudyDemand.size()));
|
|
|
+ List<DemandListBo> nightMaxProLearnStudyDemand=demandService.proLearnStudyDemand(9);
|
|
|
for(DemandListBo demandListBo:nightMaxProLearnStudyDemand) {
|
|
|
if(demandListBo.getPictureUrl()==null || !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
|
|
|
else demandListBo.setPictureUrl(demandListBo.getPictureUrl().split(",")[0]);
|
|
|
@@ -480,8 +476,7 @@ public class WebpageController extends BaseController {
|
|
|
modelview.addObject("proLearnStudyDemandList",nightMaxProLearnStudyDemand);
|
|
|
|
|
|
//研产资金需求 最多4个
|
|
|
- List<DemandListBo> fundDemand=demandService.getFundCrowdDemand();
|
|
|
- List <DemandListBo>fourMaxFundDemand=fundDemand.subList(0,Math.min(4, fundDemand.size()));
|
|
|
+ List<DemandListBo> fourMaxFundDemand=demandService.getFundCrowdDemand(4);
|
|
|
for(DemandListBo demandListBo:fourMaxFundDemand) {
|
|
|
if(demandListBo.getPictureUrl()==null || !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
|
|
|
else demandListBo.setPictureUrl(demandListBo.getPictureUrl().split(",")[0]);
|
|
|
@@ -490,14 +485,14 @@ public class WebpageController extends BaseController {
|
|
|
modelview.addObject("fundDemandList",fourMaxFundDemand);
|
|
|
|
|
|
//技术人才需求
|
|
|
- List<DemandListBo> personnelDemand=demandService.getPersonnelDemand();
|
|
|
- List <DemandListBo>fourMaxPersonnelDemand=personnelDemand.subList(0,Math.min(6, personnelDemand.size()));
|
|
|
- for(DemandListBo demandListBo:fourMaxPersonnelDemand) {
|
|
|
+ List<DemandListBo> sixMaxPersonnelDemand=demandService.getPersonnelDemand(6);
|
|
|
+// List <DemandListBo>fourMaxPersonnelDemand=personnelDemand.subList(0,Math.min(6, personnelDemand.size()));
|
|
|
+ for(DemandListBo demandListBo:sixMaxPersonnelDemand) {
|
|
|
if(demandListBo.getPictureUrl()==null || !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
|
|
|
else demandListBo.setPictureUrl(demandListBo.getPictureUrl().split(",")[0]);
|
|
|
}
|
|
|
- LimitLengthUtil.limiteDemandLength(fourMaxPersonnelDemand,7,30);
|
|
|
- modelview.addObject("personnelDemandList",fourMaxPersonnelDemand);
|
|
|
+ LimitLengthUtil.limiteDemandLength(sixMaxPersonnelDemand,7,30);
|
|
|
+ modelview.addObject("personnelDemandList",sixMaxPersonnelDemand);
|
|
|
return modelview;
|
|
|
}
|
|
|
|