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 af95a11c..b1ba2f0d 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -677,6 +677,11 @@ public class SpsSyncDownloadController { @Resource PurApplyDetailDao purApplyDetailDao; + @Resource + PurContractDetailMapper purContractDetailMapper; + + @Resource + PurContractMapper purContractMapper; /** * 保存上传的设备任务信息 * @@ -703,6 +708,17 @@ public class SpsSyncDownloadController { if (CollectionUtil.isNotEmpty(bean.getPurApplyDetailEntityList())) { purApplyDetailDao.replaceBatchs(bean.getPurApplyDetailEntityList()); } + + if (CollectionUtil.isNotEmpty(bean.getPurContractEntities())) { + for (PurContractEntity PurContractEntity : bean.getPurContractEntities()) { + PurContractEntity.setUpdateTime(null); + } + purContractMapper.replaceBatchs(bean.getPurContractEntities()); + } + + if (CollectionUtil.isNotEmpty(bean.getPurContractDetailEntities())) { + purContractDetailMapper.replaceBatchs(bean.getPurContractDetailEntities()); + } } @Resource diff --git a/src/main/java/com/glxp/api/dao/purchase/PurContractDetailMapper.java b/src/main/java/com/glxp/api/dao/purchase/PurContractDetailMapper.java index fde9899e..de53b08b 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurContractDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurContractDetailMapper.java @@ -1,9 +1,10 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.PurContractDetailEntity; -public interface PurContractDetailMapper extends BaseMapper { +public interface PurContractDetailMapper extends BaseMapperPlus { // int insert(PurContractDetailEntity purContractDetailEntity); } diff --git a/src/main/java/com/glxp/api/dao/purchase/PurContractMapper.java b/src/main/java/com/glxp/api/dao/purchase/PurContractMapper.java index 0be0b8af..b5764f22 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurContractMapper.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurContractMapper.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.PurContractEntity; import com.glxp.api.req.purchase.PurContractRequest; import com.glxp.api.res.purchase.PurContractEntityResponse; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -public interface PurContractMapper extends BaseMapper { +public interface PurContractMapper extends BaseMapperPlus { @Override int insert(PurContractEntity purContractEntity); 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 4ab69d83..a8814a6d 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java @@ -7,6 +7,8 @@ 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 com.glxp.api.entity.purchase.PurContractDetailEntity; +import com.glxp.api.entity.purchase.PurContractEntity; import lombok.Data; import java.util.List; @@ -31,4 +33,7 @@ public class SpsSyncDeviceTaskResponse extends BaseSyncResponse { List purApplyEntities; List purApplyDetailEntityList; + List purContractEntities; + List purContractDetailEntities; + } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java index 57f76710..394b674c 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java @@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; /** @@ -97,6 +98,7 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl