优化

platform-common/src/main/java/com/platform/common/util/DateUtils.java

@@ -290,6 +290,11 @@ public class DateUtils {
         return format.format(date);
     }
 
+    public static String dateToDateString(Date date) {
+        SimpleDateFormat format = new SimpleDateFormat(PATTERN_YMD);
+        return format.format(date);
+    }
+
     /**
      * 时间转字符串
      *

platform-dao/src/main/resources/mapper/longyanpurchaseorder/LongYanPurchaseDetailMapper.xml

@@ -134,27 +134,29 @@ ORDER BY totalNum DESC
     </update>
 
     <update id="updateBatch" parameterType="java.util.List">
-        <foreach collection="list" open="(" close=")" separator="," item="item">
+        <foreach collection="list"  separator=";" item="item">
             update t_long_yan_purchase_detail
-            <if test="iorisum!=null">
-                set iorisum = #{iorisum},
+            <set>
+            <if test="item.iorisum!=null">
+                 iorisum = #{item.iorisum},
             </if>
-            <if test="ipertaxrate!=null">
-                set ipertaxrate = #{ipertaxrate},
+            <if test="item.ipertaxrate!=null">
+                 ipertaxrate = #{item.ipertaxrate},
             </if>
-             <if test="funitprice!=null">
-                 set funitprice = #{funitprice},
+             <if test="item.funitprice!=null">
+                  funitprice = #{item.funitprice},
              </if>
-             <if test="fmoney!=null">
-                 set fmoney = #{fmoney},
+             <if test="item.fmoney!=null">
+                  fmoney = #{item.fmoney},
              </if>
-             <if test="iexchrate!=null">
-                 set iexchrate = #{iexchrate},
+             <if test="item.iexchrate!=null">
+                  iexchrate = #{item.iexchrate},
              </if>
-             <if test="num!=null">
-                 set num = #{num}
+             <if test="item.num!=null">
+                  num = #{item.num},
              </if>
-             where no = #{no}
+            </set>
+             where no = #{item.no} and long_yang_purchase_order_id = #{item.longYangPurchaseOrderId}
         </foreach>
     </update>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -6,10 +6,13 @@ import com.platform.common.util.HttpUtil;
 import com.platform.common.util.JsonUtils;
 import com.platform.common.util.R;
 import com.platform.common.util.StringUtils;
+import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseDetailDTO;
 import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO;
 import com.platform.dao.dto.spareAdd.InventoryTest;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
+import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseDetail;
+import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseDetailMapper;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
 import com.platform.dao.vo.query.store.SpareStoreVO;
 import com.platform.rest.log.annotation.SysLog;
@@ -26,6 +29,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,12 +43,23 @@ import java.util.List;
 @Slf4j
 @RequestMapping("/yongyou")
 public class YongyouController {
+    private final LongYanPurchaseDetailMapper longYanPurchaseDetailMapper;
 
     private final YongyouService yongyouService;
     @Resource
     private final PurchaseOrderModNoticeHandler purchaseOrderModNoticeHandler;
 
-
+    @PutMapping("/put")
+    public R querySpare() {
+        LongYanPurchaseDetail longYanPurchaseDetailDTO = new LongYanPurchaseDetail();
+        longYanPurchaseDetailDTO.setNo("09010404020001");
+        longYanPurchaseDetailDTO.setIorisum(10.0);
+        longYanPurchaseDetailDTO.setFmoney(20.9);
+        List<LongYanPurchaseDetail> list = new ArrayList<>();
+        list.add(longYanPurchaseDetailDTO);
+        longYanPurchaseDetailMapper.updateBatch(list);
+        return new R();
+    }
 
     /**
      * 查询用友备件分页数据

platform-rest/src/main/java/com/platform/rest/task/LongYanPurchaseOrderTask.java

@@ -1,5 +1,6 @@
 package com.platform.rest.task;
 
+import com.platform.common.util.DateUtils;
 import com.platform.service.check.CheckJobService;
 import com.platform.service.longyanpurchaseorder.LongYanPurchaseOrderService;
 import com.platform.service.yongyou.YongyouService;
@@ -7,6 +8,8 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * @Description 点巡检任务处理
  * @Author liuyu

platform-rest/src/main/resources/application-dev.yml

@@ -93,6 +93,7 @@ ignore:
     - /project/**
     - /repair/application-forms/**
     - /sb/infos/**
+    - /yongyou/put
 platform:
   slf4j:
     data: D://xajg

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -863,7 +863,7 @@ public class YongyouServiceImpl implements YongyouService {
     public void purchaseOrderUpdate() {
         //查询当天修改的所有单子
         Date date = new Date();
-        String dateStr = DateUtils.dateToString(date)+" 00:00:00";
+        String dateStr = DateUtils.dateToDateString(date)+" 00:00:00";
         GetUpdatePurchaseOrderRequest getUpdatePurchaseOrderRequest = new GetUpdatePurchaseOrderRequest();
         getUpdatePurchaseOrderRequest.setStrWhere("1=1 and cmodifytime >= "+dateStr );
         //新厂
@@ -885,13 +885,15 @@ public class YongyouServiceImpl implements YongyouService {
         GetPurchaseOrderUpdateResponse response2 = JsonUtils.jsonToModel(responseStr2,GetPurchaseOrderUpdateResponse.class);
 
 
-        List<PuAppDetails> puAppDetails = new ArrayList<>();
+        List<PurchaseData> updateDatas = new ArrayList<>();
         if (response.getResult()){
             List<PurchaseData> datas = response.getData();
             if (datas!=null&&datas.size()>0){
-                for (PurchaseData data:datas){
-                    if (data!=null&&data.getPuAppDetail()!=null&&data.getPuAppDetail().size()>0){
-                        puAppDetails.addAll(data.getPuAppDetail());
+                for (PurchaseData data:datas) {
+                    if (data.getPuAppMain().getCverifier() != null && !data.getPuAppMain().getCverifier().trim().equals("")) {
+                        if (data != null && data.getPuAppDetail() != null && data.getPuAppDetail().size() > 0) {
+                            updateDatas.add(data);
+                        }
                     }
                 }
             }
@@ -899,55 +901,65 @@ public class YongyouServiceImpl implements YongyouService {
         if (response2.getResult()){
             List<PurchaseData> datas = response2.getData();
             if (datas!=null&&datas.size()>0){
-                for (PurchaseData data:datas){
-                    if (data!=null&&data.getPuAppDetail()!=null&&data.getPuAppDetail().size()>0){
-                        puAppDetails.addAll(data.getPuAppDetail());
+                for (PurchaseData data:datas) {
+                    if (data.getPuAppMain()!=null&&data.getPuAppMain().getCverifier() != null && !data.getPuAppMain().getCverifier().trim().equals("")&&data.getPuAppDetail()!=null&&data.getPuAppDetail().size()>0) {
+                        if (data != null && data.getPuAppDetail() != null && data.getPuAppDetail().size() > 0) {
+                            updateDatas.add(data);
+                        }
                     }
                 }
             }
         }
 
-        if (puAppDetails!=null){
+        if (updateDatas!=null){
             //修改
-            List<LongYanPurchaseDetail> list = new ArrayList<>();
-            for (PuAppDetails details:puAppDetails){
-                Boolean flag = false;
-                LongYanPurchaseDetail longYanPurchaseDetail = new LongYanPurchaseDetail();
-                if (details.getCinvcode()!=null){
-                    longYanPurchaseDetail.setNo(details.getCinvcode());
-                    if (details.getFmoney()!=null){
-                        longYanPurchaseDetail.setFmoney(details.getFmoney());
-                        flag = true;
-                    }
-                    if (details.getIpertaxrate()!=null){
-                        longYanPurchaseDetail.setIpertaxrate(details.getIpertaxrate());
-                        flag = true;
-                    }
-                    if (details.getFquantity()!=null){
-                        longYanPurchaseDetail.setNum(details.getFquantity());
-                        flag = true;
-                    }
-                    if (details.getFunitprice()!=null){
-                        longYanPurchaseDetail.setFunitprice(details.getFunitprice());
-                        flag = true;
-                    }
-                    if (details.getIorisum()!=null){
-                        longYanPurchaseDetail.setIorisum(details.getIorisum());
-                        flag = true;
-                    }
-                    if (details.getIexchrate()!=null){
-                        longYanPurchaseDetail.setIexchrate(details.getIexchrate());
-                        flag = true;
-                    }
-                    if (flag){
-                        list.add(longYanPurchaseDetail);
+            for (PurchaseData purchaseData:updateDatas){
+                if (purchaseData.getPuAppMain().getCcode()!=null){
+                    LongYanPurchaseOrder longYanPurchaseOrder = new LongYanPurchaseOrder();
+                    longYanPurchaseOrder.setYongYouId(purchaseData.getPuAppMain().getCcode());
+                    LongYanPurchaseOrder order = longYanPurchaseOrderMapper.selectOne(longYanPurchaseOrder);
+                    if (order!=null){
+                        List<PuAppDetails> puAppDetails = purchaseData.getPuAppDetail();
+                        List<LongYanPurchaseDetail> updateList = new ArrayList<>();
+                        for (PuAppDetails details:puAppDetails){
+                            LongYanPurchaseDetail detail = new LongYanPurchaseDetail();
+                            detail.setNo(details.getCinvcode());
+                            detail.setLongYangPurchaseOrderId(order.getId());
+                            Boolean flag = false;
+                            if (details.getFmoney()!=null){
+                                detail.setFmoney(details.getFmoney());
+                                flag = true;
+                            }
+                            if (details.getIpertaxrate()!=null){
+                                detail.setIpertaxrate(details.getIpertaxrate());
+                                flag = true;
+                            }
+                            if (details.getFquantity()!=null){
+                                detail.setNum(details.getFquantity());
+                                flag = true;
+                            }
+                            if (details.getFunitprice()!=null){
+                                detail.setFunitprice(details.getFunitprice());
+                                flag = true;
+                            }
+                            if (details.getIorisum()!=null){
+                                detail.setIorisum(details.getIorisum());
+                                flag = true;
+                            }
+                            if (details.getIexchrate()!=null){
+                                detail.setIexchrate(details.getIexchrate());
+                                flag = true;
+                            }
+                            if (flag) {
+                                updateList.add(detail);
+                            }
+                        }
+                        if (updateList!=null&&updateList.size()>0) {
+                            longYanPurchaseDetailMapper.updateBatch(updateList);
+                        }
                     }
-
                 }
             }
-            if (list!=null){
-                longYanPurchaseDetailMapper.updateBatch(list);
-            }
         }
 
     }

platform-service/src/main/java/handler/yongyou/response/PuAppMains.java

@@ -1,6 +1,10 @@
 package handler.yongyou.response;
 
+import lombok.Data;
+
+@Data
 public class PuAppMains {
     String ccode;//请购单号
     String id;//主表id
+    String cverifier;//审核人
 }