From e133116c15888468733b27f6058b147435daafc8 Mon Sep 17 00:00:00 2001 From: 17602169347 Date: Thu, 9 Mar 2023 09:47:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchaseorderController.java | 7 +- .../mapper/PurchaseorderitemMapper.java | 4 + .../PurchaseorderPagination.java | 4 + .../impl/PurchaseorderitemServiceImpl.java | 88 +++++++++++++++++-- .../purchaseorder/PurchaseorderMapper.xml | 30 +++++++ .../basicInformation/purchaseorder/index.vue | 2 +- 6 files changed, 124 insertions(+), 11 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index d3a23f65..2fb90fcd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -182,13 +182,16 @@ public class PurchaseorderController { public ActionResult list(@RequestBody PurchaseorderPagination purchaseorderPagination)throws IOException{ List list= purchaseorderitemService.getList(purchaseorderPagination); //处理id字段转名称，若无需转或者为空可删除 - for(PurchaseorderitemEntity entity:list){ + /*for(PurchaseorderitemEntity entity:list){ Map contractCodeMap = new HashMap<>(); entity.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229","id","contract_name",entity.getContractCode(),contractCodeMap)); Map supplierIdMap = new HashMap<>(); entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",entity.getSupplierId(),supplierIdMap)); + + + entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); - } + }*/ List listVO=JsonUtil.getJsonToList(list,PurchaseorderListVO.class); for(PurchaseorderListVO purchaseorderVO:listVO){ } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java index 3de8063d..f3ae0d21 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java @@ -3,8 +3,11 @@ package jnpf.purchaseorder.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.mobilePort.entity.PurchaseOrderVO; import jnpf.purchaseorder.entity.PurchaseorderitemEntity; +import jnpf.purchaseorder.model.purchaseorder.PurchaseorderPagination; import org.apache.ibatis.annotations.Param; import java.util.HashMap; @@ -23,4 +26,5 @@ public interface PurchaseorderitemMapper extends BaseMapper> getPdfInfo(@Param("ew")Wrapper queryWrapper); List> getWordExcelInfo(@Param("ew")Wrapper queryWrapper); List> getVehicleInfo(@Param("ew")Wrapper queryWrapper); + IPage queryByKeyword(@Param("page") Page page, @Param("purchaseorderPagination") PurchaseorderPagination purchaseorderPagination); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java index abd5a820..2a9166e2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java @@ -3,6 +3,8 @@ package jnpf.purchaseorder.model.purchaseorder; import lombok.Data; import jnpf.base.Pagination; + +import java.util.Date; import java.util.List; /** @@ -22,6 +24,8 @@ public class PurchaseorderPagination extends Pagination { private String supplierName; private List creatorTime; private String status; + private Date startDate; + private Date endDate; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java index 0bae3197..4462bce2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java @@ -23,6 +23,8 @@ import jnpf.base.controller.BillRuleController; import jnpf.base.entity.ProvinceEntity; import jnpf.base.mapper.ProvinceMapper; import jnpf.config.ConfigValueUtil; +import jnpf.contractfile.entity.ContractFileEntity; +import jnpf.contractfile.service.ContractFileService; import jnpf.customer.entity.CustomerEntity; import jnpf.customer.mapper.CustomerVMapper; import jnpf.exception.DataException; @@ -838,19 +840,89 @@ if (pMap!=null&&pMap.size()>0){ } + } } - } - if(StringUtil.isNotEmpty(purchaseorderPagination.getDocumentNo())){ + if(StringUtil.isNotEmpty(purchaseorderPagination.getCreatorTime())){ + List PoundDateList = purchaseorderPagination.getCreatorTime(); + Long fir = Long.valueOf(PoundDateList.get(0)); + Long sec = Long.valueOf(PoundDateList.get(1)); + purchaseorderPagination.setStartDate(new Date(fir)); + purchaseorderPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + } + if(StringUtil.isEmpty(purchaseorderPagination.getSidx())){ + purchaseorderPagination.setSidx("CREATOR_TIME"); + purchaseorderPagination.setSort("DESC"); + }else{ + try { + String sidx = purchaseorderPagination.getSidx(); + PoundlistEntity poundlistEntity = new PoundlistEntity(); + Field declaredField = poundlistEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + purchaseorderPagination.setSidx(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + Page page=new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize()); + IPage iPage = purchaseorderitemMapper.queryByKeyword(page, purchaseorderPagination); + return purchaseorderPagination.setData(iPage.getRecords(),iPage.getTotal()); + + + + + + + + /*if(StringUtil.isNotEmpty(purchaseorderPagination.getDocumentNo())){ purchaseorderNum++; purchaseorderQueryWrapper.lambda().like(PurchaseorderitemEntity::getDocumentNo,purchaseorderPagination.getDocumentNo()); - } + } + if(StringUtil.isNotEmpty(purchaseorderPagination.getStatus())){ + purchaseorderNum++; + purchaseorderQueryWrapper.lambda().like(PurchaseorderitemEntity::getStatus,purchaseorderPagination.getStatus()); + } + if(StringUtil.isNotEmpty(purchaseorderPagination.getCreatorTime())){ + purchaseorderNum++; + List PoundDateList = purchaseorderPagination.getCreatorTime(); + Long fir = Long.valueOf(PoundDateList.get(0)); + Long sec = Long.valueOf(PoundDateList.get(1)); + + purchaseorderQueryWrapper.lambda().ge(PurchaseorderitemEntity::getCreatorTime, new Date(fir)) + .le(PurchaseorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + + } + if(StringUtil.isNotEmpty(purchaseorderPagination.getPurchaseName())){ + QueryWrapper contractFileQueryWrapper =new QueryWrapper<>(); + contractFileQueryWrapper.lambda().like(ContractFileEntity::getContractName, purchaseorderPagination.getPurchaseName()); + contractFileQueryWrapper.lambda().select(ContractFileEntity::getId); + List customerIdList = contractFileService.listObjs(contractFileQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); + purchaseorderNum++; + if(customerIdList.size() > 0){ + purchaseorderQueryWrapper.lambda().in(PurchaseorderitemEntity::getContractCode,customerIdList); + }else{ + purchaseorderQueryWrapper.lambda().eq(PurchaseorderitemEntity::getContractCode, purchaseorderPagination.getPurchaseName()); + } + } + if(StringUtil.isNotEmpty(purchaseorderPagination.getSupplierName())){ + QueryWrapper customerQueryWrapper =new QueryWrapper<>(); + customerQueryWrapper.lambda().like(SupplierEntity::getSupplierName, purchaseorderPagination.getSupplierName()); + customerQueryWrapper.lambda().select(SupplierEntity::getId); + List customerIdList = supplierService.listObjs(customerQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); + purchaseorderNum++; + if(customerIdList.size() > 0){ + purchaseorderQueryWrapper.lambda().in(PurchaseorderitemEntity::getSupplierId,customerIdList); + }else{ + purchaseorderQueryWrapper.lambda().eq(PurchaseorderitemEntity::getSupplierId, purchaseorderPagination.getSupplierName()); + } + } if(AllIdList.size()>0){ purchaseorderQueryWrapper.lambda().in(PurchaseorderitemEntity::getId, AllIdList); } //排序 if(StringUtil.isEmpty(purchaseorderPagination.getSidx())){ - purchaseorderQueryWrapper.lambda().orderByDesc(PurchaseorderitemEntity::getId); + purchaseorderQueryWrapper.lambda().orderByDesc(PurchaseorderitemEntity::getId); }else{ try { String sidx = purchaseorderPagination.getSidx(); @@ -864,13 +936,13 @@ if (pMap!=null&&pMap.size()>0){ } } if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize()); - IPage userIPage=this.page(page, purchaseorderQueryWrapper); - return purchaseorderPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + Page page=new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize()); + IPage userIPage=this.page(page, purchaseorderQueryWrapper); + return purchaseorderPagination.setData(userIPage.getRecords(),userIPage.getTotal()); }else{ List list = new ArrayList(); return purchaseorderPagination.setData(list, list.size()); - } + }*/ } @Override public List getTypeList(PurchaseorderPagination purchaseorderPagination, String dataType){ diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml index b341f6f0..8a69ba0b 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml @@ -267,4 +267,34 @@ LEFT JOIN jg_vehicle e ON c.vehicle_id = e.id ) aaa ${ew.customSqlSegment} + + + diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue index 0ee0449d..7ca2301e 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue @@ -543,7 +543,7 @@ } const ids = this.multipleSelection.join() request({ - url: `/api/purchaseorderNum = '';/Purchaseorder/batchQueryPurchaseorder/${ids}`, + url: `/api/purchaseorder/Purchaseorder/batchQueryPurchaseorder/${ids}`, method: 'get' }).then(res => { var amountFlag = true;