diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java index 6e107ce3..f87f855e 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java @@ -133,18 +133,63 @@ public class ProjectDailyService extends ServiceImpl Double.valueOf(projectDaily.getPledgeRatePercent())) { projectDaily.setState("1"); } list.add(projectDaily); } + }else{ + if(null!=projectInfo) { + ProjectDailyVos projectDailyVos=new ProjectDailyVos(); + projectDailyVos.setIsReport("2"); + projectDailyVos.setProjectName(projectInfo.getEntryName()); + projectDailyVos.setProjectSid(projectInfo.getSid()); + list.add(projectDailyVos); + } } + } map.put("creditLimitTotal",String.format("%.2f",creditLimitTotal/10000)); map.put("useLimitTotal",String.format("%.2f",useLimitTotal/10000)); map.put("list",list); return map; } +// public Map selectList(ProjectDailyQuery params) { +//// List userProjects=crmMapper.getProjectByUserSid(params.getUserSid()); +// ListprojectInfoList=crmMapper.getProjects(); +// List list=new ArrayList<>(); +// Map map=new HashMap<>(); +// double creditLimitTotal=0; +// double useLimitTotal=0; +// for(ProjectInfo userProject:projectInfoList){ +// if(StrUtil.isBlank(params.getOrderDate())){ +// params.setOrderDate(DateUtil.format(DateUtil.yesterday(),"yyyy-MM-dd"));; +// } +// ProjectInfo projectInfo= crmMapper.getProjectBySid(userProject.getSid()); +// ProjectDailyVos projectDaily =baseMapper.getProjectDaily(params.getOrderDate(),userProject.getSid()); +// if(null!=projectInfo){ +// creditLimitTotal=creditLimitTotal+projectInfo.getCreditLimit(); +// useLimitTotal=useLimitTotal+projectInfo.getUseLimit(); +// } +// if(null!=projectDaily){ +// if(null!=projectInfo) { +//// System.out.println(projectDaily.getBankPledgeRate()/100); +// projectDaily.setBankPledgeRate(projectInfo.getBankPledgeRate()); +// if (projectInfo.getBankPledgeRate() > Double.valueOf(projectDaily.getPledgeRatePercent())) { +// projectDaily.setState("1"); +// } +// list.add(projectDaily); +// } +// }else{ +// +// } +// } +// map.put("creditLimitTotal",String.format("%.2f",creditLimitTotal/10000)); +// map.put("useLimitTotal",String.format("%.2f",useLimitTotal/10000)); +// map.put("list",list); +// return map; +// } public ResultBean save(ProjectDailyDto dto) { ResultBean rb = ResultBean.fireFail(); ProjectDaily projectDaily = new ProjectDaily(); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java index 176624ed..c1793cc8 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java @@ -56,6 +56,8 @@ public class ProjectDailyVos { private double useLimit;//用信额度 private double useLimitW;//用信额度 + //1: 已上报报表 2 :未上报报表 + private String isReport; /**