Browse Source

数据总览

master
wangpengfei 2 years ago
parent
commit
38890f6804
  1. 4
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java
  2. 24
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml
  3. 10
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java
  4. 60
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java
  5. 8
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java
  6. 12
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml
  7. 6
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInformationRest.java
  8. 14
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java
  9. 3
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java
  10. 3
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java

4
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java

@ -17,5 +17,7 @@ public interface ProjectDailyMapper extends BaseMapper<ProjectDaily> {
IPage<ProjectDaily> listPageVo(IPage<ProjectDaily> page, @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew); IPage<ProjectDaily> listPageVo(IPage<ProjectDaily> page, @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
@Select("select * from project_daily where orderDate=#{orderDate} and projectSid=#{projectSid}") @Select("select * from project_daily where orderDate=#{orderDate} and projectSid=#{projectSid}")
ProjectDailyVos getProjectDaily( @Param("orderDate") String orderDate, @Param("projectSid") String projectSid); ProjectDailyVos getProjectDaily( @Param("orderDate") String orderDate, @Param("projectSid") String projectSid);
List<ProjectDailyVos> getProjectDailys( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew); List<ProjectDailyVos> getProjectDailys ( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
ProjectDailyVos getProjectDailySum( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
ProjectDailyVos getProjectDailyInSid( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
} }

24
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml

@ -23,4 +23,28 @@
</where> </where>
order by orderDate desc order by orderDate desc
</select> </select>
<select id="getProjectDailys" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDailyVos">
select * from project_daily
<where>
${ew.sqlSegment}
</where>
</select>
<select id="getProjectDailySum" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDailyVos">
select sum(accountsBalance) as accountsBalance ,
sum(accountsReceivable) as accountsReceivable ,
sum(stockAmount) as stockAmount ,
sum(transitAmount) as transitAmount ,
sum(advancePayment) as advancePayment
from project_daily
<where>
${ew.sqlSegment}
</where>
</select>
<select id="getProjectDailyInSid" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDailyVos">
select sum(useLimit) as useLimit
from project_daily
<where>
${ew.sqlSegment}
</where>
</select>
</mapper> </mapper>

10
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java

@ -122,4 +122,14 @@ public class ProjectDailyRest {
ResultBean r=projectDailyService.getAccountByProjectSid(projectSid); ResultBean r=projectDailyService.getAccountByProjectSid(projectSid);
return r; return r;
} }
@ApiOperation("根据项目sid查询账户信息")
@PostMapping("/getProjectDailys")
public ResultBean getProjectDailys (@RequestBody ProjectDailyQuery query){
return projectDailyService.getProjectDailys(query);
}
@ApiOperation("根据项目sid查询账户信息")
@PostMapping("/getProjectDailySum")
public ResultBean getProjectDailySum (@RequestBody ProjectDailyQuery query){
return projectDailyService.getProjectDailySum(query);
}
} }

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

@ -37,6 +37,7 @@ import org.springframework.web.client.RestTemplate;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
@Service @Service
public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, ProjectDaily> { public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, ProjectDaily> {
@ -339,5 +340,64 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
System.out.println(jsonObject); System.out.println(jsonObject);
return rb.success().setData(jsonObject); return rb.success().setData(jsonObject);
} }
public ResultBean<List<ProjectDailyVos>> getProjectDailys(ProjectDailyQuery query) {
ResultBean rb=new ResultBean().fail();
ProjectDailyQuery params = query;
QueryWrapper<ProjectDaily> qw = new QueryWrapper<>();
if (params != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) {
qw.eq("orderDate", params.getOrderDate());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) {
qw.eq("projectSid", params.getProjectSid());
}
}
List<ProjectDailyVos> projectDailyVos=baseMapper.getProjectDailys(qw);
return rb.success().setData(projectDailyVos);
}
public ResultBean<List<ProjectDailyVos>> getProjectDailySum(ProjectDailyQuery query) {
ResultBean rb=new ResultBean().fail();
ProjectDailyQuery params = query;
QueryWrapper<ProjectDaily> qw = new QueryWrapper<>();
if (params != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) {
qw.eq("orderDate", params.getOrderDate());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) {
qw.eq("projectSid", params.getProjectSid());
}
}
List<ProjectDailyVos> projectDailyVos=baseMapper.getProjectDailys(qw);
ProjectDailyVos projectDailyV=baseMapper.getProjectDailySum(qw);
List<String> sids=new ArrayList<>();
for(ProjectDailyVos projectDailyVos1:projectDailyVos){
sids.add(projectDailyVos1.getProjectSid());
}
//类型
List<ProjectInfo> list=crmMapper.getProjectType();
for(ProjectInfo s:list){
List<String> info= crmMapper.getCountByType(sids.toArray(),s.getSid());
QueryWrapper<ProjectDaily> qw1 = new QueryWrapper<>();
qw1.in("projectSid",info);
qw1.eq("orderDate", params != null ? params.getOrderDate() : null);
ProjectDailyVos projectDaily=baseMapper.getProjectDailyInSid(qw1);
if(s.getProjectType().equals("保证类项目")){
projectDailyV.setBaoZheng(info.size());
projectDailyV.setBzUseLimit(projectDaily.getUseLimit()+projectDailyV.getBzUseLimit());
}else if(s.getProjectType().equals("动产质押类项目")){
projectDailyV.setDongChan(info.size());
projectDailyV.setDcUseLimit(projectDaily.getUseLimit()+projectDailyV.getDcUseLimit());
}else if(s.getProjectType().equals("应收帐款质押类项目")){
projectDailyV.setYingShou(info.size());
projectDailyV.setYsUseLimit(projectDaily.getUseLimit()+projectDailyV.getYsUseLimit());
}
System.out.println(info);
}
return rb.success().setData(projectDailyV);
}
} }

8
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java

@ -4,6 +4,7 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.base.utils.StringUtils;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@ -58,6 +59,13 @@ public class ProjectDailyVos {
private double useLimitW;//用信额度 万元 private double useLimitW;//用信额度 万元
//1: 已上报报表 2 :未上报报表 //1: 已上报报表 2 :未上报报表
private String isReport; private String isReport;
private String projectType;
private int baoZheng;
private double bzUseLimit;
private int dongChan;
private double dcUseLimit;
private int yingShou;
private double ysUseLimit;
/** /**

12
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml

@ -15,10 +15,10 @@
</where> </where>
order by orderDate desc order by orderDate desc
</select> </select>
<select id="getProjectDailys" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDaily"> <!-- <select id="getProjectDailys" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDaily">-->
select * from project_daily <!-- select * from project_daily-->
<where> <!-- <where>-->
${ew.sqlSegment} <!-- ${ew.sqlSegment}-->
</where> <!-- </where>-->
</select> <!-- </select>-->
</mapper> </mapper>

6
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInformationRest.java

@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationFeign; import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationFeign;
import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationQuery; import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationQuery;
import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -31,4 +32,9 @@ public class ProjectInformationRest {
public ResultBean getProjectType(){ public ResultBean getProjectType(){
return projectInformationFeign.getProjectType(); return projectInformationFeign.getProjectType();
} }
@ApiOperation("查询全部(没有权限控制)")
@GetMapping("/listAllNew")
public ResultBean<List<ProjectInformationVo>> listAllNew(@RequestHeader("token") String token){
return projectInformationFeign.listAllNew(token);
}
} }

14
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java

@ -56,4 +56,18 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
List<ProjectAccountVo> getAccountByProjectSid(@Param("projectSid")String projectSid); List<ProjectAccountVo> getAccountByProjectSid(@Param("projectSid")String projectSid);
@Select("select * from project_information") @Select("select * from project_information")
List<ProjectInfo> getProjects(); List<ProjectInfo> getProjects();
@Select("select sid,projectType from project_type_dictionary")
List<ProjectInfo> getProjectType();
@Select({
"<script>",
"select",
" info.sid as sid",
"from project_information info left join project_type_dictionary dict on dict.sid=info.typeSid",
"where info.sid in",
"<foreach collection='ids' item='id' open='(' separator=',' close=')'>",
"#{id}",
"</foreach> and dict.sid=#{typeSid}",
"</script>"
})
List<String> getCountByType(@Param("ids") Object[] projectSids,@Param("typeSid") String typeSid);
} }

3
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.Period;
@Data @Data
@TableName("project_information") @TableName("project_information")
@ -16,4 +17,6 @@ public class ProjectInfo {
private double useLimit=0; private double useLimit=0;
private double bankPledgeRate=0; private double bankPledgeRate=0;
private double bankPledgeRateNew=0; private double bankPledgeRateNew=0;
private String count;
private String projectType;
} }

3
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java

@ -27,6 +27,9 @@ public interface ProjectInformationFeign {
@ApiOperation("查询全部") @ApiOperation("查询全部")
@GetMapping("/listAll") @GetMapping("/listAll")
public ResultBean<List<ProjectInformationVo>> listAll(@RequestHeader("token") String token); public ResultBean<List<ProjectInformationVo>> listAll(@RequestHeader("token") String token);
@ApiOperation("查询全部(没有权限控制)")
@GetMapping("/listAllNew")
public ResultBean<List<ProjectInformationVo>> listAllNew(@RequestHeader("token") String token);
@ApiOperation("根据用户sid查询项目名称App") @ApiOperation("根据用户sid查询项目名称App")
@GetMapping("/getProjectByUserSidApp/{userSid}") @GetMapping("/getProjectByUserSidApp/{userSid}")
public ResultBean getProjectByUserSidApp (@PathVariable("userSid")String userSid); public ResultBean getProjectByUserSidApp (@PathVariable("userSid")String userSid);

Loading…
Cancel
Save