|
@@ -4679,8 +4679,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
|
|
|
@Override
|
|
|
public Map<String, String> demandZGWZPL(PmDemandReqVo pmDemandReqVo) {
|
|
|
- List<StatisticalChartsResVo> resVos = new ArrayList<>();
|
|
|
- Long userId = SecurityUtils.getUserId();
|
|
|
+ LoginUser user = SecurityUtils.getLoginUser();
|
|
|
|
|
|
List<Long> demandIdAll = isQueryAll(pmDemandReqVo.getPurchaseDeptId());
|
|
|
List<Long> queryZD = isQueryZD(pmDemandReqVo.getPurchaseDeptId());
|
|
@@ -4693,15 +4692,14 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
|
|
|
|
|
|
LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
|
|
|
- if (!userId.equals(Long.valueOf("1"))) {
|
|
|
- lw.eq(PlanYears::getCreated, userId);
|
|
|
+ if (!user.getUserId().equals(Long.valueOf("1"))) {
|
|
|
+ lw.eq(PlanYears::getPurchaseDeptId, user.getDeptId());
|
|
|
}
|
|
|
lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
|
|
|
lw.orderBy(true, false, PlanYears::getCreateTime);
|
|
|
-
|
|
|
|
|
|
long countPlanYear = planYearsService.count(lw);
|
|
|
-
|
|
|
+
|
|
|
List<String> afsh = new ArrayList<>();
|
|
|
afsh.add(PmProjectStatus.DEMAND_WAIT_AUDIT.getCode());
|
|
|
afsh.add(PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
|
|
@@ -4771,8 +4769,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
|
|
|
|
|
|
LambdaQueryWrapper<PlanQuarter> planQuarterLw = new LambdaQueryWrapper<>();
|
|
|
- if (!userId.equals(Long.valueOf("1"))) {
|
|
|
- planQuarterLw.eq(PlanQuarter::getCreated, userId);
|
|
|
+ if (!user.getUserId().equals(Long.valueOf("1"))) {
|
|
|
+ planQuarterLw.eq(PlanQuarter::getCreated, user.getDeptId());
|
|
|
}
|
|
|
planQuarterLw.eq(PlanQuarter::getPlanType, "0");
|
|
|
planQuarterLw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
|
|
@@ -4792,8 +4790,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
int countXmWtj = Integer.parseInt(num5.get("countNumber").toString());
|
|
|
|
|
|
LambdaQueryWrapper<PlanQuarter> planLinshiLw = new LambdaQueryWrapper<>();
|
|
|
- if (!userId.equals(Long.valueOf("1"))) {
|
|
|
- planLinshiLw.eq(PlanQuarter::getCreated, userId);
|
|
|
+ if (!user.getUserId().equals(Long.valueOf("1"))) {
|
|
|
+ planLinshiLw.eq(PlanQuarter::getCreated, user.getDeptId());
|
|
|
}
|
|
|
planLinshiLw.eq(PlanQuarter::getPlanType, "1");
|
|
|
planLinshiLw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
|
|
@@ -4821,6 +4819,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
LambdaQueryWrapper<PmDemand> dmLp = new LambdaQueryWrapper<>();
|
|
|
|
|
|
String lfbl = "";
|
|
|
+ String lfblmm = "";
|
|
|
if (ObjectUtils.isEmpty(pmDemandReqVo.getDeptList()) && ObjectUtils.isEmpty(pmDemandReqVo.getDemandIdAll())) {
|
|
|
lfbl = "0.00%";
|
|
|
} else {
|
|
@@ -4835,6 +4834,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
List<Long> deIds = demandList.stream().map(PmDemand::getDemandId).collect(Collectors.toList());
|
|
|
|
|
|
List<PmBidFailureHis> failureHis = pmBidFailureHisService.listByIds(deIds);
|
|
|
+ lfblmm = failureHis.size() + "";
|
|
|
lfbl = getPercent(failureHis.size(), countAfRwxd);
|
|
|
}
|
|
|
|
|
@@ -4845,6 +4845,12 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
result.put("zhhl", zhhl);
|
|
|
result.put("pcl", pcl);
|
|
|
result.put("lfbl", lfbl);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
return result;
|
|
|
}
|
|
|
|