|
@@ -79,7 +79,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
|
|
|
String stage = set.getStage();
|
|
|
projectCostQueryWrapper = new QueryWrapper<>();
|
|
|
projectCostQueryWrapper.eq("clf",new BigDecimal(0));
|
|
|
- projectCostQueryWrapper.eq("cost_percent",stage);
|
|
|
+ projectCostQueryWrapper.eq("processPercent",stage);//
|
|
|
List<ProjectCost> projectCostList1 = costService.projectCostlist(projectCostQueryWrapper);
|
|
|
|
|
|
List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
|
|
@@ -112,7 +112,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
|
|
|
String stage = set.getStage();
|
|
|
projectCostQueryWrapper = new QueryWrapper<>();
|
|
|
projectCostQueryWrapper.eq("wxf",new BigDecimal(0));
|
|
|
- projectCostQueryWrapper.eq("cost_percent",stage);
|
|
|
+ projectCostQueryWrapper.eq("processPercent",stage);
|
|
|
List<ProjectCost> projectCostList1 = costService.projectCostlist(projectCostQueryWrapper);
|
|
|
|
|
|
List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
|
|
@@ -144,7 +144,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
|
|
|
String stage = set.getStage();
|
|
|
projectCostQueryWrapper = new QueryWrapper<>();
|
|
|
projectCostQueryWrapper.eq("gzjlwf",new BigDecimal(0));
|
|
|
- projectCostQueryWrapper.eq("cost_percent",stage);
|
|
|
+ projectCostQueryWrapper.eq("processPercent",stage);
|
|
|
List<ProjectCost> projectCostList1 = costService.projectCostlist(projectCostQueryWrapper);
|
|
|
List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
|
|
|
List<UserNameIDVO> userNameIdList = this.userNamesByRoleIds(roleIds);
|
|
@@ -172,7 +172,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
|
|
|
String stage = "100";
|
|
|
QueryWrapper<ProjectCost> projectCostQueryWrapper= new QueryWrapper<>();
|
|
|
projectCostQueryWrapper.eq("contractfpe",new BigDecimal(0));
|
|
|
- projectCostQueryWrapper.eq("cost_percent",stage);
|
|
|
+ projectCostQueryWrapper.eq("processPercent",stage);
|
|
|
List<ProjectCost> projectCostList1 = costService.projectCostlist(projectCostQueryWrapper);
|
|
|
|
|
|
for (ProjectCost cost:projectCostList1){
|
|
@@ -207,8 +207,8 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
|
|
|
|
|
|
//4收款额
|
|
|
projectCostQueryWrapper = new QueryWrapper<>();
|
|
|
- projectCostQueryWrapper.eq("taskmoney",new BigDecimal(0));
|
|
|
- projectCostQueryWrapper.eq("TaskMoney",stage);
|
|
|
+ projectCostQueryWrapper.eq("TaskMoney",new BigDecimal(0));
|
|
|
+ projectCostQueryWrapper.eq("processPercent",stage);
|
|
|
List<ProjectCost> projectCostList2 = costService.projectCostlist(projectCostQueryWrapper);
|
|
|
|
|
|
for (ProjectCost cost:projectCostList2){
|