From 152f220291dcb031afab4dea06456b982dc2a7fd Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 27 Mar 2025 16:22:35 +0800 Subject: [PATCH] =?UTF-8?q?3/27=20=E5=90=8C=E6=AD=A51.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync/SpsSyncDownloadController.java | 19 +++++++++++++++++++ .../glxp/api/dao/purchase/PurApplyDao.java | 5 +++-- .../api/dao/purchase/PurApplyDetailDao.java | 6 ++++-- .../res/sync/SpsSyncDeviceTaskResponse.java | 5 +++++ .../purchase/PurApplyDetailService.java | 2 +- .../impl/PurApplyDetailImplService.java | 2 +- 6 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index fcab721e..af95a11c 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -52,6 +52,8 @@ import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.purchase.PurOrderDetailService; import com.glxp.api.service.purchase.PurOrderService; +import com.glxp.api.service.purchase.impl.PurApplyDetailImplService; +import com.glxp.api.service.purchase.impl.PurApplyServiceImpl; import com.glxp.api.service.sync.BasicDownloadService; import com.glxp.api.service.sync.BasicExportService; import com.glxp.api.service.sync.SpsSyncDownloadService; @@ -669,6 +671,12 @@ public class SpsSyncDownloadController { @Resource DeviceInspectTaskDetailMapper deviceInspectTaskDetailMapper; + + @Resource + PurApplyDao purApplyDao; + + @Resource + PurApplyDetailDao purApplyDetailDao; /** * 保存上传的设备任务信息 * @@ -684,6 +692,17 @@ public class SpsSyncDownloadController { if (CollectionUtil.isNotEmpty(bean.getDeviceInspectTaskDetailEntities())) { deviceInspectTaskDetailMapper.replaceBatchs(bean.getDeviceInspectTaskDetailEntities()); } + + if (CollectionUtil.isNotEmpty(bean.getPurApplyEntities())) { + for (PurApplyEntity purApplyEntity : bean.getPurApplyEntities()) { + purApplyEntity.setUpdateTime(null); + } + purApplyDao.replaceBatchs(bean.getPurApplyEntities()); + } + + if (CollectionUtil.isNotEmpty(bean.getPurApplyDetailEntityList())) { + purApplyDetailDao.replaceBatchs(bean.getPurApplyDetailEntityList()); + } } @Resource diff --git a/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java b/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java index 6c2f1f5e..f145e76f 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.purchase; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.PurApplyEntity; import com.glxp.api.req.purchase.PurApplyRequest; import com.glxp.api.res.purchase.PurApplyResponse; @@ -10,11 +11,11 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface PurApplyDao { +public interface PurApplyDao extends BaseMapperPlus { List queryPageList(PurApplyRequest purApplyRequest); - Integer insert(PurApplyEntity purApplyRequest); + int insert(PurApplyEntity purApplyRequest); Boolean update(PurApplyEntity purApplyRequest); diff --git a/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java index 782c0f90..b5738050 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java @@ -2,7 +2,9 @@ package com.glxp.api.dao.purchase; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.entity.purchase.PurApplyEntity; import com.glxp.api.req.purchase.PurApplyDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; @@ -11,13 +13,13 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface PurApplyDetailDao { +public interface PurApplyDetailDao extends BaseMapperPlus { List queryPageList(PurApplyDetailRequest purApplyRequest); List joinQueryList(PurApplyDetailRequest purApplyRequest); - Boolean insert(PurApplyDetailEntity purApplyDetailEntity); + int insert(PurApplyDetailEntity purApplyDetailEntity); Boolean update(PurApplyDetailEntity purApplyRequest); diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java index 5ce85acd..4ab69d83 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java @@ -5,6 +5,8 @@ package com.glxp.api.res.sync; import com.glxp.api.entity.dev.*; import com.glxp.api.entity.inv.DeviceInspectTaskEntity; import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; +import com.glxp.api.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.entity.purchase.PurApplyEntity; import lombok.Data; import java.util.List; @@ -26,4 +28,7 @@ public class SpsSyncDeviceTaskResponse extends BaseSyncResponse { List deviceUpkeepEntities;//保养单 List deviceUpkeepDetailEntities;//保养单明细 List deviceUpkeepDetailItemEntities;//保养单项目明细 + List purApplyEntities; + List purApplyDetailEntityList; + } diff --git a/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java index 0d24693c..6920ca0b 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java @@ -17,7 +17,7 @@ public interface PurApplyDetailService { List joinQueryList(PurApplyDetailRequest purApplyRequest); - Boolean insert(PurApplyDetailEntity purApplyRequest); + int insert(PurApplyDetailEntity purApplyRequest); Boolean update(PurApplyDetailEntity purApplyRequest); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java index a7ad3f45..550d1d72 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java @@ -60,7 +60,7 @@ public class PurApplyDetailImplService implements PurApplyDetailService { } @Override - public Boolean insert(PurApplyDetailEntity purApplyRequest) { + public int insert(PurApplyDetailEntity purApplyRequest) { return purApplyDetailDao.insert(purApplyRequest); }