From a9ca0823ab8f33ca85abebcf6ec4a8da235adb49 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 一月 2024 14:36:49 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 51 ++++++++++++++++++---------------------------------
1 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index af31cda..c6d87a5 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -83,8 +83,8 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey())
- ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey()))){
+ if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
@@ -123,8 +123,8 @@
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
-
- if(!(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.DEAL_ING.getKey()))){
+ if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
@@ -148,7 +148,7 @@
}
/**
- * 鐞嗚禂缁撴鎻愪氦
+ * 鐞嗚禂澶囨敞鏍囩
* @param param
* @return
*/
@@ -158,17 +158,15 @@
||StringUtils.isBlank( param.getCheckInfo()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
SettleClaims model = settleClaimsMapper.selectById(param.getId());
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- /*
- if(!(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.DEAL_ING.getKey())
- ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){
+ if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
-*/
+
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SettleClaims update = new SettleClaims();
update.setEditDate(new Date());
@@ -204,8 +202,8 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
//鍙楃悊涓拰宸茬‘璁よ祫鏂欏彲浠ヨ繘琛岀悊璧斿鐞�
- if(!(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.DEAL_ING.getKey())
- ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){
+ if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
@@ -218,6 +216,11 @@
update.setCheckUserId(user.getId());
update.setStatus(Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey());
update.setId(model.getId());
+ update.setYlClaimAccount(Constants.formatBigdecimal(param.getYlClaimAccount()));
+ update.setSwClaimAccount(Constants.formatBigdecimal(param.getSwClaimAccount()));
+ update.setWgClaimAccount(Constants.formatBigdecimal(param.getWgClaimAccount()));
+ update.setScClaimAccount(Constants.formatBigdecimal(param.getScClaimAccount()));
+ update.setClaimAccount(update.getYlClaimAccount().add(update.getSwClaimAccount()).add(update.getScClaimAccount()).add(update.getWgClaimAccount()));
settleClaimsMapper.updateById(update);
Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_FINISH;
@@ -239,17 +242,15 @@
||StringUtils.isBlank( param.getCheckInfo()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
SettleClaims model = settleClaimsMapper.selectById(param.getId());
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
//鍙楃悊涓拰宸茬‘璁よ祫鏂欏彲浠ヨ繘琛岀悊璧斿鐞�
- if(!(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.DEAL_ING.getKey())
- ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){
+ if( Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
-
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SettleClaims update = new SettleClaims();
update.setEditDate(new Date());
@@ -412,29 +413,13 @@
response.setContentType("application/octet-stream");
response.setHeader("eva-opera-type", "download");
response.setHeader("eva-download-filename", encodeFileName);
- packFilesToZip(fileList,response.getOutputStream());
+ Constants.packFilesToZip(fileList,response.getOutputStream());
} catch (IOException e) {
throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
}
}
- public static void packFilesToZip(List<File> files, ServletOutputStream os) throws IOException {
- try (ZipArchiveOutputStream zipOutputStream = new ZipArchiveOutputStream(os)) {
- for (File file : files) {
- ZipArchiveEntry entry = new ZipArchiveEntry(file.getName());
- zipOutputStream.putArchiveEntry(entry);
- try (FileInputStream fileInputStream = new FileInputStream(file)) {
- byte[] buffer = new byte[1024];
- int length;
- while ((length = fileInputStream.read(buffer)) > 0) {
- zipOutputStream.write(buffer, 0, length);
- }
- }
- zipOutputStream.closeArchiveEntry();
- }
- }
- }
@Override
public SettleClaims getSettleClaimsDetail(Integer id){
--
Gitblit v1.9.3