Browse Source

12/13

master
wangpengfei 2 years ago
parent
commit
672f4ed2fd
  1. 11
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java

11
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java

@ -268,7 +268,7 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
projectDaily.setUserMobile(mobile); projectDaily.setUserMobile(mobile);
} }
projectDaily.setCreditLimit(projectInfo.getCreditLimit()); projectDaily.setCreditLimit(projectInfo.getCreditLimit());
projectDaily.setUseLimit(projectInfo.getUseLimit()); // projectDaily.setUseLimit(projectInfo.getUseLimit());
projectDaily.setBankPledgeRate(projectInfo.getBankPledgeRate()); projectDaily.setBankPledgeRate(projectInfo.getBankPledgeRate());
if (projectInfo.getBankPledgeRate() >Double.valueOf(projectDaily.getPledgeRatePercent())) { if (projectInfo.getBankPledgeRate() >Double.valueOf(projectDaily.getPledgeRatePercent())) {
projectDaily.setState("1"); projectDaily.setState("1");
@ -388,19 +388,14 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
}else{ }else{
qw.eq("orderDate",sdf.format(DateUtil.yesterday())); qw.eq("orderDate",sdf.format(DateUtil.yesterday()));
} }
if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) { if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) {
qw.eq("projectSid", params.getProjectSid()); qw.eq("projectSid", params.getProjectSid());
} }
} }
List<ProjectDailyVos> projectDailyVos=baseMapper.getProjectDailys(qw); List<ProjectDailyVos> projectDailyVos=baseMapper.getProjectDailys(qw);
ProjectDailyVosBig projectDailyV=baseMapper.getProjectDailySum(qw); ProjectDailyVosBig projectDailyV=baseMapper.getProjectDailySum(qw);
if(null==projectDailyV){ if(null==projectDailyV){
projectDailyV=new ProjectDailyVosBig(); projectDailyV=new ProjectDailyVosBig();
// return rb.success().setData(new ProjectDailyVosBig());
} }
QueryWrapper<ProjectDaily> qw2 = new QueryWrapper<>(); QueryWrapper<ProjectDaily> qw2 = new QueryWrapper<>();
if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) { if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) {
@ -408,14 +403,11 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
}else{ }else{
qw2.eq("orderDate",sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-1))); qw2.eq("orderDate",sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-1)));
} }
if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) { if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) {
qw2.eq("projectSid", params.getProjectSid()); qw2.eq("projectSid", params.getProjectSid());
} }
ProjectDailyVosBig projectDailyYest=baseMapper.getProjectDailySum(qw2); ProjectDailyVosBig projectDailyYest=baseMapper.getProjectDailySum(qw2);
List<String> sids=new ArrayList<>(); List<String> sids=new ArrayList<>();
if(projectDailyVos.size()==0){ if(projectDailyVos.size()==0){
sids.add(query.getProjectSid()); sids.add(query.getProjectSid());
// return rb.success().setData(new ProjectDailyVosBig()); // return rb.success().setData(new ProjectDailyVosBig());
@ -424,7 +416,6 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
sids.add(projectDailyVos1.getProjectSid()); sids.add(projectDailyVos1.getProjectSid());
} }
} }
//类型 //类型
List<ProjectInfo> list=crmMapper.getProjectType(); List<ProjectInfo> list=crmMapper.getProjectType();
for(ProjectInfo s:list){ for(ProjectInfo s:list){

Loading…
Cancel
Save