From 73b58c3774231a1f4cc4f7145ea32be945591ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Sun, 4 Feb 2024 13:02:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=A0=B9=E6=8D=AE=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E5=8F=98=E5=8C=96=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=202.=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../controller/jcsj/DmCzplpNewController.java |  2 +-
 .../gj_erp/controller/jhgk/YppController.java | 52 ++++++++++++-------
 .../dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java |  2 +
 .../resources/mappers/pgd/DmPpxxbMapper.xml   | 10 +++-
 5 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 78cc97b..03561b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,7 +230,7 @@
         <dependency>
             <groupId>org.modelmapper</groupId>
             <artifactId>modelmapper</artifactId>
-            <version>2.3.5</version>
+            <version>3.1.1</version>
         </dependency>
 
        <!-- <dependency>
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java
index de635a1..a6ae8c7 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java
@@ -80,7 +80,7 @@ public class DmCzplpNewController {
     @PostMapping("/getCzplList")
     @ResponseBody
     public ResultBean getCzplList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
-        dmCzplpNewService.getCzplList(map);
+//        dmCzplpNewService.getCzplList(map);
         return new ResultBean(dmCzplpNewService.getCzplList(map));
 
     }
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/YppController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/YppController.java
index 9c29439..f9e5a27 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/YppController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/YppController.java
@@ -1,5 +1,6 @@
 package com.dsic.gj_erp.controller.jhgk;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.bean.ResultBean;
@@ -10,7 +11,6 @@ import com.dsic.gj_erp.mapper.pgd.DmPpxxbMapper;
 import com.dsic.gj_erp.service.jhgk.DmQfxqService;
 import com.dsic.gj_erp.service.pgd.DmPpxxbService;
 import lombok.AllArgsConstructor;
-import org.modelmapper.ModelMapper;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("ypp")
@@ -52,7 +53,7 @@ public class YppController {
                 .eq(StrUtil.isNotEmpty(qfxq.getDcPl()),DmQfxq::getDcPl, qfxq.getDcPl())
                 .eq(StrUtil.isNotEmpty(qfxq.getDcFd()),DmQfxq::getDcFd, qfxq.getDcFd())
                 .eq(StrUtil.isNotEmpty(qfxq.getZt()),DmQfxq::getZt,qfxq.getZt())
-                .notExists(builder.toString())
+                .exists(builder.toString())
         );
         return new ResultBean<>(list);
     }
