platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
@@ -260,6 +260,12 @@ @Schema(description = "开票金额") private BigDecimal billingAmout; @Schema(description = "选商方式") private String selectionMethod; @Schema(description = "是否关联交易") private String isRelated; private List<ContractPaymentScheduleAddDTO> contractPaymentSchedule; private List<ContractSubjectMatterAddDTO> contractSubjectMatter; platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
@@ -418,4 +418,12 @@ @Schema(description = "损失金额") @Column(columnDefinition = "decimal(10,2) DEFAULT '0.00' comment '损失金额'") private BigDecimal dropAmount; @Schema(description = "选商方式") @Column(columnDefinition = "VARCHAR(50) comment '选商方式'") private String selectionMethod; @Schema(description = "是否关联交易") @Column(name = "is_related",columnDefinition = "VARCHAR(50) comment '是否关联交易'") private String isRelated; } platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
@@ -251,6 +251,12 @@ private BigDecimal paidAmount; @Schema(description = "选商方式") private String selectionMethod; @Schema(description = "是否关联交易") private String isRelated; private ContractInvoiceBipVo bipVo; private List<ContractPaymentSchedule> contractPaymentSchedule; platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
@@ -7,12 +7,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.by4cloud.platformx.business.entity.Product; import com.by4cloud.platformx.business.vo.BusinessCustomerSelectVo; import com.by4cloud.platformx.common.core.util.R; import com.by4cloud.platformx.common.log.annotation.SysLog; import com.by4cloud.platformx.business.entity.BusinessCustomer; import com.by4cloud.platformx.business.service.BusinessCustomerService; import com.by4cloud.platformx.common.security.annotation.Inner; import com.by4cloud.platformx.common.security.util.SecurityUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; import com.by4cloud.platformx.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -23,6 +26,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -41,6 +45,15 @@ private final BusinessCustomerService businessCustomerService; @Value("${dept.smj}") private String smj; @Value("${dept.smjsc}") private String smjsc; @Value("${dept.smjzt}") private String smjzt; /** * 分页查询 * @param page 分页对象 @@ -51,6 +64,21 @@ @GetMapping("/page" ) @PreAuthorize("@pms.hasPermission('business_businessCustomer_view')" ) public R getBusinessCustomerPage(@ParameterObject Page page, @ParameterObject BusinessCustomer businessCustomer) { if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) { LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery(); wrapper.eq(businessCustomer.getIndustryId()!=null,BusinessCustomer::getIndustryId,businessCustomer.getIndustryId()); wrapper.eq(businessCustomer.getAreaId()!=null,BusinessCustomer::getAreaId,businessCustomer.getAreaId()); wrapper.like(StrUtil.isNotEmpty(businessCustomer.getCompanyName()),BusinessCustomer::getCompanyName,businessCustomer.getCompanyName()); List<String> smjList = new ArrayList<>(); smjList.add(smj); smjList.add(smjsc); smjList.add(smjzt); wrapper.in(BusinessCustomer::getCompId, smjList); wrapper.orderByDesc(BusinessCustomer::getCreateTime); return R.ok(businessCustomerService.page(page, wrapper)); } LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery(); wrapper.eq(businessCustomer.getIndustryId()!=null,BusinessCustomer::getIndustryId,businessCustomer.getIndustryId()); wrapper.eq(businessCustomer.getAreaId()!=null,BusinessCustomer::getAreaId,businessCustomer.getAreaId()); @@ -68,6 +96,25 @@ @GetMapping("/list" ) @PreAuthorize("@pms.hasPermission('business_businessCustomer_view')" ) public R getBusinessCustomerList(@ParameterObject BusinessCustomer businessCustomer) { if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) { LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotEmpty(businessCustomer.getCompanyName()),BusinessCustomer::getCompanyName,businessCustomer.getCompanyName()); List<String> smjList = new ArrayList<>(); smjList.add(smj); smjList.add(smjsc); smjList.add(smjzt); wrapper.in(BusinessCustomer::getCompId, smjList); List<BusinessCustomer> businessCustomerList = businessCustomerService.list(wrapper); if (CollUtil.isNotEmpty(businessCustomerList)){ List<BusinessCustomerSelectVo> voList = BeanUtil.copyToList(businessCustomerList, BusinessCustomerSelectVo.class); if (voList.size()>1000){ return R.ok(voList.subList(0,1000)); } return R.ok(voList); } } LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotEmpty(businessCustomer.getCompanyName()),BusinessCustomer::getCompanyName,businessCustomer.getCompanyName()); List<BusinessCustomer> businessCustomerList = businessCustomerService.listByScope(wrapper); platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
@@ -12,6 +12,7 @@ import com.by4cloud.platformx.business.dto.ProductAddDTO; import com.by4cloud.platformx.business.dto.ProductQueryDTO; import com.by4cloud.platformx.business.dto.SyncProductDTO; import com.by4cloud.platformx.business.entity.BusinessCustomer; import com.by4cloud.platformx.business.vo.ProductExcelVO; import com.by4cloud.platformx.business.vo.ProductTreeVo; import com.by4cloud.platformx.common.core.util.R; @@ -20,6 +21,8 @@ import com.by4cloud.platformx.business.entity.Product; import com.by4cloud.platformx.business.service.ProductService; import com.by4cloud.platformx.common.security.annotation.Inner; import com.by4cloud.platformx.common.security.util.SecurityUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; import com.by4cloud.platformx.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -50,6 +53,15 @@ private final ProductService productService; @Value("${dept.smj}") private String smj; @Value("${dept.smjsc}") private String smjsc; @Value("${dept.smjzt}") private String smjzt; /** * 分页查询 * @param page 分页对象 @@ -60,6 +72,32 @@ @GetMapping("/page" ) @PreAuthorize("@pms.hasPermission('business_product_view')" ) public R getProductPage(@ParameterObject Page page, @ParameterObject Product product) { if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) { LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery(); wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId()); wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName()); wrapper.like(StrUtil.isNotEmpty(product.getMainCode()),Product::getMainCode,product.getMainCode()); wrapper.like(StrUtil.isNotEmpty(product.getErpCode()),Product::getErpCode,product.getErpCode()); List<String> smjList = new ArrayList<>(); smjList.add(smj); smjList.add(smjsc); smjList.add(smjzt); wrapper.in(Product::getCompId, smjList); wrapper.orderByDesc(Product::getCreateTime); Page<Product> page1 = productService.page(page, wrapper); List<Product> list = page1.getRecords(); for(Product product1 : list){ Product parent = productService.getById(product1.getParentId()); if(parent==null){ product1.setParentName("根级产品"); }else { product1.setParentName(parent.getProductName()); } } page1.setRecords(list); return R.ok(page1); } LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery(); wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId()); wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName()); platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -489,7 +489,16 @@ Contract contract = baseMapper.selectById(id); BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId()); if (ObjUtil.isNull(customer)){ return R.failed("客户查询异常"); } R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId()); if (!r.isOk()){ return R.failed("信息查询异常"); } SysDept comp = r.getData(); //简易合同无法继续后续操作 if (StrUtil.equals(contract.getContractCategory(), "simple")) { return R.failed("请补充标的物和收款阶段后再进行操作！"); @@ -498,8 +507,8 @@ eq(ContractSubjectMatter::getContractId,contract.getId())); //合同中心审核 JSONObject requestApply = new JSONObject(); requestApply.put("fd_selectionmethod", "公开招标"); requestApply.put("fd_isrelated", "是"); requestApply.put("fd_selectionmethod", contract.getSelectionMethod()); requestApply.put("fd_isrelated", contract.getIsRelated()); requestApply.put("fd_bizId", contract.getId()); requestApply.put("fd_remark", contract.getRemark()); requestApply.put("fd_MainContent", ""); @@ -539,6 +548,26 @@ requestApply.put("fd_customerName", contract.getPartyA()); requestApply.put("fd_systemSource", "非煤销售系统"); requestApply.put("fd_type", "00"); JSONArray signList = new JSONArray(); JSONObject j = new JSONObject(); j.put("fd_standing","甲"); j.put("fd_Iden",customer.getCreditCode()); j.put("fd_signMain","2"); signList.add(j); JSONObject y = new JSONObject(); y.put("fd_standing","甲"); y.put("fd_Iden",comp.getOrgCode()); y.put("fd_signMain","1"); signList.add(y); requestApply.put("fd_signList", signList); JSONArray attList = new JSONArray(); JSONObject att = new JSONObject(); att.put("fd_attNum","1"); att.put("fd_attName",contract.getAttachmentName()); att.put("fd_attQuality","00"); att.put("fd_attcontent",NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl())); attList.add(att); requestApply.put("attList", att); log.info("合同中心合同起草接口入参：{}", requestApply.toJSONString()); String respApply = HttpUtil.post("https://oa.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString()); log.info("合同中心合同起草接口回参：{}", respApply); @@ -2344,6 +2373,18 @@ @Override public R pushCenter(Long id) { Contract contract = baseMapper.selectById(id); BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId()); if (ObjUtil.isNull(customer)){ return R.failed("客户查询异常"); } R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId()); if (!r.isOk()){ return R.failed("信息查询异常"); } SysDept comp = r.getData(); List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery() .eq(ContractSubjectMatter::getContractId, id)); JSONObject requestApply = new JSONObject(); @@ -2386,6 +2427,26 @@ requestApply.put("fd_customerName", contract.getPartyA()); requestApply.put("fd_systemSource", "非煤销售系统"); requestApply.put("fd_type", "00"); JSONArray signList = new JSONArray(); JSONObject j = new JSONObject(); j.put("fd_standing","甲"); j.put("fd_Iden",customer.getCreditCode()); j.put("fd_signMain","2"); signList.add(j); JSONObject y = new JSONObject(); y.put("fd_standing","甲"); y.put("fd_Iden",comp.getOrgCode()); y.put("fd_signMain","1"); signList.add(y); requestApply.put("fd_signList", signList); JSONArray attList = new JSONArray(); JSONObject att = new JSONObject(); att.put("fd_attNum","1"); att.put("fd_attName",contract.getAttachmentName()); att.put("fd_attQuality","00"); att.put("fd_attcontent",NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl())); attList.add(att); requestApply.put("attList", att); log.info("合同中心合同起草接口入参：{}", requestApply.toJSONString()); String respApply = HttpUtil.post("https://oa.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString()); log.info("合同中心合同起草接口回参：{}", respApply); platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java
@@ -69,7 +69,6 @@ public R contractAmountAnalysis(AnalysisCommonDTO commonDTO) { List<Long> compIds = new ArrayList<>(); compIds.add(Long.valueOf(sgb)); compIds.add(Long.valueOf(smj)); compIds.add(Long.valueOf(tfgs)); compIds.add(Long.valueOf(ymj)); compIds.add(Long.valueOf(jxc)); @@ -477,11 +476,12 @@ return R.failed("行业字典分类获取异常"); } List<Long> compIds = new ArrayList<>(); compIds.add(Long.valueOf(sgb)); compIds.add(Long.valueOf(smj)); compIds.add(Long.valueOf(sgb)); compIds.add(Long.valueOf(jxc)); compIds.add(Long.valueOf(tfgs)); compIds.add(Long.valueOf(ymj)); compIds.add(Long.valueOf(jxc)); List<AgingAnalysisVo> result = new ArrayList<>(); AgingQueryDTO queryDTO = new AgingQueryDTO(); @@ -576,11 +576,11 @@ public R agingAnalysis(AnalysisCommonDTO commonDTO) { if (commonDTO.getAgingType().equals("2")) { List<Long> compIds = new ArrayList<>(); compIds.add(Long.valueOf(sgb)); compIds.add(Long.valueOf(smj)); compIds.add(Long.valueOf(sgb)); compIds.add(Long.valueOf(jxc)); compIds.add(Long.valueOf(tfgs)); compIds.add(Long.valueOf(ymj)); compIds.add(Long.valueOf(jxc)); List<AgingAnalysisVo> result = new ArrayList<>(); AgingQueryDTO queryDTO = new AgingQueryDTO(); List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotalShip(null); @@ -591,7 +591,7 @@ } SysDept dept = r.getData(); AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo(); agingAnalysisVo.setCompanyName(dept.getOrgName()); agingAnalysisVo.setCompanyName(dept.getName()); queryDTO.setCompanyId(dept.getDeptId()); List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalShip(queryDTO); //补全数据 @@ -688,7 +688,7 @@ } SysDept dept = r.getData(); AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo(); agingAnalysisVo.setCompanyName(dept.getOrgName()); agingAnalysisVo.setCompanyName(dept.getName()); queryDTO.setCompanyId(dept.getDeptId()); List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalInvoice(queryDTO); //补全数据 @@ -867,11 +867,12 @@ @Override public R agingAnalysisTotalScale(AnalysisCommonDTO commonDTO) { List<Long> compIds = new ArrayList<>(); compIds.add(Long.valueOf(sgb)); compIds.add(Long.valueOf(smj)); compIds.add(Long.valueOf(sgb)); compIds.add(Long.valueOf(tfgs)); compIds.add(Long.valueOf(ymj)); compIds.add(Long.valueOf(jxc)); compIds.add(Long.valueOf(ymj)); List<AgingAnalysisVo> result = new ArrayList<>(); AgingQueryDTO queryDTO = new AgingQueryDTO(); List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotalScale(null); @@ -882,7 +883,7 @@ } SysDept dept = r.getData(); AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo(); agingAnalysisVo.setCompanyName(dept.getOrgName()); agingAnalysisVo.setCompanyName(dept.getName()); queryDTO.setCompanyId(dept.getDeptId()); List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalScale(queryDTO); //补全数据 @@ -966,95 +967,99 @@ @Override public R homeZbjt() { List<HomeZbjtVo> homeZbjtVoList = new ArrayList<>(); //合同签订 sgb smj jxc tfgs ymj HomeZbjtVo htqd = contractMapper.homeZbjt(); homeZbjtVoList.add(htqd); //回款 HomeZbjtVo hk = paymentSlipMapper.homeZbjt(); homeZbjtVoList.add(hk); //出货 HomeZbjtVo ch = contractOutBoundMapper.homeZbjt(); homeZbjtVoList.add(ch); // HomeZbjtVo ch = contractOutBoundMapper.homeZbjt(); // homeZbjtVoList.add(ch); //只保留销售收入 回款 新增合同 //开票 HomeZbjtVo kp = contractInvoiceMapper.homeZbjt(); homeZbjtVoList.add(kp); //回款 HomeZbjtVo hk = paymentSlipMapper.homeZbjt(); homeZbjtVoList.add(hk); //合同签订 sgb smj jxc tfgs ymj HomeZbjtVo htqd = contractMapper.homeZbjt(); homeZbjtVoList.add(htqd); //赊销产生值 今天发货加今天开票额 // if (ObjUtil.isNotNull(ch)&&ObjUtil.isNotNull(kp)){ // HomeZbjtVo sxsy = ch.add(kp); // homeZbjtVoList.add(sxsy); // }else if (ObjUtil.isNotNull(ch)&&ObjUtil.isNull(kp)){ homeZbjtVoList.add(ch); // homeZbjtVoList.add(ch); // }else if (ObjUtil.isNull(ch)&&ObjUtil.isNotNull(kp)){ // homeZbjtVoList.add(kp); // }else { // homeZbjtVoList.add(new HomeZbjtVo()); // } //赊销累计剩余值 今日发货且没开票的出货 HomeZbjtVo sx = contractOutBoundMapper.homeZbjtSX(); homeZbjtVoList.add(sx); HomeZbjtVo yq = currentOverdueMapper.homeZbjt(); //逾期累计剩余 今日产生逾期 含历史 HomeZbjtVo ls = historyOverdueMapper.homeZbjt(); if (ObjUtil.isNotNull(ls)&&ObjUtil.isNotNull(yq)){ homeZbjtVoList.add(yq.add(ls)); }else if (ObjUtil.isNotNull(ls)&&ObjUtil.isNull(yq)){ homeZbjtVoList.add(ls); }else if (ObjUtil.isNull(ls)&&ObjUtil.isNotNull(yq)){ homeZbjtVoList.add(yq); }else { homeZbjtVoList.add(new HomeZbjtVo()); } //逾期产生值 今天产生-今天已付 homeZbjtVoList.add(yq); // HomeZbjtVo sx = contractOutBoundMapper.homeZbjtSX(); // homeZbjtVoList.add(sx); // HomeZbjtVo yq = currentOverdueMapper.homeZbjt(); // //逾期累计剩余 今日产生逾期 含历史 // HomeZbjtVo ls = historyOverdueMapper.homeZbjt(); // if (ObjUtil.isNotNull(ls)&&ObjUtil.isNotNull(yq)){ // homeZbjtVoList.add(yq.add(ls)); // }else if (ObjUtil.isNotNull(ls)&&ObjUtil.isNull(yq)){ // homeZbjtVoList.add(ls); // }else if (ObjUtil.isNull(ls)&&ObjUtil.isNotNull(yq)){ // homeZbjtVoList.add(yq); // }else { // homeZbjtVoList.add(new HomeZbjtVo()); // } // //逾期产生值 今天产生-今天已付 // // homeZbjtVoList.add(yq); return R.ok(homeZbjtVoList); } @Override public R homeZgs() { List<HomeZgsVo> homeZbjtVoList = new ArrayList<>(); //合同签订 华北 西北 东北 海外 HomeZgsVo htqd = contractMapper.homeZgs(SecurityUtils.getUser().getCompId()); homeZbjtVoList.add(htqd); //回款 HomeZgsVo hk = paymentSlipMapper.homeZgs(SecurityUtils.getUser().getCompId()); homeZbjtVoList.add(hk); //出货 HomeZgsVo ch = contractOutBoundMapper.homeZgs(SecurityUtils.getUser().getCompId()); homeZbjtVoList.add(ch); // //出货 // HomeZgsVo ch = contractOutBoundMapper.homeZgs(SecurityUtils.getUser().getCompId()); // homeZbjtVoList.add(ch); //开票 HomeZgsVo kp = contractInvoiceMapper.homeZgs(SecurityUtils.getUser().getCompId()); homeZbjtVoList.add(kp); //回款 HomeZgsVo hk = paymentSlipMapper.homeZgs(SecurityUtils.getUser().getCompId()); homeZbjtVoList.add(hk); //合同签订 华北 西北 东北 海外 HomeZgsVo htqd = contractMapper.homeZgs(SecurityUtils.getUser().getCompId()); homeZbjtVoList.add(htqd); //赊销产生值 // if (ObjUtil.isNotNull(ch)&&ObjUtil.isNotNull(kp)){ // HomeZgsVo sxsy = ch.add(kp); // homeZbjtVoList.add(sxsy); // }else if (ObjUtil.isNotNull(ch)&&ObjUtil.isNull(kp)){ homeZbjtVoList.add(ch); // homeZbjtVoList.add(ch); // }else if (ObjUtil.isNull(ch)&&ObjUtil.isNotNull(kp)){ // homeZbjtVoList.add(kp); // }else { // homeZbjtVoList.add(new HomeZgsVo()); // } //赊销累计剩余值 HomeZgsVo sx = contractOutBoundMapper.homeZgsSX(SecurityUtils.getUser().getCompId()); homeZbjtVoList.add(sx); HomeZgsVo yq = currentOverdueMapper.homeZgs(SecurityUtils.getUser().getCompId()); //逾期产生值 HomeZgsVo ls = historyOverdueMapper.homeZgs(SecurityUtils.getUser().getCompId()); if (ObjUtil.isNotNull(ls)&&ObjUtil.isNotNull(yq)){ homeZbjtVoList.add(yq.add(ls)); }else if (ObjUtil.isNotNull(ls)&&ObjUtil.isNull(yq)){ homeZbjtVoList.add(ls); }else if (ObjUtil.isNull(ls)&&ObjUtil.isNotNull(yq)){ homeZbjtVoList.add(yq); }else { homeZbjtVoList.add(new HomeZgsVo()); } //逾期累计剩余 homeZbjtVoList.add(yq); // HomeZgsVo sx = contractOutBoundMapper.homeZgsSX(SecurityUtils.getUser().getCompId()); // homeZbjtVoList.add(sx); // // HomeZgsVo yq = currentOverdueMapper.homeZgs(SecurityUtils.getUser().getCompId()); // // //逾期产生值 // HomeZgsVo ls = historyOverdueMapper.homeZgs(SecurityUtils.getUser().getCompId()); // if (ObjUtil.isNotNull(ls)&&ObjUtil.isNotNull(yq)){ // homeZbjtVoList.add(yq.add(ls)); // }else if (ObjUtil.isNotNull(ls)&&ObjUtil.isNull(yq)){ // homeZbjtVoList.add(ls); // }else if (ObjUtil.isNull(ls)&&ObjUtil.isNotNull(yq)){ // homeZbjtVoList.add(yq); // }else { // homeZbjtVoList.add(new HomeZgsVo()); // } // //逾期累计剩余 // homeZbjtVoList.add(yq); return R.ok(homeZbjtVoList); }
