3/27 同步1.0

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

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<PurApplyDao, PurApplyEntity, PurApplyEntity> {
 
     List<PurApplyResponse> queryPageList(PurApplyRequest purApplyRequest);
 
-    Integer insert(PurApplyEntity purApplyRequest);
+    int insert(PurApplyEntity purApplyRequest);
 
     Boolean update(PurApplyEntity purApplyRequest);
 

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<PurApplyDetailDao, PurApplyDetailEntity, PurApplyDetailEntity> {
 
     List<PurApplyDetailEntity> queryPageList(PurApplyDetailRequest purApplyRequest);
 
     List<PurOrderDetailResponse> joinQueryList(PurApplyDetailRequest purApplyRequest);
 
-    Boolean insert(PurApplyDetailEntity purApplyDetailEntity);
+    int insert(PurApplyDetailEntity purApplyDetailEntity);
 
     Boolean update(PurApplyDetailEntity purApplyRequest);
 

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<DeviceUpkeepEntity> deviceUpkeepEntities;//保养单
     List<DeviceUpkeepDetailEntity> deviceUpkeepDetailEntities;//保养单明细
     List<DeviceUpkeepDetailItemEntity> deviceUpkeepDetailItemEntities;//保养单项目明细
+    List<PurApplyEntity> purApplyEntities;
+    List<PurApplyDetailEntity> purApplyDetailEntityList;
+
 }

src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java

@@ -17,7 +17,7 @@ public interface PurApplyDetailService {
     List<PurOrderDetailResponse> joinQueryList(PurApplyDetailRequest purApplyRequest);
 
 
-    Boolean insert(PurApplyDetailEntity purApplyRequest);
+    int insert(PurApplyDetailEntity purApplyRequest);
 
     Boolean update(PurApplyDetailEntity purApplyRequest);
 

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);
     }