From a2b33f3b53f4fe2ddfa85bbe588be6fbfbd4997c Mon Sep 17 00:00:00 2001 From: zt Date: Sat, 23 Aug 2025 10:24:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/org/dromara/test/Ys7Test.java | 112 ------------------ .../mapper/MatMaterialsInventoryMapper.java | 12 +- .../out/controller/OutTableController.java | 25 +++- .../materials/MatMaterialsInventoryMapper.xml | 18 ++- 4 files changed, 37 insertions(+), 130 deletions(-) delete mode 100644 xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/Ys7Test.java diff --git a/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/Ys7Test.java b/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/Ys7Test.java deleted file mode 100644 index 4893002a..00000000 --- a/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/Ys7Test.java +++ /dev/null @@ -1,112 +0,0 @@ -package org.dromara.test; - -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.dromara.formalities.domain.bo.AddBusFormalitiesAreConsolidatedBo; -import org.dromara.formalities.domain.bo.BusFormalitiesAreConsolidatedBo; -import org.dromara.formalities.domain.bo.BusListOfFormalitiesBo; -import org.dromara.formalities.domain.vo.BusListOfFormalitiesVo; -import org.dromara.formalities.service.IBusFormalitiesAreConsolidatedService; -import org.dromara.formalities.service.IBusListOfFormalitiesService; -import org.dromara.manager.ys7manager.Ys7Manager; -import org.dromara.manager.ys7manager.Ys7RequestUtils; -import org.dromara.manager.ys7manager.vo.Ys7QueryDeviceResponseVo; -import org.dromara.tender.domain.bo.BusSegmentedIndicatorPlanningBo; -import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo; -import org.dromara.tender.service.IBusSegmentedIndicatorPlanningService; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.web.multipart.MultipartFile; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * @author lilemy - * @date 2025/6/12 17:06 - */ -@Slf4j -@SpringBootTest -public class Ys7Test { - - @Resource - private Ys7Manager ys7Manager; - - @Test - void test() { - String token = ys7Manager.getToken(); - List ys7QueryDeviceResponseVos = Ys7RequestUtils.queryDeviceVoList(token, 1, 20); - System.out.println(ys7QueryDeviceResponseVos); - } - - @Test - void testCaptureDevicePic() { - String pic = ys7Manager.getCaptureDevicePic("AE9470016", 1, 1); - System.out.println(pic); - } - - @Resource - private IBusListOfFormalitiesService busListOfFormalitiesService; - - @Test - public void test111(){ - BusListOfFormalitiesBo busListOfFormalitiesBo = new BusListOfFormalitiesBo(); -// busListOfFormalitiesBo.setName("test1"); -// busListOfFormalitiesBo.setPid(1955976169241026561L); -// busListOfFormalitiesService.insertByBo(busListOfFormalitiesBo); -// List tree = busListOfFormalitiesService.getTree(busListOfFormalitiesBo); -// System.out.println(tree); - Boolean b = busListOfFormalitiesService.deleteWithValidByIds(1955976169241026561L, true); - System.out.println(b); - - } - - @Resource - private IBusFormalitiesAreConsolidatedService formalitiesAreConsolidatedService; - - @Test - public void test222(){ - BusFormalitiesAreConsolidatedBo busFormalitiesAreConsolidatedBo = new BusFormalitiesAreConsolidatedBo(); -// List addBusFormalitiesAreConsolidatedBos = new ArrayList<>(); -// AddBusFormalitiesAreConsolidatedBo bo1 = new AddBusFormalitiesAreConsolidatedBo(); -// bo1.setFormalitiesId(1955977461032103939L); -// AddBusFormalitiesAreConsolidatedBo bo2 = new AddBusFormalitiesAreConsolidatedBo(); -// bo2.setFormalitiesId(1955977461032103940L); -// bo2.setFormalitiesPid(1955977461032103939L); -// AddBusFormalitiesAreConsolidatedBo bo3 = new AddBusFormalitiesAreConsolidatedBo(); -// bo3.setFormalitiesId(1955977461032103941L); -// bo3.setFormalitiesPid(1955977461032103939L); -// AddBusFormalitiesAreConsolidatedBo bo4 = new AddBusFormalitiesAreConsolidatedBo(); -// bo4.setFormalitiesId(1955977461032103942L); -// bo4.setFormalitiesPid(1955977461032103939L); -// addBusFormalitiesAreConsolidatedBos.add(bo1); -// addBusFormalitiesAreConsolidatedBos.add(bo2); -// addBusFormalitiesAreConsolidatedBos.add(bo3); -// addBusFormalitiesAreConsolidatedBos.add(bo4); -// busFormalitiesAreConsolidatedBo.setAddBusFormalitiesAreConsolidatedBos(addBusFormalitiesAreConsolidatedBos); -// busFormalitiesAreConsolidatedBo.setProjectId(1555L); -// Boolean b = formalitiesAreConsolidatedService.insertByBo(busFormalitiesAreConsolidatedBo); -// System.out.println(b); -// busFormalitiesAreConsolidatedBo.setId(1956013379818409985L); -// busFormalitiesAreConsolidatedBo.setHead("舟山"); -// busFormalitiesAreConsolidatedBo.setPlanTheStartTime(new Date()); -// busFormalitiesAreConsolidatedBo.setRemark("asdasd"); -// busFormalitiesAreConsolidatedBo.setStatus(0); -// MultipartFile[] files = {}; -// Boolean b = formalitiesAreConsolidatedService.updateByBo(busFormalitiesAreConsolidatedBo, files); -// System.out.println(b); - } - - @Resource - private IBusSegmentedIndicatorPlanningService busSegmentedIndicatorPlanningService; - - @Test - public void test666(){ - BusSegmentedIndicatorPlanningBo bo = new BusSegmentedIndicatorPlanningBo(); - bo.setId(1958169755747459073L); - List more = busSegmentedIndicatorPlanningService.getMore(bo); - System.out.println(more); - } - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatMaterialsInventoryMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatMaterialsInventoryMapper.java index b82b9552..9e00f382 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatMaterialsInventoryMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatMaterialsInventoryMapper.java @@ -27,16 +27,6 @@ public interface MatMaterialsInventoryMapper extends BaseMapperPlus selectLatestByMaterialIds(@Param("ids") List materialIds); + List selectLatestByMaterialIds(@Param("materialIds") List materialIds); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutTableController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutTableController.java index 3c9c7da0..3d47f2e9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutTableController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutTableController.java @@ -257,7 +257,10 @@ public class OutTableController extends BaseController { List busProcurements = outMonthPlanService.purchaseValueA(purchaseValueAReq); BigDecimal purchaseValue = BigDecimal.ZERO; for (BusProcurement busProcurement : busProcurements) { - purchaseValue = purchaseValue.add(busProcurement.getAcceptedQuantity().multiply(busProcurement.getUnitPrice())); + if(busProcurement != null && busProcurement.getAcceptedQuantity() != null && busProcurement.getUnitPrice() != null){ + purchaseValue = purchaseValue.add(busProcurement.getAcceptedQuantity().multiply(busProcurement.getUnitPrice())); + } + } vo.setTotalCompletionOutputValue(purchaseValue); } @@ -326,7 +329,10 @@ public class OutTableController extends BaseController { List busProcurements = outMonthPlanService.purchaseValueA(purchaseValueAReq); BigDecimal purchaseValue = BigDecimal.ZERO; for (BusProcurement busProcurement : busProcurements) { - purchaseValue = purchaseValue.add(busProcurement.getAcceptedQuantity().multiply(busProcurement.getUnitPrice())); + if(busProcurement != null && busProcurement.getAcceptedQuantity() != null && busProcurement.getUnitPrice() != null){ + purchaseValue = purchaseValue.add(busProcurement.getAcceptedQuantity().multiply(busProcurement.getUnitPrice())); + } + } vo.setTotalCompletionOutputValue( designValue.add(constructionValue).add(purchaseValue)); @@ -431,7 +437,10 @@ public class OutTableController extends BaseController { List busProcurements = outMonthPlanService.purchaseValueA(purchaseValueAReq); BigDecimal accumulatedCompletionValue = BigDecimal.ZERO; for (BusProcurement busProcurement : busProcurements) { - accumulatedCompletionValue = accumulatedCompletionValue.add(busProcurement.getAcceptedQuantity().multiply(busProcurement.getUnitPrice())); + if(busProcurement != null && busProcurement.getAcceptedQuantity() != null && busProcurement.getUnitPrice() != null){ + accumulatedCompletionValue = accumulatedCompletionValue.add(busProcurement.getAcceptedQuantity().multiply(busProcurement.getUnitPrice())); + } + } vo.setAccumulatedCompletionValue(accumulatedCompletionValue); @@ -536,7 +545,10 @@ public class OutTableController extends BaseController { List busProcurements = outMonthPlanService.purchaseValueA(purchaseValueAReq); BigDecimal purchaseValue = BigDecimal.ZERO; for (BusProcurement busProcurement : busProcurements) { - purchaseValue = purchaseValue.add(busProcurement.getAcceptedQuantity().multiply(busProcurement.getUnitPrice())); + if(busProcurement != null && busProcurement.getAcceptedQuantity() != null && busProcurement.getUnitPrice() != null){ + purchaseValue = purchaseValue.add(busProcurement.getAcceptedQuantity().multiply(busProcurement.getUnitPrice())); + } + } vo.setOwnerActualTotal( designValue.add(constructionValue).add(purchaseValue).divide(parseUnit)); @@ -549,7 +561,10 @@ public class OutTableController extends BaseController { List busProcurements1 = outMonthPlanService.purchaseValueA(purchaseValueAReq); BigDecimal subPurchaseValue = BigDecimal.ZERO; for (BusProcurement busProcurement : busProcurements1) { - subPurchaseValue = subPurchaseValue.add(busProcurement.getAcceptedQuantity().multiply(busProcurement.getUnitPrice())); + if(busProcurement != null && busProcurement.getAcceptedQuantity() != null && busProcurement.getUnitPrice() != null){ + subPurchaseValue = subPurchaseValue.add(busProcurement.getAcceptedQuantity().multiply(busProcurement.getUnitPrice())); + } + } vo.setSubActualTotal( subDesignValue.add(subConstructionValue).add(subPurchaseValue).divide(parseUnit)); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatMaterialsInventoryMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatMaterialsInventoryMapper.xml index ddbdaed8..a967c3d3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatMaterialsInventoryMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatMaterialsInventoryMapper.xml @@ -1,7 +1,21 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + +