|
|
@ -3722,6 +3722,7 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
result.put("totalCount", toDefaultInt(dbStats == null ? null : dbStats.get("totalCount"), 0)); |
|
|
result.put("totalCount", toDefaultInt(dbStats == null ? null : dbStats.get("totalCount"), 0)); |
|
|
result.put("pendingAuditCount", toDefaultInt(dbStats == null ? null : dbStats.get("pendingAuditCount"), 0)); |
|
|
result.put("pendingAuditCount", toDefaultInt(dbStats == null ? null : dbStats.get("pendingAuditCount"), 0)); |
|
|
result.put("pendingOperateCount", toDefaultInt(dbStats == null ? null : dbStats.get("pendingOperateCount"), 0)); |
|
|
result.put("pendingOperateCount", toDefaultInt(dbStats == null ? null : dbStats.get("pendingOperateCount"), 0)); |
|
|
|
|
|
result.put("unauditedCount", toDefaultInt(dbStats == null ? null : dbStats.get("unauditedCount"), 0)); |
|
|
result.put("lockPendingCount", toDefaultInt(dbStats == null ? null : dbStats.get("lockPendingCount"), 0)); |
|
|
result.put("lockPendingCount", toDefaultInt(dbStats == null ? null : dbStats.get("lockPendingCount"), 0)); |
|
|
result.put("pendingTotalCount", toDefaultInt(dbStats == null ? null : dbStats.get("pendingTotalCount"), 0)); |
|
|
result.put("pendingTotalCount", toDefaultInt(dbStats == null ? null : dbStats.get("pendingTotalCount"), 0)); |
|
|
result.put("completedCount", toDefaultInt(dbStats == null ? null : dbStats.get("completedCount"), 0)); |
|
|
result.put("completedCount", toDefaultInt(dbStats == null ? null : dbStats.get("completedCount"), 0)); |
|
|
@ -3742,6 +3743,18 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
return new PageUtils(list, totalCount == null ? 0 : totalCount, pageSize, pageNo); |
|
|
return new PageUtils(list, totalCount == null ? 0 : totalCount, pageSize, pageNo); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
|
|
public void auditTodoMessage(Map<String, Object> inData) { |
|
|
|
|
|
String site = trimToEmpty(inData == null ? null : inData.get("site")); |
|
|
|
|
|
String buNo = trimToEmpty(inData == null ? null : inData.get("buNo")); |
|
|
|
|
|
String infoCode = trimToEmpty(inData == null ? null : inData.get("infoCode")); |
|
|
|
|
|
if (!StringUtils.hasText(site) || !StringUtils.hasText(buNo) || !StringUtils.hasText(infoCode)) { |
|
|
|
|
|
throw new XJException("审核参数不完整"); |
|
|
|
|
|
} |
|
|
|
|
|
scheduleTodoMessageMapper.markTodoAudited(site, buNo, infoCode); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
private Map<String, Object> buildTodoCenterQuery(Map<String, Object> inData, boolean includePaging) { |
|
|
private Map<String, Object> buildTodoCenterQuery(Map<String, Object> inData, boolean includePaging) { |
|
|
Map<String, Object> query = new HashMap<>(); |
|
|
Map<String, Object> query = new HashMap<>(); |
|
|
query.put("site", trimToEmpty(inData == null ? null : inData.get("site"))); |
|
|
query.put("site", trimToEmpty(inData == null ? null : inData.get("site"))); |
|
|
|