From ff95e73d12418ee4b1e400eaceac3d4d623f85b6 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 29 三月 2024 18:44:04 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OperaWtbApplyShopWindow.vue | 12 ++++++------
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 13 +++++++++++--
server/service/src/main/java/com/doumee/service/business/third/SignService.java | 5 ++---
server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java | 7 +++++++
4 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 9273804..ff5a3a5 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -618,7 +618,7 @@
}).catch(err => {
this.$tip.apiFailed(err)
})
- } else if (flag === 1) {
+ } else if (this.form.type === 1) {
getMemberListOnlineSignLink(this.form).then(res => {
setTimeout(() => {
this.visiblePhone=false
@@ -627,7 +627,7 @@
}).catch(err => {
this.$tip.apiFailed(err)
})
- } else if (flag === 2) {
+ } else if (this.form.type === 2) {
getSignLink(this.dataId).then(res => {
setTimeout(() => {
this.visiblePhone=false
@@ -866,13 +866,13 @@
}
},
viewFanganshu () {
- if (this.model.baoxiandanFile && this.model.baoxiandanFile.fileurlFull) {
- window.open(this.model.baoxiandanFile.fileurlFull)
+ if (this.model.fanganFile && this.model.fanganFile.fileurlFull) {
+ window.open(this.model.fanganFile.fileurlFull)
}
},
viewShenqingdan () {
- if (this.model.baoxiandanFile && this.model.baoxiandanFile.fileurlFull) {
- window.open(this.model.baoxiandanFile.fileurlFull)
+ if (this.model.shenqingdanFile && this.model.shenqingdanFile.fileurlFull) {
+ window.open(this.model.shenqingdanFile.fileurlFull)
}
},
handleSizeChange (val) {
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 3009e5b..3dec0e7 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -195,6 +195,13 @@
@TableField(exist = false)
private Multifile baoxiandanFile;
+ @ApiModelProperty(value = "鐢宠鍗曞璞�")
+ @TableField(exist = false)
+ private Multifile shenqingdanFile;
+ @ApiModelProperty(value = "绛剧讲鍚庢柟妗堢‘璁や功瀵硅薄")
+ @TableField(exist = false)
+ private Multifile fanganFile;
+
@ApiModelProperty(value = "鏃ュ織璁板綍")
@TableField(exist = false)
private List<ApplyLog> applyLogList;
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 ab2be92..7c2d6e4 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
@@ -1954,11 +1954,14 @@
private void initImgData(InsuranceApply model) {
List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
- .eq(Multifile::getObjId,Constants.equalsInteger(model.getSolutionType(),Constants.ZERO)? model.getId():model.getUnionApplyId())
+ .eq(Multifile::getObjId, model.getId())
.in(Multifile::getObjType,Arrays.asList(new Integer[]{Constants.MultiFile.BD_APPLY_PDF.getKey()
,Constants.MultiFile.BD_SIGNED_PDF.getKey()
+ ,Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey()
+ ,Constants.MultiFile.MEMBER_LIST_LATTER.getKey()
,Constants.MultiFile.BD_DONE_PDF.getKey()}))
- .eq(Multifile::getIsdeleted,Constants.ZERO));
+ .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();
@@ -1976,6 +1979,12 @@
}else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.BD_DONE_PDF.getKey())){
//鏈�绲備繚闄╁崟
model.setBaoxiandanFile(f);
+ }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.MEMBER_LIST_LATTER.getKey())){
+ //鐢宠鍗�
+ model.setShenqingdanFile(f);
+ }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey())){
+ //绛剧讲鍚庣‘璁や功
+ model.setFanganFile(f);
}
// if(model.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
diff --git a/server/service/src/main/java/com/doumee/service/business/third/SignService.java b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
index 73596b0..785b3be 100644
--- a/server/service/src/main/java/com/doumee/service/business/third/SignService.java
+++ b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
@@ -304,7 +304,6 @@
/**
* 鍙戣捣绛剧害
* @param name
- * @param fileUrl
* @param file
* @param creditCoe
* @param email
@@ -318,7 +317,7 @@
params.put("serverCa",1); //浣跨敤浜戣瘉涔�
params.put("file",new File(file));
params.put("dealType",5); //鎸囧畾鍚堝悓鏂囦欢绛剧讲鏂瑰紡 5 涓洪儴鍒嗚嚜鍔ㄧ
- params.put("positionType",2); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
+ params.put("positionType",0); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
params.put("fileType",0);
params.put("needQifengSign",1);
params.put("notifyUrl",notifyUrl);
@@ -330,7 +329,7 @@
sReq.setEmail(email); //鍦ㄥ悰瀛愮娉ㄥ唽璁よ瘉鐨勯偖绠�
// sReq.setChapteJson("[{\"page\":0,\"chaptes\":[{\"offsetX\":0.12,\"offsetY\":0.23}]},{\"page\":1,\"chaptes\":[{\"offsetX\":0.45,\"offsetY\":0.67}]}]");
// sReq.setChapteJson(postionJson);
- sReq.setSearchKey(postionJson);
+// sReq.setSearchKey(postionJson);
sReq.setSignId(singId);
sReq.setSearchConvertExtend("{\"fixX\":-80,\"fixY\":-80}");
sReq.setNoNeedVerify(1);
--
Gitblit v1.9.3