diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/PlanInfoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/PlanInfoController.java index e2e8735..3c2c024 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/PlanInfoController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/PlanInfoController.java @@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.demo.domain.vo.PlanSelectVo; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -102,4 +103,11 @@ public class PlanInfoController extends BaseController { @PathVariable String[] ids) { return toAjax(planInfoService.deleteWithValidByIds(List.of(ids), true)); } + + + @GetMapping("/getPlans") + public R> getPlans(PlanInfoBo bo) { + List rs = planInfoService.getPlans(bo); + return R.ok(rs); + } } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PlanInfo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PlanInfo.java index 5bcc02e..18879c9 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PlanInfo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PlanInfo.java @@ -80,5 +80,6 @@ public class PlanInfo extends TenantEntity { @TableLogic private Long delFlag; + private String flag; } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PlanInfoBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PlanInfoBo.java index 0e2de89..3f3a463 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PlanInfoBo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PlanInfoBo.java @@ -85,5 +85,5 @@ public class PlanInfoBo extends BaseEntity { //@NotBlank(message = "监理公司不能为空", groups = { AddGroup.class, EditGroup.class }) private String monitorCompany; - + private String flag; } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PlanSelectVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PlanSelectVo.java new file mode 100644 index 0000000..942b4c3 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PlanSelectVo.java @@ -0,0 +1,14 @@ +package org.dromara.demo.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PlanSelectVo { + private String value; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IPlanInfoService.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IPlanInfoService.java index 635ddaf..a22b0b8 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IPlanInfoService.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IPlanInfoService.java @@ -4,6 +4,7 @@ import org.dromara.demo.domain.vo.PlanInfoVo; import org.dromara.demo.domain.bo.PlanInfoBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.demo.domain.vo.PlanSelectVo; import java.util.Collection; import java.util.List; @@ -65,4 +66,6 @@ public interface IPlanInfoService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + List getPlans(PlanInfoBo bo); } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/PlanInfoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/PlanInfoServiceImpl.java index bbafd8d..7b280df 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/PlanInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/PlanInfoServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.demo.domain.vo.PlanSelectVo; import org.springframework.stereotype.Service; import org.dromara.demo.domain.bo.PlanInfoBo; import org.dromara.demo.domain.vo.PlanInfoVo; @@ -15,9 +16,8 @@ import org.dromara.demo.domain.PlanInfo; import org.dromara.demo.mapper.PlanInfoMapper; import org.dromara.demo.service.IPlanInfoService; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.text.SimpleDateFormat; +import java.util.*; /** * 计划管理Service业务层处理 @@ -80,6 +80,7 @@ public class PlanInfoServiceImpl implements IPlanInfoService { lqw.eq(StringUtils.isNotBlank(bo.getIoPerson()), PlanInfo::getIoPerson, bo.getIoPerson()); lqw.eq(StringUtils.isNotBlank(bo.getMonitorType()), PlanInfo::getMonitorType, bo.getMonitorType()); lqw.eq(StringUtils.isNotBlank(bo.getMonitorCompany()), PlanInfo::getMonitorCompany, bo.getMonitorCompany()); + lqw.eq(StringUtils.isNotBlank(bo.getFlag()), PlanInfo::getFlag, bo.getFlag()); return lqw; } @@ -134,4 +135,28 @@ public class PlanInfoServiceImpl implements IPlanInfoService { } return baseMapper.deleteByIds(ids) > 0; } + + @Override + public List getPlans(PlanInfoBo bo) { + bo.setFlag("否"); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List planInfoVos = baseMapper.selectVoList(lqw); + List list = new ArrayList<>(); + for (PlanInfoVo planInfoVo : planInfoVos) { + PlanSelectVo planSelectVo = new PlanSelectVo(); + // 街道名称 + String station = planInfoVo.getStation(); + // 计划日期 + Date planDate = planInfoVo.getPlanDate(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String formattedDate = sdf.format(planDate); + // 监理类型 + String monitorType = planInfoVo.getMonitorType(); + // 需要拼接: 街道名称 (计划日期,监理类型) 得到rs + String rs = String.format("%s (%s, %s)", station, formattedDate, monitorType); + planSelectVo.setValue(rs); + list.add(planSelectVo); + } + return list; + } }