Commit bec0f6c7 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.邮件发送服务代码修改,修改配置文件及发送逻辑,解决邮件名称唯一性;
2.邮件接收功能修改,解决邮件接收协议修改后导致的一系列问题;
3.长期间开优化功能修改,修改定时任务处理逻辑及执行周期;
4.中期间开优化功能修改,修改定时任务处理逻辑及执行周期;
5.超长期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
6.超短期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
7.组织线路树功能修改,重构查询逻辑;
8.间开优化历史功能修改,重构查询逻辑;
9.开发当日已优化间开结果列表查询接口,生成对应接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent c50b8739
...@@ -245,7 +245,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -245,7 +245,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
PageMethod.startPage(input.getPage(), input.getLimit()); PageMethod.startPage(input.getPage(), input.getLimit());
List<SpaceInstitutionDetailEnt> detailEntList = mapper.selectList(new LambdaQueryWrapper<SpaceInstitutionDetailEnt>() List<SpaceInstitutionDetailEnt> detailEntList = mapper.selectList(new LambdaQueryWrapper<SpaceInstitutionDetailEnt>()
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE) .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.eq(SpaceInstitutionDetailEnt::getOuId, input.getOuId()) .eq(StringUtils.isBlank(lineId), SpaceInstitutionDetailEnt::getOuId, input.getOuId())
.eq(StringUtils.isNotBlank(lineId), SpaceInstitutionDetailEnt::getLineId, lineId) .eq(StringUtils.isNotBlank(lineId), SpaceInstitutionDetailEnt::getLineId, lineId)
.like(StringUtils.isNotBlank(institutionName), SpaceInstitutionDetailEnt::getInstitutionName, institutionName) .like(StringUtils.isNotBlank(institutionName), SpaceInstitutionDetailEnt::getInstitutionName, institutionName)
); );
......
package pps.core.space.service.data.space_institution_detail; package pps.core.space.service.data.space_institution_detail;
import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.data.XPageInput; import xstartup.base.data.XPageInput;
...@@ -15,7 +14,7 @@ import xstartup.base.data.XPageInput; ...@@ -15,7 +14,7 @@ import xstartup.base.data.XPageInput;
public class QuerySpaceInstitutionDetailViewInput extends XPageInput { public class QuerySpaceInstitutionDetailViewInput extends XPageInput {
@XText("组织机构ID") @XText("组织机构ID")
@NotBlank(message = "缺少组织机构ID") // @NotBlank(message = "缺少组织机构ID")
private String ouId; private String ouId;
@XText("线路ID") @XText("线路ID")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment