From 7cc2ab5c65f7ab4e0f4ccbda1fe8cb713e8cb877 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 01 四月 2024 17:03:31 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
index e9de07d..5dd2762 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -240,7 +240,16 @@
}
PageData<UnionApply> pageData = PageData.from(unionApplyJoinMapper.selectJoinPage(page,UnionApply.class, queryWrapper));
+ if(pageData!=null && pageData.getRecords()!=null){
+ for(UnionApply model : pageData.getRecords()){
+ initStatusInfo(model);
+ }
+ }
return pageData;
+ }
+
+ private void initStatusInfo(UnionApply model) {
+ model.setStatusInfo(Constants.UnionApplyStatus.getName(Constants.formatIntegerNum(model.getStatus())));
}
@Override
@@ -278,6 +287,7 @@
unionApply.setServiceDays(DateUtil.daysBetweenDates(new Date(),unionApply.getStartTime())+1);
}
}
+ initStatusInfo(unionApply);
//鏌ヨ鎿嶄綔璁板綍
List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
@@ -344,6 +354,8 @@
UnionApply unionApply = new UnionApply();
unionApply.setCreateDate(new Date());
unionApply.setCreator(user.getId());
+ unionApply.setEditor(user.getId());
+ unionApply.setEditDate(new Date());
unionApply.setCompanyId(user.getCompanyId());
unionApply.setStartTime(saveUnionApplyDTO.getStartDate());
unionApply.setEndTime(saveUnionApplyDTO.getEndDate());
@@ -400,7 +412,9 @@
if(!user.getType().equals(Constants.TWO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣滐紒");
}
- if(Objects.isNull(closeDTO)||Objects.isNull(closeDTO.getId())){
+ if(Objects.isNull(closeDTO)
+ ||Objects.isNull(closeDTO.getId())
+ ||StringUtils.isBlank(closeDTO.getReason())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
UnionApply unionApply = unionApplyMapper.selectById(closeDTO.getId());
@@ -446,8 +460,6 @@
info = info.replace("${param}", closeDTO.getReason());
ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), info
,unionApply.getId(),applyLogType.getKey(),null, null);
- applyLogMapper.insert(log);
-
applyLogMapper.insert(log);
}
@@ -728,7 +740,7 @@
.set(UnionApply::getCurrentFee,sumCurrFee)
.eq(UnionApply::getId,unionApply.getId())
);
- //鍚堝苟鍗� 鎬讳繚鍗�
+ //鍚堝苟鍗� 鏂囦欢
if(StringUtils.isNotBlank(unionApplyBXDDTO.getFileUrl())){
Multifile multifile = new Multifile();
multifile.setIsdeleted(Constants.ZERO);
--
Gitblit v1.9.3