Commit b0d4db2e by wangweidong

土工平台修改

parent 1ae53891
...@@ -7,6 +7,7 @@ import com.patzn.cloud.service.lims.soil.mapper.SoilAppendixMapper; ...@@ -7,6 +7,7 @@ import com.patzn.cloud.service.lims.soil.mapper.SoilAppendixMapper;
import com.patzn.cloud.service.lims.soil.service.ISoilAppendixService; import com.patzn.cloud.service.lims.soil.service.ISoilAppendixService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl; import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.soil.entity.SoilAppendix; import com.patzn.cloud.service.soil.entity.SoilAppendix;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
...@@ -31,6 +32,22 @@ public class SoilAppendixServiceImpl extends BaseServiceImpl<SoilAppendixMapper, ...@@ -31,6 +32,22 @@ public class SoilAppendixServiceImpl extends BaseServiceImpl<SoilAppendixMapper,
@Override @Override
public Page<SoilAppendix> page(Page<SoilAppendix> page, SoilAppendix soilAppendix) { public Page<SoilAppendix> page(Page<SoilAppendix> page, SoilAppendix soilAppendix) {
Wrapper wrapper = new EntityWrapper<>(soilAppendix); Wrapper wrapper = new EntityWrapper<>(soilAppendix);
if (StringUtils.isNotBlank(soilAppendix.getTitle())){
wrapper.like("title",soilAppendix.getTitle());
soilAppendix.setTitle(null);
}
if (StringUtils.isNotBlank(soilAppendix.getRemark())){
wrapper.like("remark",soilAppendix.getRemark());
soilAppendix.setRemark(null);
}
if (StringUtils.isNotBlank(soilAppendix.getSampleCode())){
wrapper.like("sample_code",soilAppendix.getSampleCode());
soilAppendix.setSampleCode(null);
}
wrapper.orderBy("ctime"); wrapper.orderBy("ctime");
return this.page(page, wrapper); return this.page(page, wrapper);
} }
......
...@@ -17,7 +17,8 @@ import java.util.Random; ...@@ -17,7 +17,8 @@ import java.util.Random;
public class TestDian { public class TestDian {
public static void main(String[] args) throws Exception{ public static void main(String[] args) throws Exception{
createScatterChart(); String a=null;
System.out.println("abc".contains(a));
} }
public static void createScatterChart() throws IOException { public static void createScatterChart() throws IOException {
XSSFWorkbook wb = new XSSFWorkbook(); XSSFWorkbook wb = new XSSFWorkbook();
......
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