From 0f7b581ba485adc81db9cd0bbe7937975ac07a3c Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 4 Nov 2024 15:13:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=B1=E6=B5=B7=E6=95=B0=E6=8D=AE=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectCreditBalanceService.java | 11 ++ .../ProjectCreditFileService.java | 13 +- .../report/biz/datacenter/DataCenterRest.java | 162 ++++++++++-------- .../supervise/report/ds/crm/CrmMapper.java | 16 +- .../report/ds/crm/ShCreditBalanceCrmVo.java | 4 +- 5 files changed, 122 insertions(+), 84 deletions(-) diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java index 87bbeec8..cba947ff 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java @@ -259,6 +259,17 @@ public class ProjectCreditBalanceService extends MybatisBaseService().eq("sid",dto.getProjectsid())); +// if("2".equals(dto.getType())){ +// BigDecimal bigDecimal=new BigDecimal(projectInformation.getUseLimit()); +// bigDecimal=bigDecimal.subtract(new BigDecimal(dto.getMoney())); +// projectInformation.setUseLimit(bigDecimal.toString()); +// }else if("1".equals(dto.getType())){ +// BigDecimal bigDecimal=new BigDecimal(projectInformation.getUseLimit()); +// bigDecimal=bigDecimal.add(new BigDecimal(dto.getMoney())); +// projectInformation.setUseLimit(bigDecimal.toString()); +// } +// projectInformationService.updateById(projectInformation); } public ProjectCreditBalanceDetailsVo fetchDetailsVoBySid(String sid){ diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileService.java index efde1194..fd57be0c 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileService.java @@ -84,13 +84,14 @@ public class ProjectCreditFileService extends MybatisBaseService dtos){ - baseMapper.delete(new QueryWrapper().eq("mainsid", dtos.get(0).getMainsid())); - for (ProjectCreditFileDto dto : dtos) { - ProjectCreditFile entity = new ProjectCreditFile(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); + if(dtos.size()!=0){ + baseMapper.delete(new QueryWrapper().eq("mainsid", dtos.get(0).getMainsid())); + for (ProjectCreditFileDto dto : dtos) { + ProjectCreditFile entity = new ProjectCreditFile(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } } - } public void updateByDto(ProjectCreditFileDto dto){ diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java index 3bdd2f0f..07fe50e4 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java @@ -218,8 +218,24 @@ public class DataCenterRest { List projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid()); sendBodyMM.put("orgPath",projectInfo.get(0).getEnterpriseSid()); List projectDetailsVos=c.getList(new RestTemplate().postForEntity(a, sendBodyMM, String.class),ProjectDetailsVo.class); - for (ProjectDetailsVo projectDetailsVo : projectDetailsVos) { - ProjectInfo info= crmMapper.getProjectByShSid(projectDetailsVo.getSid()); + + return rb.success().setData(projectDetailsVos); + } + + + //@Todo 山海光伏大屏数据接口 + @ApiOperation("获取仓库地址及经纬度") + @PostMapping("/getWarehouseAddressDetail/{shSid}") + public ResultBean getWarehouseAddressDetail(@PathVariable("shSid") String shSid){ + ResultBean rb= new ResultBean().fail(); + A c=new A(); + String a ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/getWarehouseBySid/"+shSid; +// String a ="http://192.168.0.105:6023/apiadmin/warehouseinfo/list"; + ProjectDetailsVo projectDetailsVo= (ProjectDetailsVo) c.getObject(new RestTemplate().getForEntity(a, String.class),ProjectDetailsVo.class); + List infos= crmMapper.getProjectByShSid(projectDetailsVo.getSid()); + List sids=new ArrayList<>(); + for (ProjectInfo info : infos) { + if(info!=null){ String nodde=crmMapper.getNodeValueByProjectSid(info.getProjectSid()); projectDetailsVo.setCreditStage(nodde); @@ -227,11 +243,12 @@ public class DataCenterRest { if(null!=info){ List vos=crmMapper.getBalanceByProjectSid(info.getProjectSid()); List s=new ArrayList<>(); + for (ShCreditBalanceCrmVo vo : vos) { if(vo.getType().equals("1")){ // String nodde=crmMapper.getNodeValueByProjectSid(info.getSid()); - projectDetailsVo.setExpectedCompletionDate(vo.getExpectedCompletionDate()); - projectDetailsVo.setExpectedDeliveryDate(vo.getExpectedDeliveryDate()); + projectDetailsVo.setExpectedCompletionDate(DateUtil.parse(vo.getExpectedCompletionDate())); + projectDetailsVo.setExpectedDeliveryDate(DateUtil.parse(vo.getExpectedDeliveryDate())); // projectDetailsVo.setCreditStage(nodde); projectDetailsVo.setCreditNature(vo.getCreditNature()); projectDetailsVo.setTbdate(vo.getTbdate()); @@ -258,32 +275,29 @@ public class DataCenterRest { projectEngineeringProgressVo.setUrls(urlVos); } } - IndexQuery query2 =new IndexQuery(); - query2.setPage("1"); - query2.setLimit("10"); - query2.setOrder_type("10"); - query2.setOrder_id(projectDetailsVo.getWarehouseCode()); - BaseResponse> vos=ShRequester.getsystem$order$index(query2); - IndexQuery query1=new IndexQuery(); - query1.setLimit("20"); - query1.setPage("1"); - query1.setSearch_no(vos.getData().getList().get(0).getOrder_no()); - BaseResponseListObj indexVoBaseResponseListObj =ShRequester.get_order_list(query1).getData(); - if(indexVoBaseResponseListObj.getCount()!=0){ - projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power().equals(null)?"0":indexVoBaseResponseListObj.getList().get(0).getTotal_day_power()); - } - if(info!=null){ - List list=crmMapper.getProjectFilesByMainSid(info.getProjectSid()); - if(list.size()!=0){ - projectDetailsVo.setUrlsVos(list); - } - } - + sids.add(info.getProjectSid()); + } + IndexQuery query2 =new IndexQuery(); + query2.setPage("1"); + query2.setLimit("10"); + query2.setOrder_type("10"); + query2.setOrder_id(projectDetailsVo.getWarehouseCode()); + BaseResponse> vos=ShRequester.getsystem$order$index(query2); + IndexQuery query1=new IndexQuery(); + query1.setLimit("20"); + query1.setPage("1"); + query1.setSearch_no(vos.getData().getList().get(0).getOrder_no()); + BaseResponseListObj indexVoBaseResponseListObj =ShRequester.get_order_list(query1).getData(); + if(indexVoBaseResponseListObj.getCount()!=0){ + projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power().equals(null)?"0":indexVoBaseResponseListObj.getList().get(0).getTotal_day_power()); + } + List list=crmMapper.getProjectFilesByMainSid(sids.toArray()); + if(list.size()!=0){ + projectDetailsVo.setUrlsVos(list); } - return rb.success().setData(projectDetailsVos); - } - + return rb.success().setData(projectDetailsVo); + } @ApiOperation("项目概况") @@ -607,48 +621,52 @@ public class DataCenterRest { projectDetailsVos.add(d); } for (ProjectDetailsVo projectDetailsVo : projectDetailsVos) { - ProjectInfo info= crmMapper.getProjectByShSid(projectDetailsVo.getSid()); - if(null!=info){ - List vos=crmMapper.getBalanceByProjectSid(info.getProjectSid()); - if(info!=null){ - String nodde=crmMapper.getNodeValueByProjectSid(info.getProjectSid()); - projectDetailsVo.setCreditStage(nodde); - } - List s=new ArrayList<>(); - for (ShCreditBalanceCrmVo vo : vos) { - if(vo.getType().equals("1")){ - projectDetailsVo.setExpectedCompletionDate(vo.getExpectedCompletionDate()); - projectDetailsVo.setExpectedDeliveryDate(vo.getExpectedDeliveryDate()); - projectDetailsVo.setCreditNature(vo.getCreditNature()); - projectDetailsVo.setMoney(projectDetailsVo.getMoney().add(vo.getMoney())); - projectDetailsVo.setTbdate(vo.getTbdate()); - }else{ - projectDetailsVo.setHkMoney(projectDetailsVo.getMoney().add(vo.getMoney())); + List infos= crmMapper.getProjectByShSid(projectDetailsVo.getSid()); + List sids=new ArrayList<>(); + for (ProjectInfo info : infos) { + if(null!=info){ + List vos=crmMapper.getBalanceByProjectSid(info.getProjectSid()); + if(info!=null){ + String nodde=crmMapper.getNodeValueByProjectSid(info.getProjectSid()); + projectDetailsVo.setCreditStage(nodde); + } + List s=new ArrayList<>(); + for (ShCreditBalanceCrmVo vo : vos) { + if(vo.getType().equals("1")){ + projectDetailsVo.setExpectedCompletionDate(DateUtil.parse(vo.getExpectedCompletionDate())); + projectDetailsVo.setExpectedDeliveryDate(DateUtil.parse(vo.getExpectedDeliveryDate())); + projectDetailsVo.setCreditNature(vo.getCreditNature()); + projectDetailsVo.setMoney(projectDetailsVo.getMoney().add(vo.getMoney())); + projectDetailsVo.setTbdate(vo.getTbdate()); + }else{ + projectDetailsVo.setHkMoney(projectDetailsVo.getMoney().add(vo.getMoney())); + } + s.add(vo.getSid()); + } + if(s.size()!=0){ + List vos9=projectCreditFileFeign.getUrlsByMainsid(s).getData(); + projectDetailsVo.setUrls(vos9); + } + List vos1=crmMapper.getEngineeringByProject(info.getProjectSid()); + for (ProjectEngineeringProgressVo projectEngineeringProgressVo : vos1) { + List urlVos=crmMapper.getEnginProgFile(projectEngineeringProgressVo.getSid()); + projectEngineeringProgressVo.setUrls(urlVos); + } + projectDetailsVo.setProjectEngineeringList(vos1); + if(vos1.size()!=0){ + projectDetailsVo.setProjectEngineeringProgress(vos1.get(0)); + } + List vo33=crmMapper.getLogByProject(info.getProjectSid()); + for (ProjectSupervisionLogVo projectSupervisionLogVo : vo33) { + List urlVos=crmMapper.getSupervisionLogFile(projectSupervisionLogVo.getSid()); + projectSupervisionLogVo.setUrls(urlVos); + } + projectDetailsVo.setProjectSupervisionLogList(vo33); + if(vo33.size()!=0){ + projectDetailsVo.setProjectSupervisionLog(vo33.get(0)); } - s.add(vo.getSid()); - } - if(s.size()!=0){ - List vos9=projectCreditFileFeign.getUrlsByMainsid(s).getData(); - projectDetailsVo.setUrls(vos9); - } - List vos1=crmMapper.getEngineeringByProject(info.getProjectSid()); - for (ProjectEngineeringProgressVo projectEngineeringProgressVo : vos1) { - List urlVos=crmMapper.getEnginProgFile(projectEngineeringProgressVo.getSid()); - projectEngineeringProgressVo.setUrls(urlVos); - } - projectDetailsVo.setProjectEngineeringList(vos1); - if(vos1.size()!=0){ - projectDetailsVo.setProjectEngineeringProgress(vos1.get(0)); - } - List vo33=crmMapper.getLogByProject(info.getProjectSid()); - for (ProjectSupervisionLogVo projectSupervisionLogVo : vo33) { - List urlVos=crmMapper.getSupervisionLogFile(projectSupervisionLogVo.getSid()); - projectSupervisionLogVo.setUrls(urlVos); - } - projectDetailsVo.setProjectSupervisionLogList(vo33); - if(vo33.size()!=0){ - projectDetailsVo.setProjectSupervisionLog(vo33.get(0)); } + sids.add(info.getProjectSid()); } IndexQuery query2 =new IndexQuery(); query2.setPage("1"); @@ -664,11 +682,9 @@ public class DataCenterRest { if(indexVoBaseResponseListObj.getCount()!=0){ projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power().equals(null)?"0":indexVoBaseResponseListObj.getList().get(0).getTotal_day_power()); } - if(info!=null){ - List list=crmMapper.getProjectFilesByMainSid(info.getProjectSid()); - if(list.size()!=0){ - projectDetailsVo.setUrlsVos(list); - } + List list=crmMapper.getProjectFilesByMainSid(sids.toArray()); + if(list.size()!=0){ + projectDetailsVo.setUrlsVos(list); } } js1.setRecords(projectDetailsVos); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java index 2e2b2026..7b1c05d9 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java @@ -185,7 +185,7 @@ public interface CrmMapper extends BaseMapper { @Select("select * from enterprise_project where projectSid=#{projectSid}") List getEnterByProjetSid(@Param("projectSid") String projectSid); @Select("select * from storehouse_project where shSid=#{shSid}") - ProjectInfo getProjectByShSid(@Param("shSid") String shSid); + List getProjectByShSid(@Param("shSid") String shSid); @Select("select type,money ,tbdate ,expectedCompletionDate ,expectedDeliveryDate,creditNature,creditStage from project_credit_balance where projectSid=#{projectSid} and type='1'") List getBalanceByProjectSid(@Param("projectSid") String projectSid); @Select("select * from project_engineering_progress where projectSid=#{projectSid} order by orderDate desc") @@ -203,6 +203,16 @@ public interface CrmMapper extends BaseMapper { List getSupervisionLogFile(@Param("mainSid") String mainSid); @Select("select * from project_engin_prog_file where mainSid=#{mainSid}") List getEnginProgFile(@Param("mainSid") String mainSid); - @Select("select * from project_files where mainSid=#{mainSid}") - List getProjectFilesByMainSid(@Param("mainSid") String mainSid); + @Select({ + "" + }) + List getProjectFilesByMainSid(@Param("ids") Object[] ids); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShCreditBalanceCrmVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShCreditBalanceCrmVo.java index fcd6be40..463ef0e4 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShCreditBalanceCrmVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShCreditBalanceCrmVo.java @@ -19,8 +19,8 @@ public class ShCreditBalanceCrmVo { private String projectname; private String enterpriseSid; private String enterpriseName; - private Date expectedCompletionDate;//预计完工日期 - private Date expectedDeliveryDate;//预计到货日期 + private String expectedCompletionDate;//预计完工日期 + private String expectedDeliveryDate;//预计到货日期 private String creditNature;//用信性质 private String creditStage;//用信阶段 private String pzfile;