From 4c179612568430d4d9ebdc41d520c96e0c6ecded Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:18:51 +0800
Subject: [PATCH] 提交一把
---
server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java | 3 -
company/src/views/business/unionApply.vue | 2
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 2
company/src/components/business/detailsEntrustedInsurance.vue | 2
company/src/assets/style/style.scss | 2
server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java | 10 +++++
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 43 ++++++++++++++++++---
7 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/company/src/assets/style/style.scss b/company/src/assets/style/style.scss
index 535156a..0b14091 100644
--- a/company/src/assets/style/style.scss
+++ b/company/src/assets/style/style.scss
@@ -83,7 +83,7 @@
.change-status0,.change-status1,.change-status2,
.settle-status0,.settle-status2,.settle-status3,
.tax-status0,
-.union-apply-status0,.union-apply-status1,.union-apply-status2
+.union-apply-status0,.union-apply-status1,.union-apply-status2,
.du-status0 {
color: #216EEE !important;
}
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index b3c6a68..80f6200 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -512,7 +512,7 @@
}
this.isWorking = true
if(this.form.type===0){
- getSignTBQRSLink(this.form).then(res => {
+ getSignLink(this.form).then(res => {
setTimeout(() => {
this.visiblePhone=false
window.open(res)
diff --git a/company/src/views/business/unionApply.vue b/company/src/views/business/unionApply.vue
index 3b778db..48fd87f 100644
--- a/company/src/views/business/unionApply.vue
+++ b/company/src/views/business/unionApply.vue
@@ -54,7 +54,7 @@
</el-table-column>
<el-table-column prop="statusInfo" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span :class="'union-apply-status'+row.status" v-if="row.status==0">{{ row.statusInfo}}</span>
+ <span :class="'union-apply-status'+row.status" >{{ row.statusInfo}}</span>
</template>
</el-table-column>
<el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
index bf708e9..dbdf314 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
@@ -144,4 +144,14 @@
@ApiModelProperty(value = "浜哄憳淇℃伅")
@TableField(exist = false)
private List<ApplyDetail> applyDetailList;
+
+ @ApiModelProperty(value = "鎶曚繚鍗曞璞�")
+ @TableField(exist = false)
+ private Multifile toubaodanFile;
+ @ApiModelProperty(value = "鎶曚繚鍗曪紙宸茬缃诧級瀵硅薄")
+ @TableField(exist = false)
+ private Multifile toubaodanSignedFile;
+ @ApiModelProperty(value = "淇濋櫓鍗曞璞�")
+ @TableField(exist = false)
+ private Multifile baoxiandanFile;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index 20e2309..7ab518f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -765,7 +765,7 @@
f.setCreator(model.getCreator());
f.setObjId(update.getId());
f.setCreateDate(update.getEditDate());
- f.setObjType(Constants.MultiFile.HBD_BD_APPLY_PDF.getKey());
+ f.setObjType(Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey());
f.setType(Constants.TWO);
f.setFileurl(fileurl);
f.setFileurlFull(fullUrl);
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 1f311eb..b37246d 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
@@ -36,10 +36,7 @@
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -319,6 +316,8 @@
}
initStatusInfo(unionApply);
+ //鏌ヨ闄勪欢鏁版嵁
+ initImgData(unionApply);
//鏌ヨ鎿嶄綔璁板綍
List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
new MPJLambdaWrapper<ApplyLog>()
@@ -333,10 +332,41 @@
.orderByAsc(ApplyLog::getCreateDate)
);
unionApply.setApplyLogList(applyLogList);
+
return unionApply;
}
+ private void initImgData(UnionApply model) {
+ List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId, model.getId())
+ .in(Multifile::getObjType, Arrays.asList(new Integer[]{
+ Constants.MultiFile.HBD_BD_APPLY_PDF.getKey()
+ ,Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey()
+ ,Constants.MultiFile.WTB_BD_DONE_PDF.getKey() }))
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .orderByAsc(Multifile::getId));
+ if(multifiles!=null){
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+ for(Multifile f : multifiles){
+ if(StringUtils.isBlank(f.getFileurl())){
+ continue;
+ }
+ f.setFileurlFull(path+f.getFileurl());
+ if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.HBD_BD_APPLY_PDF.getKey())){
+ //绛剧讲鍓嶇殑鎶曚繚鍗�
+ model.setToubaodanFile(f);
+ }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey())){
+ //绛剧讲鍚庣殑鎶曚繚鍗�
+ model.setToubaodanSignedFile(f);
+ }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.WTB_BD_DONE_PDF.getKey())){
+ //鏈�绲備繚闄╁崟
+ model.setBaoxiandanFile(f);
+ }
+ }
+ }
+ }
@Override
@@ -508,13 +538,14 @@
if(Objects.isNull(unionApply)||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+ unionApply.setStatus(Constants.formatIntegerNum(unionApply.getStatus()));
if(!unionApply.getCompanyId().equals(user.getCompanyId())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒");
}
if(unionApply.getStatus().equals(Constants.UnionApplyStatus.FINISH.getKey())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡瀹岀粨锛屾偍鏃犳硶杩涜璇ユ搷浣滐紒");
}
- if(unionApply.getStatus().equals(Constants.UnionApplyStatus.MERGE.getKey())){
+ if(!unionApply.getStatus().equals(Constants.UnionApplyStatus.MERGE.getKey())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡娴佽浆锛屾偍鏃犳硶杩涜璇ユ搷浣滐紒");
}
@@ -566,7 +597,7 @@
multifile.setCreateDate(new Date());
multifile.setObjId(uploadMultifileDTO.getBusinessId());
multifile.setCreateDate(new Date());
- multifile.setObjType(Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey());
+ multifile.setObjType(Constants.MultiFile.HBD_BD_APPLY_PDF.getKey());
multifile.setType(Constants.TWO);
multifile.setFileurl(uploadMultifileDTO.getFileurl());
multifile.setName(uploadMultifileDTO.getName());
diff --git a/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java b/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
index f13a251..a3b8b03 100644
--- a/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
@@ -126,8 +126,7 @@
@PostMapping("/getSignLink")
@RequiresPermissions("business:unionapply:query")
public ApiResponse getSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
- unionApplyService.getSignLink(smsCheckDTO);
- return ApiResponse.success(null);
+ return ApiResponse.success( unionApplyService.getSignLink(smsCheckDTO));
}
--
Gitblit v1.9.3