yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

考核任务清单查询作废状态的排在最后；详情接口返回模板基本信息

master
wany 2024-09-12 10:21:25 +08:00
parent af09279ac3
commit 42b4552a29
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
View File

@ -111,4 +111,31 @@ public interface AssessTaskMapper extends BaseMapper<AssessTask> {
</script>
""")
List<AssessTask> resultStat(MonthRangeSo monthRangeSo);
@Select("""
<script>
select t.* from public.assess_task t
<where>
<if test="obj.taskName != null and obj.taskName != ''">
t.task_name like concat('%', #{obj.taskName}, '%')
</if>
<if test="obj.dateRangeSo != null and obj.dateRangeSo.start != null">
and t.start_date <![CDATA[>=]]> #{obj.dateRangeSo.start}
</if>
<if test="obj.dateRangeSo != null and obj.dateRangeSo.end != null">
and t.start_date <![CDATA[<=]]> #{obj.dateRangeSo.end}
</if>
<if test="obj.status != null">
and t.status = #{obj.status}
</if>
</where>
ORDER BY
CASE
WHEN t.status = 4 THEN 1
ELSE 0
END ASC,
t.create_time DESC
</script>
""")
Page<AssessTask> listPage(Page<AssessTask> page,@Param("obj") AssessTaskPageSo page1);
}

19
src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java
View File

@ -1,11 +1,8 @@
package com.gunshi.project.xyt.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gunshi.db.dto.MonthRangeSo;
@ -98,21 +95,7 @@ public class AssessTaskService extends ServiceImpl<AssessTaskMapper, AssessTask>
}
public Page<AssessTask> listPage(AssessTaskPageSo page) {
LambdaQueryWrapper<AssessTask> queryWrapper = Wrappers.lambdaQuery();
if (ObjectUtils.isNotNull(page.getTaskName())) {
queryWrapper.like(AssessTask::getTaskName, page.getTaskName());
}
if (page.getStatus() != null) {
queryWrapper.eq(AssessTask::getStatus, page.getStatus());
}
if(page.getDateRangeSo() != null && page.getDateRangeSo().getStart() != null){
queryWrapper.ge(AssessTask::getStartDate,page.getDateRangeSo().getStart());
}
if(page.getDateRangeSo() != null && page.getDateRangeSo().getEnd() != null){
queryWrapper.le(AssessTask::getStartDate,page.getDateRangeSo().getEnd());
}
queryWrapper.orderByDesc(AssessTask::getCreateTime);
Page<AssessTask> res = this.page(page.getPageSo().toPage(), queryWrapper);
Page<AssessTask> res = this.baseMapper.listPage(page.getPageSo().toPage(), page);
if (res.getRecords() != null && res.getRecords().size() > 0) {
for (AssessTask record : res.getRecords()) {
record.setAssessObjects(assessObjectService.getObject(record.getId()));