From 436085e172f88a619099055a17745ecfc2cbec6b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 一月 2024 19:58:40 +0800
Subject: [PATCH] 开发业务接口
---
server/platform/src/main/java/com/doumee/PlatformApplication.java | 2 ++
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 14 +++++++++-----
company/src/components/business/OperaCompanyWindow.vue | 4 ++--
company/src/views/business/company.vue | 17 ++++++++++++++++-
company/src/views/business/insuranceApply.vue | 2 +-
5 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/company/src/components/business/OperaCompanyWindow.vue b/company/src/components/business/OperaCompanyWindow.vue
index 44c6e69..4b94d21 100644
--- a/company/src/components/business/OperaCompanyWindow.vue
+++ b/company/src/components/business/OperaCompanyWindow.vue
@@ -13,7 +13,7 @@
<el-form-item label="缁熶竴淇＄敤浠ｇ爜" prop="code">
<el-input v-model="form.code" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="娉曚汉濮撳悕" prop="legalName" v-if="form.type !== 1">
+ <el-form-item label="娉曚汉濮撳悕" prop="legalName">
<el-input v-model="form.legalName" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
<el-form-item label="缁戝畾鎵嬫満鍙�" prop="phone" v-if="form.type !== 1">
@@ -29,7 +29,7 @@
<el-form-item label="鍏徃璐﹀彿" prop="username" v-if="form.type !== 1">
<el-input v-model="form.username" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="璁よ瘉閭" prop="email" v-if="form.type !== 1">
+ <el-form-item label="璁よ瘉閭" prop="email" >
<el-input v-model="form.email" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
<el-form-item label="绾崇◣浜鸿瘑鍒彿" prop="taxCode">
diff --git a/company/src/views/business/company.vue b/company/src/views/business/company.vue
index 51341f7..8b37f4d 100644
--- a/company/src/views/business/company.vue
+++ b/company/src/views/business/company.vue
@@ -42,6 +42,14 @@
</el-switch>
</template>
</el-table-column>
+ <el-table-column label="鐢靛瓙绛捐璇佺姸鎬�" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.signStatus === 0">寰呰璇�</span>
+ <span v-if="row.signStatus === 1">璁よ瘉涓�</span>
+ <span v-if="row.signStatus === 2">璁よ瘉澶辫触</span>
+ <span v-if="row.signStatus === 3">璁よ瘉閫氳繃</span>
+ </template>
+ </el-table-column>
<el-table-column
v-if="containPermissions(['business:company:update', 'business:company:delete'])"
label="鎿嶄綔"
@@ -122,10 +130,17 @@
}
form.file.imgurl = res.businessImg.fileurl
form.file.imgurlfull = res.businessImg.fileurlFull
+ if( res.idcardImgList ==null){
+ res.idcardImgList = new Array();
+ }
+ if( res.idcardImgList && res.idcardImgList.length>0){
form.file1.imgurl = res.idcardImgList[0].fileurl
form.file1.imgurlfull = res.idcardImgList[0].fileurlFull
- form.file2.imgurl = res.idcardImgList[1].fileurl
+ }
+ if( res.idcardImgList && res.idcardImgList.length>1){
+ form.file2.imgurl = res.idcardImgList[1].fileurl
form.file2.imgurlfull = res.idcardImgList[1].fileurlFull
+ }
form.file3.imgurl = res.signImg.fileurl
form.file3.imgurlfull = res.signImg.fileurlFull
this.$refs.operaCompanyWindow.open('缂栬緫浼佷笟', form)
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 5c4cae4..1f2ea6d 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -2,7 +2,7 @@
<TableLayout :permissions="['business:insuranceapply:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="淇濆崟鐘舵��" prop="status">
+ <el-form-item label="淇濆崟鐘舵��" prop="statusCollect">
<el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
<el-option label="寰呭鎵�" value="0"></el-option>
<el-option label="寰呭嚭鍗�" value="1"></el-option>
diff --git a/server/platform/src/main/java/com/doumee/PlatformApplication.java b/server/platform/src/main/java/com/doumee/PlatformApplication.java
index 9c7a170..9984c21 100644
--- a/server/platform/src/main/java/com/doumee/PlatformApplication.java
+++ b/server/platform/src/main/java/com/doumee/PlatformApplication.java
@@ -5,6 +5,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.annotation.EnableAsync;
/**
* 鍚姩绫�
@@ -12,6 +13,7 @@
* @date 2023/02/14 11:14
*/
@Slf4j
+@EnableAsync
@SpringBootApplication
@MapperScan("com.doumee.dao")
public class PlatformApplication {
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index dfb4741..afbfe4c 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -318,13 +318,16 @@
company.setSignId("");
}
if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null){
+ boolean isNew = false;
for(Multifile f : company.getIdcardImgList()){
if(f.getId() !=null){
continue;
}
+ isNew = true;
multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
}
- objList.add(Constants.MultiFile.COM_IDCARD_IMG.getKey());
+ if(isNew)
+ objList.add(Constants.MultiFile.COM_IDCARD_IMG.getKey());
}
if(objList.size()>0){
multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
@@ -426,9 +429,8 @@
}
private void isValidUpdateParam(Company company) {
if( StringUtils.isBlank(company.getName())
- ||StringUtils.isBlank(company.getUsername())
+// ||StringUtils.isBlank(company.getUsername())
||StringUtils.isBlank(company.getCode())
- ||StringUtils.isBlank(company.getCaptche())
||StringUtils.isBlank(company.getLegalName())
||StringUtils.isBlank(company.getEmail()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -465,7 +467,6 @@
dealFileDataForUpdate(company);
Company update = new Company();
- update.setIsdeleted(company.getId());
update.setName(company.getName());
update.setCode(company.getCode());
update.setEditDate(new Date());
@@ -476,6 +477,8 @@
update.setTaxCode(company.getTaxCode());
update.setTaxBank(company.getTaxBank());
update.setEmail(company.getEmail());
+ update.setId(model.getId());
+ update.setLegalName(company.getLegalName());
update.setInvoiceAddr(company.getInvoiceAddr());
update.setSignIdStatus(company.getSignIdStatus());
update.setInvoiceEmail(company.getInvoiceEmail());
@@ -486,7 +489,7 @@
//濡傛灉閭鍙戠敓鏀瑰彉
update.setSignStatus(Constants.ZERO);
}
- companyMapper.updateById(company);
+ companyMapper.updateById(update);
company.setCreator(update.getEditor());
company.setCreateDate(update.getEditDate());
if(StringUtils.isNotBlank(company.getUsername())){
@@ -564,6 +567,7 @@
* public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
*/
@Override
+ @Async
public void startSignAuth(Integer id){
Company company = companyMapper.selectById(id);
Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
--
Gitblit v1.9.3