From 396ebb5642636d6667212939fa6ef195eeebc05e Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 02 十一月 2023 10:14:30 +0800
Subject: [PATCH] feat: 供应商

---
 consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java |   39 ++++++++++++---------------------------
 1 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index 0cf4d6a..00ae434 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -4,6 +4,7 @@
 import com.consum.base.pojo.*;
 import com.consum.base.service.BaseCategoryServiceImpl;
 import com.consum.base.service.LWhFormOutputServiceImpl;
+import com.consum.base.service.LWhProcureModelService;
 import com.consum.model.po.*;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
@@ -29,6 +30,8 @@
 
     @Autowired
     private LWhFormOutputServiceImpl lWhFormOutputService;
+    @Autowired
+    private LWhProcureModelService lWhProcureModelService;
 
     /**
      * @Description 鏂板鍑哄簱鍗�
@@ -62,15 +65,15 @@
 
         GenericPager genericPager = lWhFormOutputService.queryFormOutputList(param);
         List<LWhFormOutput> datas = genericPager.getDatas();
-        ArrayList<LWhFormProcureExtend> newDatas = new ArrayList<>();
+        ArrayList<LWhFormOutputExtend> newDatas = new ArrayList<>();
         if (!CollectionUtils.isEmpty(datas)) {
             datas.forEach(item -> {
                 // 鏌ヨ鍨嬪彿鏁伴噺
                 LWhProcureModel lWhProcureModel = new LWhProcureModel();
                 lWhProcureModel.setBusinessType(3);
                 lWhProcureModel.setBusinessId(item.getId());
-                List<LWhProcureModel> models = lWhFormOutputService.select(lWhProcureModel);
-                LWhFormProcureExtend formProcureExtend = new LWhFormProcureExtend();
+                List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
+                LWhFormOutputExtend formProcureExtend = new LWhFormOutputExtend();
                 BeanUtils.copyProperties(item, formProcureExtend);
                 formProcureExtend.setModels(models);
                 newDatas.add(formProcureExtend);
@@ -99,31 +102,13 @@
         LWhFormOutputExtend formOutputExtend = new LWhFormOutputExtend();
         BeanUtils.copyProperties(lWhFormOutput, formOutputExtend);
 
-        // 鐗╁搧
-        LWhFormProcureGoods lWhFormProcureGoods = new LWhFormProcureGoods();
-        lWhFormProcureGoods.setWhFormProcureId(id);
-        List<LWhFormProcureGoods> formProcureGoods = lWhFormOutputService.select(lWhFormProcureGoods);
+        // 鏌ヨ鍨嬪彿鏁伴噺
+        LWhProcureModel lWhProcureModel = new LWhProcureModel();
+        lWhProcureModel.setBusinessType(3);
+        lWhProcureModel.setBusinessId(id);
+        List<LWhProcureModel> models = lWhFormOutputService.select(lWhProcureModel);
+        formOutputExtend.setModels(models);
 
-        Field fieldModels = null;
-        try {
-            fieldModels = LWhFormProcureGoodsParams.class.getDeclaredField("models");
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-        fieldModels.setAccessible(true);
-        ArrayList<LWhFormProcureGoodsParams> procureGoodsParams = new ArrayList<>();
-        for (LWhFormProcureGoods formProcureGood : formProcureGoods) {
-            LWhFormProcureGoodsParams lWhFormProcureGoodsParams = new LWhFormProcureGoodsParams();
-            BeanUtils.copyProperties(formProcureGood, lWhFormProcureGoodsParams);
-
-            // 鏌ヨ鍨嬪彿鏁伴噺
-            LWhProcureModel lWhProcureModel = new LWhProcureModel();
-            lWhProcureModel.setFromProcureGoodsId(formProcureGood.getId());
-            List<LWhProcureModel> models = lWhFormOutputService.select(lWhProcureModel);
-            fieldModels.set(lWhFormProcureGoodsParams, models);
-            procureGoodsParams.add(lWhFormProcureGoodsParams);
-        }
-        formOutputExtend.setProcureGoods(procureGoodsParams);
         return ResponseValue.success("鏌ヨ鎴愬姛!", formOutputExtend);
     }
 

--
Gitblit v1.9.1