From 42b790299751f2cc4506f9d90ad8498ece3cfb11 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 27 Mar 2025 16:59:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sync/SpsSyncDownloadController.java          | 16 ++++++++++++++++
 .../dao/purchase/PurContractDetailMapper.java    |  3 ++-
 .../glxp/api/dao/purchase/PurContractMapper.java |  3 ++-
 .../api/res/sync/SpsSyncDeviceTaskResponse.java  |  5 +++++
 .../impl/DeviceRepairApplyDetailServiceImpl.java |  6 ++++++
 .../dev/impl/DeviceRepairApplyServiceImpl.java   |  1 +
 6 files changed, 32 insertions(+), 2 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 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<PurContractDetailEntity> {
+public interface PurContractDetailMapper extends BaseMapperPlus<PurContractDetailMapper,PurContractDetailEntity,PurContractDetailEntity> {
 
 //    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<PurContractEntity> {
+public interface PurContractMapper extends BaseMapperPlus<PurContractMapper,PurContractEntity,PurContractEntity> {
     @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<PurApplyEntity> purApplyEntities;
     List<PurApplyDetailEntity> purApplyDetailEntityList;
 
+    List<PurContractEntity> purContractEntities;
+    List<PurContractDetailEntity> 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<DeviceRepair
             //需要维修创建维修单
             DeviceRepairEntity repairEntity = BeanUtil.copyProperties(one, DeviceRepairEntity.class);
             repairEntity.setId(repairId).setApplyId(param.getApplyId()).setFinishFlag(false)
+                    .setUpdateTime(LocalDateTime.now())
                     .setCreateUserId(user.getId()).setCreateUserName(user.getEmployeeName())
                     .setCreateDeptCode(user.getLocDeptCode()).setCreateDeptName(user.getDeptName())
                     .setCreateTime(now).setDiagnosisInfo(param.getDiagnosisInfo()).setInnerFlag(param.getInnerFlag())
@@ -120,6 +122,7 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
                 .set(DeviceRepairApplyDetailEntity::getConfirmDeptName, user.getDeptName())
                 .set(DeviceRepairApplyDetailEntity::getDiagnosisLivePath, param.getDiagnosisLivePath())
                 .set(DeviceRepairApplyDetailEntity::getConfirmTime, now)
+                .set(DeviceRepairApplyDetailEntity::getUpdateTime, now)
                 .set(!param.getRepairFlag(), DeviceRepairApplyDetailEntity::getFinishTime, now)
                 .eq(DeviceRepairApplyDetailEntity::getApplyId, param.getApplyId())
                 .eq(DeviceRepairApplyDetailEntity::getDeviceCode, param.getDeviceCode())
@@ -132,6 +135,7 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
         //根据设备号和报修单标识更新巡检任务明细
         deviceCheckDetailService.update(Wrappers.lambdaUpdate(DeviceCheckDetailEntity.class)
                 .set(DeviceCheckDetailEntity::getRepairId, repairId)
+                .set(DeviceCheckDetailEntity::getUpdateTime, now)
                 .eq(DeviceCheckDetailEntity::getApplyId, param.getApplyId())
                 .eq(DeviceCheckDetailEntity::getDeviceCode, param.getDeviceCode())
         );
@@ -152,9 +156,11 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
         if (CollectionUtil.isNotEmpty(list)){
             deviceRepairApplyService.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class)
                     .set(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.PROCESSING)
+                    .set(DeviceRepairApplyEntity::getUpdateTime, new Date())
                     .eq(DeviceRepairApplyEntity::getId, applyId));
         }else {
             deviceRepairApplyService.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class)
+                    .set(DeviceRepairApplyEntity::getUpdateTime, new Date())
                     .set(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.FINISH)
                     .eq(DeviceRepairApplyEntity::getId, applyId));
         }
diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyServiceImpl.java
index 6a7d491a..2f87056b 100644
--- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyServiceImpl.java
@@ -164,6 +164,7 @@ public class DeviceRepairApplyServiceImpl extends ServiceImpl<DeviceRepairApplyM
         //修改已完成数量
         super.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class)
                 .setSql("finishCount = finishCount + 1")
+                .set(DeviceRepairApplyEntity::getUpdateTime,LocalDateTime.now())
                 .eq(DeviceRepairApplyEntity::getId, applyId)
                 .eq(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.PROCESSING)
                 .last("and finishCount + 1 <= deviceCount")