Browse Source

山海数据大屏

master
wangpengfei 8 months ago
parent
commit
abf5172b9c
  1. 3
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceQuery.java
  2. 2
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceMapper.xml
  3. 21
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java
  4. 1
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmService.java
  5. 1
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java
  6. 159
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java
  7. 3
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java
  8. 17
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.xml
  9. 1
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectRecordVo.java
  10. 3
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceQuery.java
  11. 2
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java

3
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceQuery.java

@ -52,7 +52,7 @@ import java.util.List;
public class ProjectCreditBalanceQuery implements Query { public class ProjectCreditBalanceQuery implements Query {
@ApiModelProperty("项目sid") @ApiModelProperty("项目sid")
private String projectSid; // 项目sid private String projectsid; // 项目sid
@ApiModelProperty("填报日期结束") @ApiModelProperty("填报日期结束")
private String tbdateend; // 填报日期结束 private String tbdateend; // 填报日期结束
@ApiModelProperty("填报日期开始") @ApiModelProperty("填报日期开始")
@ -63,5 +63,6 @@ public class ProjectCreditBalanceQuery implements Query {
private String money; // 金额 private String money; // 金额
private String userSid; private String userSid;
private List<String> projectsids; private List<String> projectsids;
private String lx;//1 整个企业下所有的
} }

2
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceMapper.xml

@ -4,7 +4,7 @@
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.supervise.crm.api.projectcreditbalance.ProjectCreditBalanceVo"> <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.projectcreditbalance.ProjectCreditBalanceVo">
SELECT * FROM project_credit_balance <where> ${ew.sqlSegment} </where> SELECT a.* FROM project_credit_balance a left join enterprise_project b on b.projectSid =a.projectSid<where> ${ew.sqlSegment} </where>
</select> </select>
<select id="selectListAllVo" resultType="com.yxt.supervise.crm.api.projectcreditbalance.ProjectCreditBalanceVo"> <select id="selectListAllVo" resultType="com.yxt.supervise.crm.api.projectcreditbalance.ProjectCreditBalanceVo">

21
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java

@ -30,9 +30,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo;
import com.yxt.supervise.crm.api.projectcreditbalance.*; import com.yxt.supervise.crm.api.projectcreditbalance.*;
import com.yxt.supervise.crm.api.projectcreditfile.ProjectCreditFile; import com.yxt.supervise.crm.api.projectcreditfile.ProjectCreditFile;
import com.yxt.supervise.crm.api.projectcreditfile.ProjectCreditFileDto; import com.yxt.supervise.crm.api.projectcreditfile.ProjectCreditFileDto;
import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService;
import com.yxt.supervise.crm.biz.projectcreditfile.ProjectCreditFileService; import com.yxt.supervise.crm.biz.projectcreditfile.ProjectCreditFileService;
import com.yxt.supervise.crm.biz.projectinformation.ProjectInfoVo; import com.yxt.supervise.crm.biz.projectinformation.ProjectInfoVo;
import com.yxt.supervise.crm.biz.projectinformation.ProjectInformation; import com.yxt.supervise.crm.biz.projectinformation.ProjectInformation;
@ -74,19 +76,28 @@ public class ProjectCreditBalanceService extends MybatisBaseService<ProjectCredi
private ProjectInformationService projectInformationService; private ProjectInformationService projectInformationService;
@Autowired @Autowired
private FileUploadComponent fileUploadComponent; private FileUploadComponent fileUploadComponent;
@Autowired
EnterpriseProjectService enterpriseProjectService;
private QueryWrapper<ProjectCreditBalance> createQueryWrapper(ProjectCreditBalanceQuery query) { private QueryWrapper<ProjectCreditBalance> createQueryWrapper(ProjectCreditBalanceQuery query) {
// todo: 这里根据具体业务调整查询条件 // todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ProjectCreditBalance> qw = new QueryWrapper<>(); QueryWrapper<ProjectCreditBalance> qw = new QueryWrapper<>();
qw.eq("isDelete",0); qw.eq("a.isDelete",0);
if(StringUtils.isNotBlank(query.getProjectSid())){ if(StringUtils.isNotBlank(query.getProjectsid())){
qw.eq("projectsid",query.getProjectsids()); if(query.getLx().equals("1")){
List<EnterpriseProjectVo> list=enterpriseProjectService.getEnterpriseByProjectSid(query.getProjectsid());
if(list.size()!=0) {
qw.eq("b.enterpriseSid", list.get(0).getEnterpriseSid());
}
}else{
qw.eq("a.projectsid",query.getProjectsid());
}
} }
if(StringUtils.isNotBlank(query.getTbdateend())){ if(StringUtils.isNotBlank(query.getTbdateend())){
qw.le("tbdate",query.getTbdateend()); qw.le("a.tbdate",query.getTbdateend());
} }
if(StringUtils.isNotBlank(query.getTbdatestart())){ if(StringUtils.isNotBlank(query.getTbdatestart())){
qw.ge("tbdate",query.getTbdatestart()); qw.ge("a.tbdate",query.getTbdatestart());
} }
//TODO 项目信息的限制 //TODO 项目信息的限制
// List<ProjectInformationVo> projectByUserSid = projectInformationService.getProjectByUserSid(query.getUserSid()); // List<ProjectInformationVo> projectByUserSid = projectInformationService.getProjectByUserSid(query.getUserSid());

1
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmService.java

@ -53,6 +53,7 @@ public class ProjectShGmService extends MybatisBaseService<ProjectShGmMapper, Pr
*/ */
public ResultBean saveProjectShGm(ProjectShGmDto dto) { public ResultBean saveProjectShGm(ProjectShGmDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
baseMapper.delete(new QueryWrapper<ProjectShGm>().like("orderDate",dto.getOrderDate()));
ProjectShGm entity=new ProjectShGm(); ProjectShGm entity=new ProjectShGm();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity); baseMapper.insert(entity);

1
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java

@ -15,6 +15,7 @@ public class DataCenterQuery implements Query {
private String intervalTime="7"; private String intervalTime="7";
// //
private String projectSid; private String projectSid;
private String nodeValue;// 在途 在建 竣工

159
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java

@ -26,6 +26,7 @@ import com.yxt.supervise.report.feign.crm.projectcreditbalance.ProjectCreditBala
import com.yxt.supervise.report.feign.crm.projectcreditfile.ProjectCreditFileFeign; import com.yxt.supervise.report.feign.crm.projectcreditfile.ProjectCreditFileFeign;
import com.yxt.supervise.report.feign.crm.projectphaserecord.ProjectPhaseRecordFeign; import com.yxt.supervise.report.feign.crm.projectphaserecord.ProjectPhaseRecordFeign;
import com.yxt.supervise.report.feign.crm.projectshgm.ProjectShGmDto; import com.yxt.supervise.report.feign.crm.projectshgm.ProjectShGmDto;
import com.yxt.supervise.report.feign.crm.projectshgm.ProjectShGmFeign;
import com.yxt.supervise.report.feign.monitor.YDeviceFeign; import com.yxt.supervise.report.feign.monitor.YDeviceFeign;
import com.yxt.supervise.report.feign.monitor.YDeviceImageFeign; import com.yxt.supervise.report.feign.monitor.YDeviceImageFeign;
import com.yxt.supervise.report.shanhai.ShRequester; import com.yxt.supervise.report.shanhai.ShRequester;
@ -67,6 +68,8 @@ public class DataCenterRest {
private ProjectCreditBalanceFeign projectCreditBalanceFeign; private ProjectCreditBalanceFeign projectCreditBalanceFeign;
@Autowired @Autowired
private ProjectCreditFileFeign projectCreditFileFeign; private ProjectCreditFileFeign projectCreditFileFeign;
@Autowired
private ProjectShGmFeign projectShGmFeign;
//数据总览 //数据总览
/*********************************************36524演示************************************/ /*********************************************36524演示************************************/
@ -492,8 +495,8 @@ public class DataCenterRest {
List<String> title=new ArrayList<>(); List<String> title=new ArrayList<>();
title.add("贷款支持-折"); title.add("贷款支持-折");
title.add("贷款支持-柱"); title.add("贷款支持-柱");
title.add("总贷款-折"); title.add("总投资-折");
title.add("总贷款-柱"); title.add("总投资-柱");
map.put("titile",title); map.put("titile",title);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String EndDate=sdf.format(DateUtil.offsetMonth(DateUtil.parse(query.getDate()),-7)); String EndDate=sdf.format(DateUtil.offsetMonth(DateUtil.parse(query.getDate()),-7));
@ -507,7 +510,8 @@ public class DataCenterRest {
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM"); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM");
// String date=sdf1.format(DateUtil.offsetMonth(DateUtil.parse(query.getDate()),-k)); // String date=sdf1.format(DateUtil.offsetMonth(DateUtil.parse(query.getDate()),-k));
String date=sdf1.format(DateUtil.offsetMonth(DateUtil.parse(EndDate),k)); String date=sdf1.format(DateUtil.offsetMonth(DateUtil.parse(EndDate),k));
a.add(date); int date1=DateUtil.month(DateUtil.offsetMonth(DateUtil.parseDate(EndDate),k))+1;
a.add(String.valueOf(date1)+"月");
ShGmVo vo=crmMapper.getGm(date); ShGmVo vo=crmMapper.getGm(date);
if(null!=vo){ if(null!=vo){
dkzcCount.add(vo.getDkzcCount().toString()); dkzcCount.add(vo.getDkzcCount().toString());
@ -528,6 +532,7 @@ public class DataCenterRest {
map.put("ztzCount",ztzCount); map.put("ztzCount",ztzCount);
return rb.success().setData(map); return rb.success().setData(map);
} }
@ApiOperation("项目分页列表") @ApiOperation("项目分页列表")
@PostMapping("/getProjectPageList") @PostMapping("/getProjectPageList")
public Object getProjectPageList(@RequestBody PagerQuery<IndexQuery> pq){ public Object getProjectPageList(@RequestBody PagerQuery<IndexQuery> pq){
@ -570,6 +575,9 @@ public class DataCenterRest {
if(StringUtils.isNotBlank(query.getWarehouseCode())){ if(StringUtils.isNotBlank(query.getWarehouseCode())){
sendBody.put("warehouseCode",query.getWarehouseCode()); sendBody.put("warehouseCode",query.getWarehouseCode());
} }
if(StringUtils.isNotBlank(query.getBelongingPlace())){
sendBody.put("belongingPlace",query.getBelongingPlace());
}
sendBodyMM.put("params",sendBody); sendBodyMM.put("params",sendBody);
// List<ProjectDetailsVo> projectDetailsVos=c.getListPage(new RestTemplate().postForEntity(a, sendBodyMM, String.class),ProjectDetailsVo.class); // List<ProjectDetailsVo> projectDetailsVos=c.getListPage(new RestTemplate().postForEntity(a, sendBodyMM, String.class),ProjectDetailsVo.class);
JSONObject jsonObject=com.alibaba.fastjson.JSONObject.parseObject(new RestTemplate().postForEntity(a, sendBodyMM, String.class).getBody()); JSONObject jsonObject=com.alibaba.fastjson.JSONObject.parseObject(new RestTemplate().postForEntity(a, sendBodyMM, String.class).getBody());
@ -659,14 +667,20 @@ public class DataCenterRest {
@ApiOperation("dingshi") @ApiOperation("dingshi")
@GetMapping("/rr") @GetMapping("/rr")
@Scheduled(cron = "0 0 0 1 * ? ") @Scheduled(cron = "1 0 0 * * ? ")
public void rr(){ public void rr(){
//山海系统 //山海系统
String a ="63_17_0_2069_1,63_17_0_2048_1,63_17_0_2049_1,63_17_0_2070_1,63_17_0_2073_1,63_17_0_2075_1,63_17_0_2078_1,63_17_0_2080_1,63_17_0_2087_1,63_17_0_2090_1"; String a ="63_17_0_2069_1,63_17_0_2048_1,63_17_0_2049_1,63_17_0_2070_1,63_17_0_2073_1,63_17_0_2075_1,63_17_0_2078_1,63_17_0_2080_1,63_17_0_2087_1,63_17_0_2090_1";
List<String> list=new ArrayList<>();
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
String format = sdf.format(new Date());
list.add("2000-01-01");
list.add(format);
IndexQuery query =new IndexQuery(); IndexQuery query =new IndexQuery();
query.setPage("1"); query.setPage("1");
query.setLimit("1000"); query.setLimit("1000");
query.setOrder_type("10"); query.setOrder_type("10");
query.setSearch_time(list.stream().toArray(String []::new));
BigDecimal ztz=new BigDecimal(0); BigDecimal ztz=new BigDecimal(0);
Integer ztzCount =0; Integer ztzCount =0;
for (String s : a.split(",")) { for (String s : a.split(",")) {
@ -695,7 +709,10 @@ public class DataCenterRest {
A d=new A(); A d=new A();
String url ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/list"; String url ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/list";
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
ResponseEntity<String> forEntity = restTemplate.getForEntity(url,String.class); Map<String, Object> sendBodyMM = new HashMap<>();
sendBodyMM.put("engTime",format);
sendBodyMM.put("orgPath","0d19bc72-9370-45d3-bfda-5662eab34e4b");
ResponseEntity<String> forEntity = restTemplate.postForEntity(url,sendBodyMM,String.class);
List<ProjectDetailsVo> vos= d.getList(forEntity,ProjectDetailsVo.class); List<ProjectDetailsVo> vos= d.getList(forEntity,ProjectDetailsVo.class);
BigDecimal dkzc=new BigDecimal(0); BigDecimal dkzc=new BigDecimal(0);
Integer dkzcCount =0; Integer dkzcCount =0;
@ -730,31 +747,143 @@ public class DataCenterRest {
dto.setZtzCount(ztzCount); dto.setZtzCount(ztzCount);
dto.setOrderDate(new Date()); dto.setOrderDate(new Date());
dto.setEnterpriseSid("0d19bc72-9370-45d3-bfda-5662eab34e4b"); dto.setEnterpriseSid("0d19bc72-9370-45d3-bfda-5662eab34e4b");
projectShGmFeign.save(dto);
} }
@ApiOperation("dingshi")
@GetMapping("/rr1")
public void rr(@RequestParam("orderDate")String orderDate){
//山海系统
String a ="63_17_0_2069_1,63_17_0_2048_1,63_17_0_2049_1,63_17_0_2070_1,63_17_0_2073_1,63_17_0_2075_1,63_17_0_2078_1,63_17_0_2080_1,63_17_0_2087_1,63_17_0_2090_1";
List<String> list=new ArrayList<>();
// SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
// String format = sdf.format(new Date());
list.add("2000-01-01");
list.add(orderDate);
IndexQuery query =new IndexQuery();
query.setPage("1");
query.setLimit("1000");
query.setOrder_type("10");
query.setSearch_time(list.stream().toArray(String []::new));
BigDecimal ztz=new BigDecimal(0);
Integer ztzCount =0;
for (String s : a.split(",")) {
query.setWorkflow(s);
BaseResponse<BaseResponseListObj<OrderIndexVo>> vos=ShRequester.getsystem$order$index(query);
List<OrderIndexVo > c =vos.getData().getList();
for (OrderIndexVo orderIndexVo : c) {
String d="";
if(orderIndexVo.getAll_power().substring(orderIndexVo.getAll_power().length()-2).equals("MW")){
d =orderIndexVo.getAll_power().replace("MW","");
BigDecimal bigDecimal=new BigDecimal(d);
bigDecimal=bigDecimal.multiply(new BigDecimal(1000000));
bigDecimal=bigDecimal.multiply(new BigDecimal(3));
ztz=ztz.add(bigDecimal);
}else if(orderIndexVo.getAll_power().substring(orderIndexVo.getAll_power().length()-2).equals("KW")){
d =orderIndexVo.getAll_power().replace("KW","");
BigDecimal bigDecimal=new BigDecimal(d);
bigDecimal=bigDecimal.multiply(new BigDecimal(1000));
bigDecimal=bigDecimal.multiply(new BigDecimal(3));
ztz=ztz.add(bigDecimal);
}
}
ztzCount=ztzCount+vos.getData().getCount();
}
//商享通
A d=new A();
String url ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/list";
RestTemplate restTemplate = new RestTemplate();
Map<String, Object> sendBodyMM = new HashMap<>();
sendBodyMM.put("engTime",orderDate);
ResponseEntity<String> forEntity = restTemplate.postForEntity(url,sendBodyMM,String.class);
List<ProjectDetailsVo> vos= d.getList(forEntity,ProjectDetailsVo.class);
BigDecimal dkzc=new BigDecimal(0);
Integer dkzcCount =0;
for (ProjectDetailsVo orderIndexVo : vos) {
String g="";
if(orderIndexVo.getSquareMeter().substring(orderIndexVo.getSquareMeter().length()-2).equals("MW")){
g =orderIndexVo.getSquareMeter().replace("MW","");
BigDecimal bigDecimal=new BigDecimal(g);
bigDecimal=bigDecimal.multiply(new BigDecimal(1000000));
bigDecimal=bigDecimal.multiply(new BigDecimal(1));
dkzc=dkzc.add(bigDecimal);
}else if(orderIndexVo.getSquareMeter().substring(orderIndexVo.getSquareMeter().length()-2).equals("KW")){
g =orderIndexVo.getSquareMeter().replace("KW","");
BigDecimal bigDecimal=new BigDecimal(g);
bigDecimal=bigDecimal.multiply(new BigDecimal(1000));
bigDecimal=bigDecimal.multiply(new BigDecimal(1));
dkzc=dkzc.add(bigDecimal);
}else{
// g =orderIndexVo.getSquareMeter().replace("MW","");
BigDecimal bigDecimal=new BigDecimal(g);
bigDecimal=bigDecimal.multiply(new BigDecimal(1000000));
bigDecimal=bigDecimal.multiply(new BigDecimal(1));
dkzc=dkzc.add(bigDecimal);
}
}
dkzcCount=dkzcCount+vos.size();
ProjectShGmDto dto=new ProjectShGmDto();
dto.setDkzc(dkzc);
dto.setZtz(ztz);
dto.setDkzcCount(dkzcCount);
dto.setZtzCount(ztzCount);
dto.setOrderDate(DateUtil.parse(orderDate));
dto.setEnterpriseSid("0d19bc72-9370-45d3-bfda-5662eab34e4b");
projectShGmFeign.save(dto);
}
@ApiOperation("获取客户") @ApiOperation("获取客户")
@PostMapping("/getSuppliserInfo") @PostMapping("/getSuppliserInfo")
public ResultBean getSuppliserInfo(@RequestBody DataCenterQuery query){ public Object getSuppliserInfo(@RequestBody PagerQuery<DataCenterQuery> pq){
ResultBean rb=new ResultBean(); ResultBean rb=new ResultBean();
A c =new A(); A c =new A();
List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(pq.getParams().getProjectSid());
Map<String,Object> sendBodyMM=new HashMap<>();
Map<String, Object> sendBody = new HashMap<>();
sendBodyMM.put("current",pq.getCurrent());
sendBodyMM.put("size",pq.getSize());
sendBody.put("orgPath",projectInfo.get(0).getEnterpriseSid());
sendBodyMM.put("params",sendBody);
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid()); ResponseEntity<String> forEntity1 = restTemplate.postForEntity("https://wms.yxtsoft.com/apiv1/external/apiadmin/supplierinfo/listPage1",sendBodyMM,String.class);
ResponseEntity<String> forEntity1 = restTemplate.getForEntity("https://wms.yxtsoft.com/apiv1/external/apiadmin/supplierinfo/getSupplierCountByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class);
// ResponseEntity<String> forEntity1 = restTemplate.getForEntity("http://192.168.0.105:6023/apiadmin/supplierinfo/getSupplierCountByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class); // ResponseEntity<String> forEntity1 = restTemplate.getForEntity("http://192.168.0.105:6023/apiadmin/supplierinfo/getSupplierCountByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class);
List<SupplierInfoVo> supplierInfoVo = c.getList(forEntity1, SupplierInfoVo.class); // List<SupplierInfoVo> supplierInfoVo = c.getList(forEntity1, SupplierInfoVo.class);
return rb.success().setData(supplierInfoVo); return forEntity1.getBody();
} }
@ApiOperation("获取供应商") @ApiOperation("获取供应商")
@PostMapping("/getCustomerInfo") @PostMapping("/getCustomerInfo")
public ResultBean getCustomerInfo(@RequestBody DataCenterQuery query){ public Object getCustomerInfo(@RequestBody PagerQuery<DataCenterQuery> pq){
ResultBean rb=new ResultBean(); ResultBean rb=new ResultBean();
A c =new A(); A c =new A();
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid()); List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(pq.getParams().getProjectSid());
ResponseEntity<String> forEntity = restTemplate.getForEntity("https://wms.yxtsoft.com/apiv1/external/v1/crmcustomertemp/getCustomerByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class); Map<String,Object> sendBodyMM=new HashMap<>();
Map<String, Object> sendBody = new HashMap<>();
sendBodyMM.put("current",pq.getCurrent());
sendBodyMM.put("size",pq.getSize());
sendBody.put("orgPath",projectInfo.get(0).getEnterpriseSid());
sendBodyMM.put("params",sendBody);
ResponseEntity<String> forEntity = restTemplate.postForEntity("https://wms.yxtsoft.com/apiv1/external/v1/crmcustomertemp/listPage1",sendBodyMM,String.class);
// ResponseEntity<String> forEntity1 = restTemplate.getForEntity("http://192.168.0.105:6023/apiadmin/supplierinfo/getSupplierCountByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class); // ResponseEntity<String> forEntity1 = restTemplate.getForEntity("http://192.168.0.105:6023/apiadmin/supplierinfo/getSupplierCountByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class);
List<CrmCustomerTempVo> jsonObject = c.getList(forEntity,CrmCustomerTempVo.class); // List<CrmCustomerTempVo> jsonObject = c.getList(forEntity,CrmCustomerTempVo.class);
return rb.success().setData(jsonObject); System.out.println(forEntity);
return forEntity.getBody();
}
@ApiOperation("项目报告")
@PostMapping("/getProjectReportByNode")
public ResultBean getProjectReportByNode(@RequestBody PagerQuery<DataCenterQuery> pq){
ResultBean rb=new ResultBean();
DataCenterQuery query=pq.getParams();
QueryWrapper<ProjectRecordVo> qw = new QueryWrapper<>();
Map<String,Object> map=new HashMap<>();
// ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid());
List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
qw.eq("a.enterpriseSid",projectInfo.get(0).getEnterpriseSid());
qw.eq("d.nodeValue",query.getNodeValue());
qw.apply("url is not null");
IPage<ProjectRecordVo> page = PagerUtil.queryToPage(pq);
IPage<ProjectRecordVo> pagging = crmMapper.getPhaseFiles(page, qw);
return rb.success().setData(pagging);
} }
} }

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

@ -2,6 +2,7 @@ package com.yxt.supervise.report.ds.crm;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
@ -167,6 +168,8 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
"WHERE\n" + "WHERE\n" +
"\ta.enterpriseSid = #{enterpriseSid} and url is not NULL") "\ta.enterpriseSid = #{enterpriseSid} and url is not NULL")
List<ProjectRecordVo> getPhaseFilesByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid); List<ProjectRecordVo> getPhaseFilesByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid);
IPage<ProjectRecordVo> getPhaseFiles(IPage<ProjectRecordVo> page,@Param(Constants.WRAPPER) QueryWrapper<ProjectRecordVo> qw);
@Select({ @Select({
"<script>", "<script>",
"select", "select",

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

@ -17,4 +17,21 @@
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
</select> </select>
<select id="getPhaseFiles" resultType="com.yxt.supervise.report.ds.crm.ProjectRecordVo">
SELECT
c.createTime,
c.absolutePath,
c.url,
c.name,
b.entryName,
d.nodeValue
FROM
enterprise_project as a
LEFT JOIN project_information b ON b.sid = a.projectSid
left join project_files c on c.mainSid=b.sid
left join project_phase d on d.projectSid =b.sid
<where>
${ew.sqlSegment}
</where>
</select>
</mapper> </mapper>

1
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectRecordVo.java

@ -17,5 +17,6 @@ public class ProjectRecordVo {
private String url; private String url;
private String name; private String name;
private String entryName; private String entryName;
private String nodeValue;
} }

3
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceQuery.java

@ -51,7 +51,7 @@ import java.util.List;
public class ProjectCreditBalanceQuery implements Query { public class ProjectCreditBalanceQuery implements Query {
@ApiModelProperty("项目sid") @ApiModelProperty("项目sid")
private String projectSid; // 项目sid private String projectsid; // 项目sid
@ApiModelProperty("填报日期结束") @ApiModelProperty("填报日期结束")
private String tbdateend; // 填报日期结束 private String tbdateend; // 填报日期结束
@ApiModelProperty("填报日期开始") @ApiModelProperty("填报日期开始")
@ -62,5 +62,6 @@ public class ProjectCreditBalanceQuery implements Query {
private String money; // 金额 private String money; // 金额
private String userSid; private String userSid;
private List<String> projectsids; private List<String> projectsids;
private String lx;//1 整个企业下所有的
} }

2
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java

@ -25,4 +25,6 @@ public class IndexQuery implements Query {
private String creditNature; private String creditNature;
// ------------------------------------ // ------------------------------------
private String search_no; private String search_no;
private String belongingPlace;
private String [] search_time;
} }

Loading…
Cancel
Save