优化

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/Ys7Test.java

@@ -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<Ys7QueryDeviceResponseVo> 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<BusListOfFormalitiesVo> 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<AddBusFormalitiesAreConsolidatedBo> 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<BusBillofquantitiesLimitListVo> more = busSegmentedIndicatorPlanningService.getMore(bo);
-        System.out.println(more);
-    }
-
-}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatMaterialsInventoryMapper.java

@@ -27,16 +27,6 @@ public interface MatMaterialsInventoryMapper extends BaseMapperPlus<MatMaterials
      * @param materialIds 材料id列表
      * @return 每个材料id的最新一条数据
      */
-    @Select("""
+    List<MatMaterialsInventory> selectLatestByMaterialIds(@Param("materialIds") List<Long> materialIds);
-            SELECT *
-            FROM (
-                SELECT m.*,
-                       ROW_NUMBER() OVER (PARTITION BY m.materials_id ORDER BY m.create_time DESC) AS rn
-                FROM mat_materials_inventory m
-                WHERE m.materials_id IN (${ids})
-            ) t
-            WHERE t.rn = 1
-        """)
-    List<MatMaterialsInventory> selectLatestByMaterialIds(@Param("ids") List<Long> materialIds);
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutTableController.java

@@ -257,8 +257,11 @@ public class OutTableController extends BaseController {
                 List<BusProcurement> busProcurements = outMonthPlanService.purchaseValueA(purchaseValueAReq);
                 BigDecimal purchaseValue = BigDecimal.ZERO;
                 for (BusProcurement busProcurement : busProcurements) {
+                    if(busProcurement != null && busProcurement.getAcceptedQuantity() != null && busProcurement.getUnitPrice() != null){
                         purchaseValue = purchaseValue.add(busProcurement.getAcceptedQuantity().multiply(busProcurement.getUnitPrice()));
                     }
+
+                }
                 vo.setTotalCompletionOutputValue(purchaseValue);
             }
 
@@ -326,8 +329,11 @@ public class OutTableController extends BaseController {
             List<BusProcurement> busProcurements = outMonthPlanService.purchaseValueA(purchaseValueAReq);
             BigDecimal purchaseValue = BigDecimal.ZERO;
             for (BusProcurement busProcurement : busProcurements) {
+                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,8 +437,11 @@ public class OutTableController extends BaseController {
                 List<BusProcurement> busProcurements = outMonthPlanService.purchaseValueA(purchaseValueAReq);
                 BigDecimal accumulatedCompletionValue = BigDecimal.ZERO;
                 for (BusProcurement busProcurement : busProcurements) {
+                    if(busProcurement != null && busProcurement.getAcceptedQuantity() != null && busProcurement.getUnitPrice() != null){
                         accumulatedCompletionValue = accumulatedCompletionValue.add(busProcurement.getAcceptedQuantity().multiply(busProcurement.getUnitPrice()));
                     }
+
+                }
                 vo.setAccumulatedCompletionValue(accumulatedCompletionValue);
 
 
@@ -536,8 +545,11 @@ public class OutTableController extends BaseController {
             List<BusProcurement> busProcurements = outMonthPlanService.purchaseValueA(purchaseValueAReq);
             BigDecimal purchaseValue = BigDecimal.ZERO;
             for (BusProcurement busProcurement : busProcurements) {
+                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,8 +561,11 @@ public class OutTableController extends BaseController {
             List<BusProcurement> busProcurements1 = outMonthPlanService.purchaseValueA(purchaseValueAReq);
             BigDecimal subPurchaseValue = BigDecimal.ZERO;
             for (BusProcurement busProcurement : busProcurements1) {
+                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));
 
             vos.add(vo);

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/materials/MatMaterialsInventoryMapper.xml

@@ -4,4 +4,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.materials.mapper.MatMaterialsInventoryMapper">
 
+    <select id="selectLatestByMaterialIds" resultType="org.dromara.materials.domain.MatMaterialsInventory">
+        SELECT *
+        FROM (
+        SELECT m.*,
+        ROW_NUMBER() OVER (PARTITION BY m.materials_id ORDER BY m.create_time DESC) AS rn
+        FROM mat_materials_inventory m
+        WHERE m.materials_id IN
+        <foreach collection="materialIds" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        ) t
+        WHERE t.rn = 1
+    </select>
+
 </mapper>