修復

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

@@ -361,43 +361,44 @@ public class ChecklistController extends BladeController {
 
 	private List<Map> getReportData(ChecklistVO checklist, String dataType, String theDay, Dept dept, List<Dict> check_category, List<Dict> check_item){
 		List<Map> list = new ArrayList<>();
-
 		check_category.forEach(category -> {
 			check_item.forEach(item -> {
-				if (category.getDictKey().contains(dataType) && item.getDictKey().contains(dataType) && item.getDictKey().contains(category.getDictKey())){
-					if (!dept.getOrgNo().startsWith("999") && !dept.getOrgNo().equals("51614")){
-						Map row = new HashMap();
-						row.put("orgNo", dept.getOrgNo());
-						row.put("deptName", dept.getDeptName());
-						row.put("type", category.getDictKey());
-						row.put("item", item.getDictKey());
-
-						checklist.setType(category.getDictKey());
-						checklist.setItem(item.getDictKey());
-						checklist.setOrgNo(dept.getOrgNo());
-//						checklist.setIsChecked(1);
-						List<ChecklistVO> dataList = checklistService.getDataList(checklist);
-						int checkedCount = dataList.size();
-						List<ChecklistVO> dlistOver = checklistService.getOverList(checklist);
-						int overCount = dlistOver.size();
-						int nocheckCount = (checkedCount > 0 || overCount > 0) ? 0 : 1;
-						if (checkedCount > 0){
-							Checklist one = dataList.get(0);
-							row.put("checkDate", DateUtil.format(one.getCheckDate(), pattern));
-						}
-						if (overCount > 0){
-							Checklist one = dlistOver.get(0);
-							row.put("checkDate", DateUtil.format(one.getCheckDate(), pattern));
+				if (category.getIsSealed().equals(0) && item.getIsSealed().equals(0)){
+					if (category.getDictKey().contains(dataType) && item.getDictKey().contains(dataType) && item.getDictKey().contains(category.getDictKey())){
+						if (!dept.getOrgNo().startsWith("999") && !dept.getOrgNo().equals("51614")){
+							Map row = new HashMap();
+							row.put("orgNo", dept.getOrgNo());
+							row.put("deptName", dept.getDeptName());
+							row.put("type", category.getDictKey());
+							row.put("item", item.getDictKey());
+
+							checklist.setType(category.getDictKey());
+							checklist.setItem(item.getDictKey());
+							checklist.setOrgNo(dept.getOrgNo());
+	//						checklist.setIsChecked(1);
+							List<ChecklistVO> dataList = checklistService.getDataList(checklist);
+							int checkedCount = dataList.size();
+							List<ChecklistVO> dlistOver = checklistService.getOverList(checklist);
+							int overCount = dlistOver.size();
+							int nocheckCount = (checkedCount > 0 || overCount > 0) ? 0 : 1;
+							if (checkedCount > 0){
+								Checklist one = dataList.get(0);
+								row.put("checkDate", DateUtil.format(one.getCheckDate(), pattern));
+							}
+							if (overCount > 0){
+								Checklist one = dlistOver.get(0);
+								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());
+							list.add(row);
 						}
-
-						if ("day".equals(dataType)){
-							row.put("needCheckDate", theDay);
-						}
-
-						row.put("checked", checkedCount);
-						row.put("nocheck", nocheckCount);
-						row.put("over", dlistOver.size());
-						list.add(row);
 					}
 				}
 			});

src/main/java/org/springblade/bank/sealhandover/controller/SealHandoverController.java

@@ -42,6 +42,7 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.desk.service.INoticeService;
 import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.entity.Dict;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDeptService;
 import org.springblade.modules.system.service.IDictService;
@@ -120,7 +121,7 @@ public class SealHandoverController extends BladeController {
 	@GetMapping("/getKeepList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入sealHandover")
-	public R<IPage<SealHandoverVO>> getKeepList(SealHandoverVO sealHandover, Query query) {
+	public R<List<SealHandoverVO>> getKeepList(SealHandoverVO sealHandover) {
 		if (StringUtils.isNotBlank(sealHandover.getSealType())){
 			List<String> sealTypes = Func.toStrList(sealHandover.getSealType());
 			sealHandover.setSealTypes(sealTypes);
@@ -130,20 +131,17 @@ public class SealHandoverController extends BladeController {
 			sealHandover.setOrgNos(orgNos);
 		}
 
-		query.setSize(500);
-		IPage<SealHandoverVO> pages = sealHandoverService.selectSealHandoverPage(Condition.getPage(query), sealHandover);
-		List<SealHandoverVO> records = pages.getRecords();
-
+		List<SealHandoverVO> list = sealHandoverService.getList(sealHandover);
 		List<SealHandover> turnInList = sealHandoverService.getTurnInList();
 
 		HashSet<Map> set = new HashSet<>();
-		for (int i = 0; i < records.size(); i++) {
-			SealHandover item = records.get(i);
+		for (int i = 0; i < list.size(); i++) {
+			SealHandover item = list.get(i);
 			boolean flag = false;
 			for (int j = 0; j < turnInList.size(); j++) {
 				SealHandover turnIn = turnInList.get(j);
 				if (item.getSealType().equals(turnIn.getSealType()) && item.getSealNo().equals(turnIn.getSealNo())){
-					records.remove(i);
+					list.remove(i);
 					i--;
 					flag = true;
 					break;
@@ -158,12 +156,12 @@ public class SealHandoverController extends BladeController {
 				int size1 = set.size();
 				set.add(map);
 				if (set.size() == size1){
-					records.remove(i);
+					list.remove(i);
 					i--;
 				}
 			}
 		}
-		return R.data(pages);
+		return R.data(list);
 	}
 
 	/**
@@ -320,4 +318,56 @@ public class SealHandoverController extends BladeController {
 		return R.data(null);
 	}
 
+	/**
+	 * 業務印章持有量匯總表
+	 * @return
+	 */
+	@GetMapping("/getOrgsSealhandoverCount")
+	public R getOrgsSealhandoverCount(){
+		Map data = new HashMap();
+		Dept currDept = deptService.getById(AuthUtil.getDeptId());
+		List<Long> deptChildIds = deptService.getDeptChildIds(currDept.getId());
+
+		List<Dict> sealList = dictService.getList("seal_type");
+		List sealData = new ArrayList();
+		deptChildIds.forEach(deptId -> {
+			Dept dept = deptService.getById(deptId);
+			if (!dept.getOrgNo().startsWith("999")){
+				Map map = this.getKeepCountByDept(dept);
+				if (map != null){
+					sealData.add(map);
+				}
+			}
+		});
+		data.put("sealTypeList", sealList);
+		data.put("sealData", sealData);
+		return R.data(data);
+	}
+
+	/**
+	 * 業務印章持有量匯總表-支行
+	 * @param dept
+	 * @return
+	 */
+	private Map getKeepCountByDept(Dept dept){
+		Map map = new HashMap();
+		map.put("orgName", dept.getDeptName());
+		SealHandoverVO sealHandoverVO = new SealHandoverVO();
+		sealHandoverVO.setOrgNostr(dept.getOrgNo());
+		R<List<SealHandoverVO>> keepListR = this.getKeepList(sealHandoverVO);
+		List<SealHandoverVO> keepList = keepListR.getData();
+		if (keepList.size() > 0){
+			for (int i = 0; i < keepList.size(); i++) {
+				SealHandover item = keepList.get(i);
+				String key = "seal_type" + item.getSealType();
+				if (map.containsKey(key)){
+					map.put(key, Integer.valueOf(map.get(key).toString()) + 1);
+				}else{
+					map.put(key, 1);
+				}
+			}
+		}
+		return map;
+	}
+
 }

src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java

@@ -224,7 +224,7 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 		if (isEdit){
 			title = "更正：";
 		}
-		title += goodsUse.getFillingName() + "指派" + goodsUse.getPersonName() + "請登入系統進行確認";
+		title += goodsUse.getFillingName() + "提交了使用及出入庫登記表，請登入系統進行確認";
 
 		Notice notice = new Notice();
 		notice.setTitle(title);