From 147c67b5ad3e8c8461f1d4c43057c5a125c1d885 Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Thu, 3 Jul 2025 09:36:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E6=B4=81=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ++++-- .../controller/CleanOrderController.java | 1 + .../dromara/property/domain/CleanOrder.java | 5 ++--- .../property/domain/bo/CleanOrderBo.java | 4 ++-- .../property/domain/vo/CleanOrderVo.java | 18 +++++++++------ .../dromara/property/mapper/CleanMapper.java | 3 +++ .../property/mapper/CleanOrderMapper.java | 3 ++- .../service/impl/CleanOrderServiceImpl.java | 22 ++++++++++++++++--- .../mapper/Property/CleanOrderMapper.xml | 8 ++++++- 9 files changed, 52 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index cb53142..5e5f0ca 100644 --- a/pom.xml +++ b/pom.xml @@ -108,12 +108,15 @@ prod prod - 127.0.0.1:8848 + + + 47.109.37.87:8848 + 47.109.37.87:4560 DEFAULT_GROUP DEFAULT_GROUP nacos nacos - 127.0.0.1:4560 + diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanOrderController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanOrderController.java index 4a11519..b435024 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanOrderController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanOrderController.java @@ -2,6 +2,7 @@ package org.dromara.property.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaIgnore; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java index 29c817f..8f54eea 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java @@ -71,14 +71,14 @@ public class CleanOrder extends TenantEntity { * 开始时间 */ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") - private LocalDateTime starTime; + private String starTime; /** * 结束时间 */ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") - private LocalDateTime endTime; + private String endTime; /** * 单位id @@ -120,7 +120,6 @@ public class CleanOrder extends TenantEntity { */ private String searchValue; -// private List cleanList; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java index 4d796f1..c6bc09e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java @@ -77,14 +77,14 @@ public class CleanOrderBo extends BaseEntity { * 开始时间 */ @NotBlank(message = "开始时间不能为空", groups = {AddGroup.class, EditGroup.class}) -// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private String starTime; /** * 结束时间 */ @NotBlank(message = "结束时间不能为空", groups = {AddGroup.class, EditGroup.class}) -// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private String endTime; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java index 0a8e2bd..1f87f84 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java @@ -1,8 +1,10 @@ package org.dromara.property.domain.vo; +import java.time.LocalDateTime; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import kotlin.text.UStringsKt; +import org.dromara.property.domain.Clean; import org.dromara.property.domain.CleanOrder; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -49,11 +51,11 @@ public class CleanOrderVo implements Serializable { @ExcelProperty(value = "面积") private Long area; - /** - * 保洁id - */ - @ExcelProperty(value = "保洁") - private List clean; +// /** +// * 保洁id +// */ +// @ExcelProperty(value = "保洁") +// private List clean; // /** // * 名称 @@ -84,13 +86,13 @@ public class CleanOrderVo implements Serializable { * 开始时间 */ @ExcelProperty(value = "开始时间") - private Date starTime; + private String starTime; /** * 结束时间 */ @ExcelProperty(value = "结束时间") - private Date endTime; + private String endTime; /** * 单位id @@ -122,5 +124,7 @@ public class CleanOrderVo implements Serializable { @ExcelProperty(value = "状态") private int state; + private List cleanList; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java index 5c6d37a..4ffe3a2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java @@ -1,9 +1,12 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Select; import org.dromara.property.domain.Clean; import org.dromara.property.domain.vo.CleanVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 保洁管理Mapper接口 * diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java index 26000e1..bed303d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java @@ -16,5 +16,6 @@ public interface CleanOrderMapper extends BaseMapperPlus selectForPage(Page build, LambdaQueryWrapper lqw); -// int insertCleanOrder(CleanOrder add); +// CleanOrderVo selectforDetail(Long id); + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java index 2b5de34..9f3f517 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.property.service.impl; import cn.hutool.core.date.DateTime; +import cn.idev.excel.event.Order; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.Mapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; @@ -16,6 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.property.domain.Clean; import org.dromara.property.domain.CleanRelation; import org.dromara.property.domain.CleanserverOrder; +import org.dromara.property.domain.vo.CleanserverOrderVo; import org.dromara.property.mapper.CleanMapper; import org.dromara.property.mapper.CleanRelationMapper; import org.dromara.property.mapper.CleanserverOrderMapper; @@ -61,7 +63,20 @@ public class CleanOrderServiceImpl implements ICleanOrderService { */ @Override public CleanOrderVo queryById(Long id) { - return baseMapper.selectVoById(id); + //根据id查询出cleanserver_order表中的所有记录 + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery().eq(CleanserverOrder::getOrderId, id); + List cleanserverOrderList = cleanserverOrderMapper.selectList(queryWrapper); + //根据cleanserver_order表中的所有记录取出所有的cleanId查询出clean表中的所有记录 + List cleanIds = cleanserverOrderList.stream().map(CleanserverOrder::getCleanServerId).collect(Collectors.toList()); + List cleanList = cleanMapper.selectBatchIds(cleanIds); + //根据cleanserver_order表中的所有记录取出所有的orderId查询出clean_order表中的所有记录 + CleanOrder cleanOrder = baseMapper.selectById(id); + //将cleanserver_order表中的所有记录和clean表中的所有记录和clean_order表中的所有记录合并 + CleanOrderVo cleanOrderVo = MapstructUtils.convert(cleanOrder, CleanOrderVo.class); + cleanOrderVo.setCleanList(cleanList); + return cleanOrderVo; + +// return baseMapper.selectforDetail(id); } /** @@ -73,6 +88,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService { */ @Override public TableDataInfo queryPageList(CleanOrderBo bo, PageQuery pageQuery) { + // 构造条件查询器，返回的是一个集合 LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectForPage(pageQuery.build(), lqw); return TableDataInfo.build(result); @@ -127,8 +143,8 @@ public class CleanOrderServiceImpl implements ICleanOrderService { CleanOrder add = new CleanOrder(); validEntityBeforeSave(add); BeanUtils.copyProperties(bo, add); - add.setStarTime(new DateTime(bo.getStarTime()).toLocalDateTime()); - add.setEndTime(new DateTime(bo.getEndTime()).toLocalDateTime()); + add.setStarTime(String.valueOf(new DateTime(bo.getStarTime()).toLocalDateTime())); + add.setEndTime(String.valueOf(new DateTime(bo.getEndTime()).toLocalDateTime())); boolean flag = baseMapper.insert(add) > 0; //向clean表中插入数据 diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanOrderMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanOrderMapper.xml index 5653cad..8c976d4 100644 --- a/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanOrderMapper.xml +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanOrderMapper.xml @@ -8,10 +8,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT co.*, c.*, - ru.name name,ru.id + ru.name name,ru.id unitId FROM clean_order co LEFT JOIN clean c ON co.clean_id = c.id LEFT JOIN resident_unit ru ON co.unit_id = ru.id; + + + + + +