我的發起、待處理、已處理同步

src/main/java/org/springblade/bank/checklist/controller/ChecklistController.java

@@ -381,6 +381,10 @@ public class ChecklistController extends BladeController {
 						row.put("checkDate", DateUtil.format(one.getCheckDate(), pattern));
 					}
 
+					if ("day".equals(dataType)){
+						row.put("needCheckDate", theDay);
+					}
+
 					row.put("checked", checkedCount);
 					row.put("nocheck", nocheckCount);
 					row.put("over", dlistOver.size());
@@ -392,6 +396,38 @@ public class ChecklistController extends BladeController {
 		return list;
 	}
 
+
+	@GetMapping("/getList")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入checklist")
+	public R getList(ChecklistVO checklist) {
+		if (StringUtils.isNotBlank(checklist.getType())){
+			List<String> units = Func.toStrList(checklist.getType());
+			checklist.setTypes(units);
+		}
+		if (StringUtils.isNotBlank(checklist.getItem())){
+			List<String> contents = Func.toStrList(checklist.getItem());
+			checklist.setItems(contents);
+		}
+		if (StringUtils.isNotBlank(checklist.getOrgNostr())){
+			List<String> orgNos = Func.toStrList(checklist.getOrgNostr());
+			checklist.setOrgNos(orgNos);
+		}
+		List<Checklist> list = checklistService.getList(checklist);
+
+		list.forEach(item -> {
+			String type = item.getType();
+			String item1 = item.getItem();
+			String check_category = dictService.getValue("check_category", type);
+			String check_item = dictService.getValue("check_item", item1);
+			item.setType(check_category);
+			item.setItem(check_item);
+		});
+
+		return R.data(list);
+	}
+
+
 	/**
 	 * 获取传入时间的第二天
 	 * @param today

src/main/java/org/springblade/bank/checklist/mapper/ChecklistMapper.java

@@ -49,4 +49,6 @@ public interface ChecklistMapper extends BaseMapper<Checklist> {
 
 //	@DataAuth(type = DataScopeEnum.OWN_DEPT_CHILD)
     List<ChecklistVO> getOverList(@Param("checks") ChecklistVO checks);
+
+    List<Checklist> selectChecklistPage(@Param("checklist") ChecklistVO checklist);
 }

src/main/java/org/springblade/bank/checklist/service/IChecklistService.java

@@ -45,4 +45,6 @@ public interface IChecklistService extends BaseService<Checklist> {
     List<ChecklistVO> getDataList(ChecklistVO checks);
 
     List<ChecklistVO> getOverList(ChecklistVO checks);
+
+    List<Checklist> getList(ChecklistVO checklist);
 }

src/main/java/org/springblade/bank/checklist/service/impl/ChecklistServiceImpl.java

@@ -58,4 +58,9 @@ public class ChecklistServiceImpl extends BaseServiceImpl<ChecklistMapper, Check
 		return baseMapper.getOverList(checks);
 	}
 
+	@Override
+	public List<Checklist> getList(ChecklistVO checklist) {
+		return baseMapper.selectChecklistPage(checklist);
+	}
+
 }