|
@@ -9,8 +9,6 @@ import com.zjugis.business.bean.response.ProjectCalculateResponse;
|
|
|
import com.zjugis.business.bean.response.ProjectResponse;
|
|
|
import com.zjugis.business.mapper.ProjectMapper;
|
|
|
import com.zjugis.business.service.ProjectService;
|
|
|
-import com.zjugis.framework.mybatis.core.query.QueryWrapperX;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -37,16 +35,7 @@ public class ProjectServiceImpl implements ProjectService {
|
|
|
|
|
|
@Override
|
|
|
public Page<Project> page(Page<Project> page, ProjectDto projectDto) {
|
|
|
- QueryWrapperX<Project> queryWrapper = new QueryWrapperX<>();
|
|
|
- queryWrapper.likeIfPresent("XMMC",projectDto.getXmmc());
|
|
|
- queryWrapper.likeIfPresent("XMBH",projectDto.getXmbh());
|
|
|
- queryWrapper.eq(StringUtils.isNotBlank(projectDto.getProjectTypeId()),"PROJECT_TYPE_ID",projectDto.getProjectTypeId());
|
|
|
- queryWrapper.eq(StringUtils.isNotBlank(projectDto.getXzqdm()),"XZQDM",projectDto.getXzqdm());
|
|
|
- queryWrapper.eqIfPresent("HY_ID",projectDto.getHyId());
|
|
|
- queryWrapper.eqIfPresent("XMZT",projectDto.getXmzt());
|
|
|
- queryWrapper.eqIfPresent("IS_SIGN",projectDto.getIsSign());
|
|
|
- queryWrapper.betweenIfPresent("LXSJ",projectDto.getLxsjOn(),projectDto.getLxsjOff());
|
|
|
- return projectMapper.selectPage(page, queryWrapper);
|
|
|
+ return projectMapper.page(page,projectDto);
|
|
|
}
|
|
|
|
|
|
@Override
|