ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/CokingProcessChildServiceImpl.java
@@ -1,13 +1,17 @@ package com.iailab.module.ansteel.api.service.impl; import com.iailab.framework.common.util.date.DateUtils; import com.iailab.module.ansteel.api.entity.CokingProcessChildEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iailab.module.ansteel.api.dao.CokingProcessChildDao; import com.iailab.module.ansteel.api.service.CokingProcessChildService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Calendar; import java.util.List; import java.util.Map; @@ -25,8 +29,22 @@ @Override public List<CokingProcessChildEntity> list(Map<String, Object> params) { String indType = (String) params.get("indType"); String category = (String) params.get("category"); String clock = (String) params.get("clock"); if (StringUtils.isBlank(indType) || StringUtils.isBlank(category)) { return new ArrayList<>(); } if (StringUtils.isBlank(clock)) { Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DAY_OF_YEAR, -1); clock = DateUtils.format(calendar.getTime(), "yyyy-MM-dd"); } QueryWrapper<CokingProcessChildEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.orderByAsc("sort"); queryWrapper.eq("ind_type", indType) .eq("category", category) .eq("clock", clock) .orderByAsc("sort"); return cokingProcessChildDao.selectList(queryWrapper); } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/CokingProcessMainServiceImpl.java
@@ -1,13 +1,17 @@ package com.iailab.module.ansteel.api.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iailab.framework.common.util.date.DateUtils; import com.iailab.module.ansteel.api.dao.CokingProcessMainDao; import com.iailab.module.ansteel.api.entity.CokingProcessMainEntity; import com.iailab.module.ansteel.api.service.CokingProcessMainService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Calendar; import java.util.List; import java.util.Map; @@ -25,8 +29,20 @@ @Override public List<CokingProcessMainEntity> list(Map<String, Object> params) { String category = (String) params.get("category"); String clock = (String) params.get("clock"); if (StringUtils.isBlank(category)) { return new ArrayList<>(); } if (StringUtils.isBlank(clock)) { Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DAY_OF_YEAR, -1); clock = DateUtils.format(calendar.getTime(), "yyyy-MM-dd"); } QueryWrapper<CokingProcessMainEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.orderByAsc("sort"); queryWrapper.eq("category", category) .eq("clock", clock) .orderByAsc("sort"); return cokingProcessMainDao.selectList(queryWrapper); }