From 10e3616ec99edf53e341eb76c139771e1f872747 Mon Sep 17 00:00:00 2001
From: "HAITIAN-TIM\\67349" <chenmin@seaskysh.com>
Date: Wed, 21 May 2025 15:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BE=AE=E9=97=A8=E6=88=B7?=
=?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/ExpenseReimbursementServiceImpl.java | 20 +------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExpenseReimbursementServiceImpl.java b/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExpenseReimbursementServiceImpl.java
index c1a95340..cd6bc96c 100644
--- a/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExpenseReimbursementServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExpenseReimbursementServiceImpl.java
@@ -528,17 +528,14 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ
List<HistoricActivityInstanceOut> historicList;
switch (flowQuery.getFlowQueryEnum()) {
case ListTodo:
- log.info("listProcess: listExpenseReimbursementAll, listTodoAll");
List<TaskOut> taskList = flowService.listTodoAll(flowQuery);
processInstanceIds = taskList.stream().map(TaskOut::getProcessInstanceId).collect(Collectors.toList());
break;
case ListDone:
- log.info("listProcess: listExpenseReimbursementAll, listDoneAll");
historicList = flowService.listDoneAll(flowQuery);
processInstanceIds = historicList.stream().map(HistoricActivityInstanceOut::getProcessInstanceId).collect(Collectors.toList());
break;
case ListFinish:
- log.info("listProcess: listExpenseReimbursementAll, listFinishAll");
historicList = flowService.listFinishAll(flowQuery);
processInstanceIds = historicList.stream().map(HistoricActivityInstanceOut::getProcessInstanceId).collect(Collectors.toList());
break;
@@ -551,7 +548,6 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ
} else {
approvalQuery.setProcessInstanceIds(processInstanceIds);
approvalQuery.setLoginUserNo(flowQuery.getUserId());
- log.info("listProcess: listExpenseReimbursementAll, listApproval");
return listApproval(approvalQuery);
}
return Pagination.fromPage(page);
@@ -789,7 +785,6 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ
queryWrapper.orderBy(true, approvalQuery.getOrderTimeSort() == 1, orderByDateCol);
queryWrapper.orderByDesc("order_code");
Page page = new Page<>(approvalQuery.getPageIndex(), approvalQuery.getPageSize());
- log.info("listProcess: listExpenseReimbursementAll, listApproval, approvalPoPage");
Page<ApprovalPo> approvalPoPage = approvalMapper.selectPage(page, queryWrapper);
List<ApprovalPo> approvalPoList = approvalPoPage.getRecords();
List<ApprovalOut> approvalOutList = MapperUtils.INSTANCE.mapAsList(ApprovalOut.class, approvalPoList);
@@ -798,7 +793,6 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ
List<AuditSupplementOut> auditSupplementList = new ArrayList<>();
boolean needAuditSupplement = BaseConfigUtil.INSTANCE.getBaseConfigProperties(instanceId).getNeedAuditSupplement();
if (needAuditSupplement) {
- log.info("listProcess: listExpenseReimbursementAll, listApproval, queryAuditSupplementFlags");
AuditSupplementCmd auditSupplementCmd = AuditSupplementCmd.builder().orderNoList(orderNoList).build();
auditSupplementCmd.setInstanceId(instanceId);
auditSupplementList = queryAuditSupplementFlags(auditSupplementCmd);
@@ -824,7 +818,6 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ
webUrl = PreApplyUtil.getWebUrlPreFix(instanceId, approvalOut.getOrderType()) + approvalOut.getOrderCode();
approvalOut.setWebUrl(webUrl);
- log.info("listProcess: listExpenseReimbursementAll, listApproval, getSignatureListByOrderCode");
List<SignatureOut> signatureList = signatureService.getSignatureListByOrderCode(instanceId, approvalOut.getOrderCode());
String lastReviewer = "";
if (ObjectUtils.isNotEmpty(signatureList)) {
@@ -2271,9 +2264,7 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ
@Override
public Pagination<TodoOut> listProcess(FlowQuery qry) {
Long instanceId = BaseInOutUtil.verifyInstanceId(qry);
- log.info("listProcess: verifyModel");
verifyModel(qry);
- log.info("listProcess: verifyOrganization");
verifyOrganization(qry);
FlowQueryEnum flowQueryEnum = qry.getFlowQueryEnum();
if (ObjectUtils.isEmpty(flowQueryEnum))
@@ -2289,7 +2280,6 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ
: baseConfigProperties.getListProcessNotFirstPageCacheSeconds();
needListProcessCache = ObjectUtils.isNotEmpty(listProcessCacheSeconds);
if (needListProcessCache) {
- log.info("listProcess: listProcessCache");
pagination = MyRedisUtil.getListProcess(qry);
if (ObjectUtils.isNotEmpty(pagination))
return pagination;
@@ -2309,11 +2299,9 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ
.build();
approvalQuery.setInstanceId(instanceId);
- log.info("listProcess: listExpenseReimbursementAll");
Pagination<ApprovalOut> approvalOutPagination = listExpenseReimbursementAll(approvalQuery, qry);
List<ApprovalOut> records = approvalOutPagination.getRecords();
List<TodoOut> todoOutList = new ArrayList<>();
- log.info("listProcess: listExpenseReimbursementAll, end");
SchoolEnum schoolEnum = BaseConfigUtil.getSchoolEnum(instanceId);
boolean isListTodo = FlowQueryEnum.ListTodo.equals(flowQueryEnum);
@@ -2321,7 +2309,6 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ
List<ProjectInfoOut> recordsProjectInfoList = new ArrayList<>();
if (isListTodo && ObjectUtils.isNotEmpty(records)) {
if (!isU8) {
- log.info("listProcess: getProjectInfoList");
List<String> projectCodeList = new ArrayList<>();
for (ApprovalOut record : records) {
List<String> fundsProjectCodeList = record.getFundsProjectCodeList();
@@ -2337,13 +2324,11 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ
recordsProjectInfoList = ExternalDataUtil.INSTANCE.getProjectInfoListByProjectCode(instanceId, projectCodeList);
}
}
- log.info("listProcess: forEachRecord");
for (ApprovalOut record : records) {
String fundsProjectInfo = "";
if (isListTodo && ObjectUtils.isNotEmpty(record.getFundsProject())) {
String fundsProject = "";
if (isU8) {
- log.info("listProcess: getU8ProjectInfo");
ExpenseReimbursementCmd cmd = MapperUtils.INSTANCE.map(ExpenseReimbursementCmd.class, record);
List<U8ProjectInfoOut> projectInfoList = ExternalDataUtil.INSTANCE.getU8ProjectInfo(cmd);
if (ObjectUtils.isNotEmpty(projectInfoList)) {
@@ -2386,14 +2371,11 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ
todoOut.setPreviousReviewer(ObjectUtils.isEmpty(lastReviewer) ? record.getApplicantName() : lastReviewer);
todoOutList.add(todoOut);
}
- log.info("listProcess: forEachRecord, end");
page.setRecords(todoOutList);
page.setTotal(approvalOutPagination.getTotal());
pagination = Pagination.fromPage(page);
- if (needListProcessCache) {
- log.info("listProcess: setListProcessCache");
+ if (needListProcessCache)
MyRedisUtil.setListProcess(qry, pagination, listProcessCacheSeconds);
- }
return pagination;
}
--
GitLab