|
@@ -10,6 +10,7 @@ import java.util.Map;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFSheet;
|
|
import org.apache.poi.xssf.usermodel.XSSFSheet;
|
|
@@ -41,16 +42,15 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
|
|
|
@Override
|
|
@Override
|
|
|
public Pagination<OutDemandCollection> demandCollectionList(InputDemandCollection i) {
|
|
public Pagination<OutDemandCollection> demandCollectionList(InputDemandCollection i) {
|
|
|
Map<String, Object> map=new HashMap<>();
|
|
Map<String, Object> map=new HashMap<>();
|
|
|
- if(i.getDwmc()!=null)map.put("dwmc", i.getDwmc());
|
|
|
|
|
- if(i.getDwxz()!=null)map.put("dwxz", i.getDwxz());
|
|
|
|
|
- if(i.getStartTime()!=null&&i.getEndTime()!=null) {
|
|
|
|
|
|
|
+ if(StringUtils.isBlank(i.getDwmc()))map.put("dwmc", i.getDwmc());
|
|
|
|
|
+ if(StringUtils.isBlank(i.getDwxz()))map.put("dwxz", i.getDwxz());
|
|
|
|
|
+ if(StringUtils.isBlank(i.getStartTime())&&StringUtils.isBlank(i.getEndTime())) {
|
|
|
map.put("startTime", i.getStartTime());
|
|
map.put("startTime", i.getStartTime());
|
|
|
map.put("endTime", i.getEndTime()+" 23:59:59");
|
|
map.put("endTime", i.getEndTime()+" 23:59:59");
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- if(i.getSsszp()!=null)map.put("ssszp", i.getSsszp());
|
|
|
|
|
- if(i.getSsszc()!=null)map.put("ssszc", i.getSsszc());
|
|
|
|
|
- if(i.getSssza()!=null)map.put("sssza", i.getSssza());
|
|
|
|
|
|
|
+ if(StringUtils.isBlank(i.getSsszp()))map.put("ssszp", i.getSsszp());
|
|
|
|
|
+ if(StringUtils.isBlank(i.getSsszc()))map.put("ssszc", i.getSsszc());
|
|
|
|
|
+ if(StringUtils.isBlank(i.getSssza()))map.put("sssza", i.getSssza());
|
|
|
return (Pagination<OutDemandCollection>) findPage("findDemandCollectionList","findDemandCollectionCount",
|
|
return (Pagination<OutDemandCollection>) findPage("findDemandCollectionList","findDemandCollectionCount",
|
|
|
map, i.getPageNo(), i.getPageSize());
|
|
map, i.getPageNo(), i.getPageSize());
|
|
|
}
|
|
}
|