|
|
@@ -37,6 +37,9 @@ public class HomePageNmgDataController {
|
|
|
@Autowired
|
|
|
private ZcProjectService zcProjectService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ZfcgGongaoService zfcgGongaoService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private CqGqIssueBulletinService cqGqIssueBulletinService;
|
|
|
|
|
|
@@ -172,15 +175,22 @@ public class HomePageNmgDataController {
|
|
|
QueryWrapper<ZcProject> zcPurchaseBulletinQueryWrapperSelf = new QueryWrapper<ZcProject>();
|
|
|
zcPurchaseBulletinQueryWrapperSelf.eq("PLATFORM_CODE","121500004600236091");
|
|
|
int countZcPurchaseBulletinSelf = zcProjectService.count(zcPurchaseBulletinQueryWrapperSelf);
|
|
|
- totalzzq = totalzzq + countZcPurchaseBulletinSelf;
|
|
|
+ QueryWrapper<ZfcgGongao> zcPurchaseBulletinQueryWrapperSelf2 = new QueryWrapper<ZfcgGongao>();
|
|
|
+ zcPurchaseBulletinQueryWrapperSelf2.eq("REGION_CODE","150001").in("NOTICE_TYPE","001011","001012","001013","001014","001015","001016","001019");
|
|
|
+ int countZcPurchaseBulletinSelf2 = zfcgGongaoService.count(zcPurchaseBulletinQueryWrapperSelf2);
|
|
|
+ totalzzq = totalzzq + countZcPurchaseBulletinSelf+countZcPurchaseBulletinSelf2;
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
try {
|
|
|
QueryWrapper<ZcProject> zcPurchaseBulletinQueryWrapper = new QueryWrapper<ZcProject>();
|
|
|
int countZcPurchaseBulletin = zcProjectService.count(zcPurchaseBulletinQueryWrapper);
|
|
|
- totalZFCG = totalZFCG + countZcPurchaseBulletin;
|
|
|
- total = total + countZcPurchaseBulletin;
|
|
|
+ QueryWrapper<ZfcgGongao> zcPurchaseBulletinQueryWrapperSelf = new QueryWrapper<ZfcgGongao>();
|
|
|
+ zcPurchaseBulletinQueryWrapperSelf.in("NOTICE_TYPE","001011","001012","001013","001014","001015","001016","001019");
|
|
|
+ int countZcPurchaseBulletin2 = zfcgGongaoService.count(zcPurchaseBulletinQueryWrapperSelf);
|
|
|
+
|
|
|
+ totalZFCG = totalZFCG + countZcPurchaseBulletin +countZcPurchaseBulletin2;
|
|
|
+ total = total + countZcPurchaseBulletin +countZcPurchaseBulletin2;
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -362,14 +372,20 @@ public class HomePageNmgDataController {
|
|
|
QueryWrapper<ZcBidpublicity> zcBidpublicityQueryWrapper = new QueryWrapper<ZcBidpublicity>();
|
|
|
zcBidpublicityQueryWrapper.eq("PLATFORM_CODE","121500004600236091");
|
|
|
int countGcProjectSelf = zcBidpublicityService.count(zcBidpublicityQueryWrapper);
|
|
|
- totalTransactionzzq = totalTransactionzzq + countGcProjectSelf;
|
|
|
+ QueryWrapper<ZfcgGongao> zcPurchaseBulletinQueryWrapperSelf = new QueryWrapper<ZfcgGongao>();
|
|
|
+ zcPurchaseBulletinQueryWrapperSelf.eq("REGION_CODE","150000").in("NOTICE_TYPE","001021","001022","001023","001024","001025","001026","001029");
|
|
|
+ int countZcPurchaseBulletinSelf = zfcgGongaoService.count(zcPurchaseBulletinQueryWrapperSelf);
|
|
|
+ totalTransactionzzq = totalTransactionzzq + countGcProjectSelf +countZcPurchaseBulletinSelf;
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
try {
|
|
|
QueryWrapper<ZcBidpublicity> zcBidpublicityQueryWrapper = new QueryWrapper<ZcBidpublicity>();
|
|
|
int countGcProject = zcBidpublicityService.count(zcBidpublicityQueryWrapper);
|
|
|
- totalTransaction = totalTransaction + countGcProject;
|
|
|
+ QueryWrapper<ZfcgGongao> zcPurchaseBulletinQueryWrapperSelf = new QueryWrapper<ZfcgGongao>();
|
|
|
+ zcPurchaseBulletinQueryWrapperSelf.in("NOTICE_TYPE","001021","001022","001023","001024","001025","001026","001029");
|
|
|
+ int countZcPurchaseBulletinSelf = zfcgGongaoService.count(zcPurchaseBulletinQueryWrapperSelf);
|
|
|
+ totalTransaction = totalTransaction + countGcProject + countZcPurchaseBulletinSelf;
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
|
}
|