@@ -91,9 +92,8 @@ public class YppController {
     @PostMapping("qtjc")
     public ResultBean<?> qtjc(@RequestBody List<DmQfxq> list){
         list.forEach(item->{
-            ModelMapper modelMapper = new ModelMapper();
-            Map map = modelMapper.map(item, Map.class);
-            List<DmPpxxb> dmYdjhLj = ppxxbMapper.getDmWlqd(map);
+            Map map = BeanUtil.beanToMap(item);
+            List<DmYdjhLj> dmYdjhLj = ppxxbMapper.getDmYdjhLj(map);
             List<DmPpxxb> dmPpxxb = ppxxbMapper.getDmPpxxb(map);
 
             if (dmPpxxb.size()==0){
@@ -101,11 +101,17 @@ public class YppController {
             }
 
             dmYdjhLj.forEach(_item->{
-                //todo 校验完工
+                //todo 校验完工,缺少完工条件,无法校验
             });
 
-            dmPpxxb.forEach(_item->item.setZt("01"));
-            ppxxbService.updateBatchByMultiId(dmPpxxb);
+            List<DmPpxxb> collect = dmPpxxb.stream().map(_item -> {
+                DmPpxxb ppxxb = new DmPpxxb();
+                ppxxb.setFxwph(_item.getFxwph());
+                ppxxb.setXwh(_item.getXwh());
+                ppxxb.setZt("01");
+                return ppxxb;
+            }).collect(Collectors.toList());
+            ppxxbService.updateBatchByMultiId(collect);
         });
         return new ResultBean<>();
     }
@@ -115,13 +121,16 @@ public class YppController {
     public ResultBean<?> zx(@RequestBody List<DmQfxq> list){
         List<DmPpxxb> printData=new ArrayList<>();
         list.forEach(item->{
-            ModelMapper modelMapper = new ModelMapper();
-            Map map = modelMapper.map(item, Map.class);
+            Map map = BeanUtil.beanToMap(item);
             List<DmPpxxb> dmPpxxb = ppxxbMapper.getDmPpxxb(map);
-            dmPpxxb.forEach(_item->{
-                item.setZt("04");
-            });
-            ppxxbService.updateBatchById(dmPpxxb);
+            List<DmPpxxb> collect = dmPpxxb.stream().map(_item -> {
+                DmPpxxb dmPpxxb1 = new DmPpxxb();
+                dmPpxxb1.setFxwph(_item.getFxwph());
+                dmPpxxb1.setXwh(_item.getXwh());
+                dmPpxxb1.setZt("04");
+                return dmPpxxb1;
+            }).collect(Collectors.toList());
+            ppxxbService.updateBatchByMultiId(collect);
             printData.addAll(dmPpxxb);
         });
         return new ResultBean<>(printData);
@@ -131,13 +140,16 @@ public class YppController {
     @Transactional(rollbackFor = Exception.class)
     public ResultBean<?> qr(@RequestBody List<DmQfxq> list){
         list.forEach(item->{
-            ModelMapper modelMapper = new ModelMapper();
-            Map map = modelMapper.map(item, Map.class);
+            Map map = BeanUtil.beanToMap(item);
             List<DmPpxxb> dmPpxxb = ppxxbMapper.getDmPpxxb(map);
-            dmPpxxb.forEach(_item->{
-                item.setZt("05");
-            });
-            ppxxbService.updateBatchById(dmPpxxb);
+            List<DmPpxxb> collect = dmPpxxb.stream().map(_item -> {
+                DmPpxxb dmPpxxb1 = new DmPpxxb();
+                dmPpxxb1.setFxwph(_item.getFxwph());
+                dmPpxxb1.setXwh(_item.getXwh());
+                dmPpxxb1.setZt("05");
+                return dmPpxxb1;
+            }).collect(Collectors.toList());
+            ppxxbService.updateBatchByMultiId(collect);
         });
         return new ResultBean<>();
     }
diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java
index 4c4bfe4..7e66d8a 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java
@@ -18,6 +18,8 @@ import java.util.Map;
  */
 public interface DmPpxxbMapper extends MppBaseMapper<DmPpxxb> {
 
+    List<DmYdjhLj> getDmYdjhLj(Map<String,Object> map);
+
     List<DmPpxxb> getDmWlqd(Map<String,Object> map);
 
     List<DmPpxxb> getDmPpxxb(Map<String,Object> map);
diff --git a/src/main/resources/mappers/pgd/DmPpxxbMapper.xml b/src/main/resources/mappers/pgd/DmPpxxbMapper.xml
index 9d3a5bd..221add9 100644
--- a/src/main/resources/mappers/pgd/DmPpxxbMapper.xml
+++ b/src/main/resources/mappers/pgd/DmPpxxbMapper.xml
@@ -76,6 +76,14 @@
         ZXWPH, SL, JLDW, WPJB, WPFLM, ZDRY, XGRQ, DC_CH, DC_CM, DC_PL, DC_FD, DC_TH, DC_ZL, DC_TZ, DC_YJ, DC_YS, DC_PB, DC_LPH, DC_TPBH, DC_TPMC, JLDW1, WPMC, WPGG, WPXH, ABCLX, GZLX, YLZD1, LCM1, zt, drcs, tpxx, dzxqq, xzxqq, gylx, YLZD3, XWH, YLZD9, GYSBH, YHFLH, YLZD6, TQQXZL, LCM3, YLZD5, BZ, DEZL, LCM2, YXZZRQ, YLZD2, LCM5, YLZD8, XNJBS, DRRQ, LCM4, FXWPH, WPCC, FWPJB, JZL, XLCC, YLZD7, SJBCSL, YLZD4, GYLB, DRRY, WPH, YXQSRQ
     </sql>
 
+    <select id="getDmYdjhLj" resultType="com.dsic.gj_erp.bean.pgd.DmPpxxb">
+        select
+            lj.*
+        from
+            dm_qfxq xq join dm_ydjh_lj lj on xq.dc_ch =lj.czbh and xq.dc_pl =lj.pl and xq.DC_FD =lj.fd
+        WHERE  xq.dc_ch =#{dcCh} and xq.dc_pl =#{dcPl} and xq.DC_FD =#{dcFd}
+    </select>
+
     <select id="getDmWlqd" resultType="com.dsic.gj_erp.bean.pgd.DmPpxxb">
         select
             wlqd.*
@@ -89,7 +97,7 @@
         select
             lj.*
         from
-            dm_qfxq xq join dm_ppxxb lj on xq.dc_ch =lj.czbh and xq.dc_pl =lj.pl and xq.DC_FD =lj.fd
+            dm_qfxq xq join dm_ppxxb lj on xq.dc_ch =lj.dc_ch and xq.dc_pl =lj.dc_pl and xq.DC_FD =lj.dc_fd
         WHERE  xq.dc_ch =#{dcCh} and xq.dc_pl =#{dcPl} and xq.DC_FD =#{dcFd}
     </select>