From 0afc0d40e019c168d47a79e90bdff2aba29ad553 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 一月 2024 16:47:10 +0800
Subject: [PATCH] 开发业务接口
---
company/src/components/business/OperaInsuranceApplyWindow.vue | 12 ++++++------
server/service/src/main/java/com/doumee/core/utils/Constants.java | 4 ++--
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 23 ++++++++++++++++-------
3 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 08437d0..540fa80 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -16,12 +16,12 @@
</div>
<div class="desc_item_label_right">
<el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�')">瀵煎嚭璇﹀崟</el-button>
- <el-button type="primary" @click="visible2 = true">涓婁紶鎶曚繚鍗�</el-button>
- <el-button type="primary" @click="visible3 = true">涓婁紶淇濋櫓鍗�</el-button>
- <el-button type="primary" @click="visible5 = true">椹冲洖閫�鍥炵敵璇�</el-button>
- <el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�')">鎶曚繚瀹℃牳</el-button>
- <el-button type="danger" @click="visible1 = true">閫�鍥炴姇淇�</el-button>
- <el-button type="danger" @click="visible4 = true">淇敼淇濋櫓鍗�</el-button>
+ <el-button v-if="model.status == 0 " type="primary" @click="visible2 = true">涓婁紶鎶曚繚鍗�</el-button>
+ <el-button v-if="model.status == 3 " type="primary" @click="visible3 = true">涓婁紶淇濋櫓鍗�</el-button>
+ <el-button v-if="model.status == 6 || model.status == 7|| model.status == 8" type="primary" @click="visible5 = true">澶勭悊閫�鍥炵敵璇�</el-button>
+ <el-button v-if="model.status == 0 " type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�')">鎶曚繚瀹℃牳</el-button>
+ <el-button v-if="model.status != 5 " type="danger" @click="visible1 = true">閫�鍥炴姇淇�</el-button>
+ <el-button v-if="model.status == 5 " type="danger" @click="visible4 = true">淇敼淇濋櫓鍗�</el-button>
</div>
</div>
<div class="desc_item_from">
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 4a6198d..89be6c5 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -732,9 +732,9 @@
CA_PALTFORM_REFUSE_APPLY(20, "椹冲洖閫�鍥炵敵璇�",""),
CA_PALTFORM_EDIT_PIDAN(21, "淇敼鎵瑰崟","淇敼鍘熷洜锛�${param}"),
PALTFORM_EDIT_BD(22, "淇敼淇濆崟","淇敼鍘熷洜锛�${param}"),
+ CA_JIAJIAN_APPLY_SIGN(23, "鍔犲噺淇濈敵璇蜂紒涓氱绔�",""),
CA_CHANGUNIT_APPLY_SIGN(24, "鎹㈡垚鐢宠浼佷笟绛剧珷",""),
- CA_JIAJIAN_APPLY_SIGN(23, "鍔犲噺淇濈敵璇蜂紒涓氱绔�",""),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -803,7 +803,7 @@
COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "浼佷笟鐢宠閫�鍥�(寰呯绔�)","鎻愪氦鎰忚锛�${param}",5),
COMPANY_BACK_APPLY_SIGNATURE(8, "浼佷笟鐢宠閫�鍥�(宸茬绔�)","鎻愪氦鎰忚锛�${param}",5),
CLOSE(9, "璁㈠崟鍏抽棴","",6),
- PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","",1),
+ PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",1),
;
// 鎴愬憳鍙橀噺
private String name;
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 ae88abb..6f15c4d 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
@@ -100,7 +100,7 @@
InsuranceApply update = new InsuranceApply();
update.setEditDate(new Date());
update.setEditor(user.getId());
- update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());
+ update.setStatus(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey());
update.setCheckDate(update.getEditDate());
update.setCheckInfo(insuranceApply.getCheckInfo());
update.setCheckUserId(user.getId());
@@ -530,14 +530,14 @@
}
/**
- * 瀹℃牳閫氳繃
+ * 瀹℃牳閫氳繃鎴栬�呬笉閫氳繃
* @param insuranceApply
* @return
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer check(InsuranceApply insuranceApply) {
- if(insuranceApply.getId() == null ||StringUtils.isBlank(insuranceApply.getCheckInfo())){
+ if(insuranceApply.getId() == null || StringUtils.isBlank(insuranceApply.getCheckInfo())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId());
@@ -548,19 +548,28 @@
if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
+
+ Constants.ApplyLogType applyLogType = null;
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
InsuranceApply update = new InsuranceApply();
update.setEditDate(new Date());
update.setEditor(user.getId());
- update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
update.setCheckDate(update.getEditDate());
update.setCheckInfo(insuranceApply.getCheckInfo());
update.setCheckUserId(user.getId());
update.setId(model.getId());
+ if(insuranceApply.getDealBackApply() ==1){
+ //濡傛灉鏄笉閫氳繃
+ applyLogType = Constants.ApplyLogType.PLATFORM_RETURN ;
+ update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());
+ }else{
+ applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS;
+ update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
+ }
insuranceApplyMapper.updateById(update);
-
- Constants.ApplyLogType applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS;
- ApplyLog log = new ApplyLog(update,applyLogType.getName(),null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+ String info =applyLogType.getInfo();
+ info = info.replace("${param}", update.getCheckInfo());
+ ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
return 1;
--
Gitblit v1.9.3