|
|
@@ -856,12 +856,15 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<DemandListBo> listMyDemand(String name, String startDate, String endDate,
|
|
|
- Integer pageNo, Integer pageSize) {
|
|
|
+ public Pagination<DemandListBo> listMyDemand(String name, String startDate, String endDate,String createStartDate,String createEndDate,
|
|
|
+ Integer auditStatus,Integer pageNo, Integer pageSize) {
|
|
|
Map<String,Object> params = new HashMap<String,Object>();
|
|
|
if(StringUtils.isNotBlank(name)) params.put("name", name);
|
|
|
if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
|
|
|
- if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate);
|
|
|
+ if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate+" 23:59:59");
|
|
|
+ if(StringUtils.isNotBlank(createStartDate)) params.put("createStartDate", createStartDate);
|
|
|
+ if(StringUtils.isNotBlank(createEndDate)) params.put("createEndDate", createEndDate+" 23:59:59");
|
|
|
+ if(auditStatus!=null)params.put("auditStatus", auditStatus);
|
|
|
params.put("employerId", TokenManager.getUserId());
|
|
|
return (Pagination<DemandListBo>) findPage("selectDemandListByPage", "selectDemandListCount", params, pageNo, pageSize);
|
|
|
}
|
|
|
@@ -999,6 +1002,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
int lastCellNum = row.getLastCellNum();
|
|
|
//循环当前行 cellNum = (firstCellNum+1) 则是除开第一例
|
|
|
Demand in=new Demand();
|
|
|
+ List<String> list2 =new ArrayList<>();
|
|
|
for(int cellNum = (firstCellNum); cellNum < lastCellNum;cellNum++){
|
|
|
Cell cell = row.getCell(cellNum);
|
|
|
try {
|
|
|
@@ -1014,6 +1018,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
break;
|
|
|
case 3:
|
|
|
in.setProblemDes(FileUtils.getCellValue(cell));
|
|
|
+ if (in.getProblemDes().length()>512) {
|
|
|
+ list2.add(in.getName());
|
|
|
+ }
|
|
|
break;
|
|
|
case 4:
|
|
|
in.setKeyword(FileUtils.getCellValue(cell));
|
|
|
@@ -1035,6 +1042,15 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
throw new BusinessException(new Error("表格第"+(rowNum+1)+"行输入内容不正确。"));
|
|
|
}
|
|
|
}
|
|
|
+ if (!list2.isEmpty()) {
|
|
|
+ StringBuffer str=new StringBuffer("[");
|
|
|
+ for (String string : list2) {
|
|
|
+ str.append(string+",");
|
|
|
+ }
|
|
|
+ str.deleteCharAt(str.length()-1);
|
|
|
+ str.append("]");
|
|
|
+ throw new BusinessException(new Error("名称"+str+"内容过长,请控制在512个字符内"));
|
|
|
+ }
|
|
|
in.setDeletedSign(DeleteStatus.UNDELETE.getCode());
|
|
|
in.setEmployerId(TokenManager.getAdminId());
|
|
|
in.setCreateTime(date);
|