diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/DeliveryListMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/DeliveryListMapper.java index 038a8681..37767317 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/DeliveryListMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/DeliveryListMapper.java @@ -70,4 +70,6 @@ public interface DeliveryListMapper void deleteDeliveryListByDeliveryId(Long deliveryId); void deleteDeliveryListByDeliveryIds(String[] strArray); + + void updateTimeByOrderId(List longs); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java index dae8bbe1..cf6f8856 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java @@ -115,4 +115,6 @@ public interface OrderInfoMapper Integer selectUniqueCount(OrderInfo orderInfo); List homePageData(HomepageQueryDto dto); + + void updateTimeByDeliveryId(List deliveryId); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java index 45ca5f75..32b6cc90 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java @@ -141,6 +141,8 @@ public class DeliveryListServiceImpl implements IDeliveryListService { return AjaxResult.error(errMsg.toString()); } deliveryListMapper.insertBatch(deliveryList); + infoMapper.updateTimeByDeliveryId(Collections.singletonList(deliveryId)); + return AjaxResult.success("导入成功"); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java index b560dc15..c7afac0a 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java @@ -21,6 +21,7 @@ import com.ruoyi.sip.dto.ApiDataQueryDto; import com.ruoyi.sip.dto.HomepageQueryDto; import com.ruoyi.sip.dto.StatisticsDetailDto; import com.ruoyi.sip.dto.StatisticsDto; +import com.ruoyi.sip.mapper.DeliveryListMapper; import com.ruoyi.sip.service.IAgentInfoService; import com.ruoyi.sip.service.ICustomerInfoService; import com.ruoyi.sip.service.IProductInfoService; @@ -38,6 +39,8 @@ import com.ruoyi.sip.service.IOrderInfoService; import com.ruoyi.common.core.text.Convert; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; + /** * 合同档案Service业务层处理 * @@ -55,6 +58,8 @@ public class OrderInfoServiceImpl implements IOrderInfoService private ICustomerInfoService customerInfoService; @Autowired private IProductInfoService productInfoService; + @Resource + private DeliveryListMapper deliveryListMapper; /** * 查询合同档案 * @@ -149,6 +154,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService // } // orderInfoMapper.updateListBatch(orderListList); // } + deliveryListMapper.updateTimeByOrderId(Collections.singletonList(orderInfo.getId())); return orderInfoMapper.updateOrderInfo(orderInfo); } diff --git a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml index 234c7ca8..ecd1649f 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml @@ -135,6 +135,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + update delivery_list set updated_at = now() + where delivery_id in (select id from order_delivery where order_id in + + #{item} + ) + delete from delivery_list where id = #{id} diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml index 2c2d33f5..a2453f36 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml @@ -378,6 +378,14 @@ where id = #{item.id} + + update order_info + set + updated_at=now() + where id in (select order_id from order_delivery where id in + #{item} + ) + update order_info