From 747ec8978ae04489f368ab699a74ed7b831d0731 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 29 五月 2025 11:41:57 +0800
Subject: [PATCH] 提交一把订单
---
company/src/components/business/OpearaCaseEntryWindow.vue | 4 +-
server/service/src/main/java/com/doumee/core/utils/Constants.java | 28 ++++++++-----
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 25 +++++++++++-
company/.env.developmentCom | 2
company/src/views/business/caseEntry.vue | 2
company/src/views/business/settleClaims.vue | 6 +-
company/src/views/index.vue | 42 +++++++++++++++------
company/src/views/enterprise/settleClaimsCom.vue | 6 +-
company/.env.development | 2
9 files changed, 81 insertions(+), 36 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index 1156800..9232226 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -12,4 +12,4 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
# 浠诲悍
-VUE_APP_API = 'http://192.168.0.131:10030/'
+VUE_APP_API = 'http://localhost:10030/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index e72a817..5fe1e0c 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -9,6 +9,6 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
-VUE_APP_API = 'http://192.168.0.131:10031/'
+VUE_APP_API = 'http://localhost:10031/'
# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/src/components/business/OpearaCaseEntryWindow.vue b/company/src/components/business/OpearaCaseEntryWindow.vue
index acd53ae..785aabb 100644
--- a/company/src/components/business/OpearaCaseEntryWindow.vue
+++ b/company/src/components/business/OpearaCaseEntryWindow.vue
@@ -11,8 +11,8 @@
<div class="box_item">
<div class="box_item_title">
<span>鍑洪櫓浜轰俊鎭�</span>
- <el-select v-model="ruleForm.status" style="width: 100px;" placeholder="璇烽�夋嫨">
- <el-option label="寰呯珛妗�" :value="2"></el-option>
+ <el-select v-model="ruleForm.status" style="width: 100px;" placeholder="璇烽�夋嫨妗堜欢鐘舵��">
+ <el-option label="宸叉姤妗�" :value="1"></el-option>
<el-option label="宸查��鍥�" :value="4"></el-option>
<el-option label="寰呭彈鐞�" :value="5"></el-option>
<el-option label="宸叉嫆缁�" :value="6"></el-option>
diff --git a/company/src/views/business/caseEntry.vue b/company/src/views/business/caseEntry.vue
index e2941a1..3b83398 100644
--- a/company/src/views/business/caseEntry.vue
+++ b/company/src/views/business/caseEntry.vue
@@ -46,7 +46,7 @@
</el-form-item>
<el-form-item label="妗堜欢鐘舵��" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
- <el-option label="寰呯珛妗�" :value="2"></el-option>
+ <el-option label="宸叉姤妗�" :value="1"></el-option>
<el-option label="宸查��鍥�" :value="4"></el-option>
<el-option label="寰呭彈鐞�" :value="5"></el-option>
<el-option label="宸叉嫆缁�" :value="6"></el-option>
diff --git a/company/src/views/business/settleClaims.vue b/company/src/views/business/settleClaims.vue
index 0230f8b..0c178d9 100644
--- a/company/src/views/business/settleClaims.vue
+++ b/company/src/views/business/settleClaims.vue
@@ -32,10 +32,10 @@
<el-select v-model="searchForm.status" clearable placeholder="璇烽�夋嫨" @change="search">
<el-option label="鏆傚瓨涓�" value="0"></el-option>
<el-option label="宸叉姤妗�" value="1"></el-option>
- <el-option label="寰呯珛妗�" value="2"></el-option>
+<!-- <el-option label="寰呯珛妗�" value="2"></el-option>-->
<el-option label="宸茬珛妗�" value="3"></el-option>
<el-option label="绔嬫閫�鍥�" value="4"></el-option>
- <el-option label="寰呭彈鐞�" value="5"></el-option>
+<!-- <el-option label="寰呭彈鐞�" value="5"></el-option>-->
<el-option label="鎷掔粷鍙楃悊" value="6"></el-option>
<el-option label="鍟嗚寰呭鎵�" value="7"></el-option>
<el-option label="鍟嗚瀹℃壒鎷掔粷" value="8"></el-option>
@@ -104,7 +104,7 @@
<template slot-scope="{row}">
<el-button
type="text"
- @click="$refs.operaSettleClaimsWindow.open('鎶ユ璇︽儏', row.id)"
+ @click="$refs.operaSettleClaimsWindow.open('鎶ユ鐞嗚禂璇︽儏', row.id)"
v-if="row.status !== 0">
鏌ョ湅璇︽儏
</el-button>
diff --git a/company/src/views/enterprise/settleClaimsCom.vue b/company/src/views/enterprise/settleClaimsCom.vue
index d0e8931..e310274 100644
--- a/company/src/views/enterprise/settleClaimsCom.vue
+++ b/company/src/views/enterprise/settleClaimsCom.vue
@@ -31,10 +31,10 @@
<el-select v-model="searchForm.status" clearable placeholder="璇烽�夋嫨" style="width: 150px" @change="search">
<el-option label="鏆傚瓨涓�" value="0"></el-option>
<el-option label="宸叉姤妗�" value="1"></el-option>
- <el-option label="寰呯珛妗�" value="2"></el-option>
+<!-- <el-option label="寰呯珛妗�" value="2"></el-option>-->
<el-option label="宸茬珛妗�" value="3"></el-option>
<el-option label="绔嬫閫�鍥�" value="4"></el-option>
- <el-option label="寰呭彈鐞�" value="5"></el-option>
+<!-- <el-option label="寰呭彈鐞�" value="5"></el-option>-->
<el-option label="鎷掔粷鍙楃悊" value="6"></el-option>
<el-option label="鍟嗚寰呭鎵�" value="7"></el-option>
<el-option label="鍟嗚瀹℃壒鎷掔粷" value="8"></el-option>
@@ -108,7 +108,7 @@
<template slot-scope="{row}">
<el-button
type="text"
- @click="$refs.operaSettleClaimsWindow.open('鎶ユ璇︽儏', row.id)"
+ @click="$refs.operaSettleClaimsWindow.open('鎶ユ鐞嗚禂璇︽儏', row.id)"
v-if="row.status !== 0">
鏌ョ湅璇︽儏
</el-button>
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index 80fc354..3644f46 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -26,7 +26,7 @@
<el-tabs v-model="activeName" @tab-click="handleClick" >
<el-tab-pane v-for="a in tabs" :key="a.path" :name="a.name" >
<span slot="label" title="鐐瑰嚮鍒锋柊"> {{a.label }}
- <el-badge v-if="(a.name==0?totalPage0:(a.name==1?totalPage1:totalPage2)) >0" :value="(a.name==0?totalPage0:(a.name==1?totalPage1:totalPage2)) " class="item"></el-badge>
+ <el-badge v-if="getTotalNoticeCount(a) >0" :value="getTotalNoticeCount(a) " class="item"></el-badge>
</span>
</el-tab-pane>
</el-tabs>
@@ -347,6 +347,23 @@
this.setLoadTimer()
},
methods: {
+ getTotalNoticeCount(a){
+ if(a.name == 0){
+ return this.totalPage0;
+ } else if(a.name == 1){
+ return this.totalPage1;
+ } else if(a.name ==2){
+ return this.totalPage2;
+ } else if(a.name ==6){
+ return this.totalPage6;
+ } else if(a.name ==7){
+ return this.totalPage7;
+ } else if(a.name ==8){
+ return this.totalPage8;
+ }
+
+ return 0;
+ },
detail (obj) {
if (obj.objType === 0) {
getDetail(obj.objId).then(res => {
@@ -372,16 +389,17 @@
} else if (obj.objType === 4) {
this.$refs.OperaTaxesWindow.open('寮�绁ㄧ敵璇疯鎯�', { id: obj.objId })
} else if (obj.objType === 5) {
- deleById(obj.id)
- .then(res => {
- this.tableData2.forEach((item, index) => {
- if (item.id === obj.id) {
- this.tableData2.splice(index, 1)
- this.totalPage2 = this.totalPage2 - 1
- }
- })
- this.$refs.operaSettleClaimsWindow.open('鐞嗚禂璇︽儏', { id: obj.objId })
- })
+ // deleById(obj.id)
+ // .then(res => {
+ // this.tableData2.forEach((item, index) => {
+ // if (item.id === obj.id) {
+ // this.tableData2.splice(index, 1)
+ // this.totalPage2 = this.totalPage2 - 1
+ // }
+ // })
+ this.$refs.operaSettleClaimsWindow.open('鎶ユ鐞嗚禂璇︽儏',obj.objId)
+ // this.$refs.operaSettleClaimsWindow.open('鐞嗚禂璇︽儏', { id: obj.objId })
+ // })
}
},
setLoadTimer () {
@@ -455,7 +473,7 @@
// this.handleCurrentChange1(0);
}
if (pemissons.includes('business:notice:settle')) {
- this.tabs.push({ name: '2', label: '鐞嗚禂鎻愰啋' })
+ this.tabs.push({ name: '2', label: '鎶ユ鐞嗚禂' })
// this.handleCurrentChange2(0);
}
if (this.userInfo.type === 1) {
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 fbc5eea..73cf562 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
@@ -1632,10 +1632,11 @@
CHANGE_FACTORY(2, "鍛樺伐鎹㈠巶鐢宠","淇濋櫓鏂规"),
DISPATCH_UNIT(3, "娲鹃仯鍗曚綅鐢宠","娲鹃仯鍗曚綅"),
TAXES(4, "寮�绁ㄧ敵璇�","寮�绁ㄩ噾棰�"),
- SETTLE_CLAIMS(5, "鎶ユ鐞嗚禂","鎶ユ浜�"),
+ SETTLE_CLAIMS(5, "鐞嗚禂鎻愰啋","鎶ユ淇℃伅"),
CONTRACT(6, "鍚堝悓绛剧讲","鍚堝悓绛剧讲"),
SOLUTIONS(7, "鏂规绛剧讲","鏂规绛剧讲"),
COMPANY_USER_APPLY(8, "闆嗗洟鐢宠","闆嗗洟鐢宠"),
+ SETTLE_CLAIMS_APPLY_ADMIN(9, "鎶ユ鐞嗚禂","寰呯珛妗�"),
;
// 鎴愬憳鍙橀噺
private int key;
@@ -1690,19 +1691,24 @@
public enum NoticeType {
- ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�","寰呯缃�","寰呯缃�"),
- ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸茬粨妗�","",""),
- TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","","","",""),
- THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","","","",""),
- FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�","",""),
- FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","","","",""),
+ ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","寰呭鏍�","寰呯缃�","寰呯缃�"),
+ ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸查��鍥�","",""),
+ TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","","宸茬珛妗�","",""),
+ THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","","宸插彈鐞嗭紝闇�瑕佽ˉ鍏呮潗鏂�","",""),
+ FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉嫆缁�","",""),
+ FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","","鍟嗚寰呴瀵煎鎵�","",""),
//缁繚閫氱煡
- SIX(6, "","","","","","","",""),
+ SIX(6, "","","","","","鍟嗚瀹℃壒鎷掔粷","",""),
//鍟嗘埛绔� 濮旀墭淇� - 鎶曚繚寰呭鏍� 鍔犲噺淇� 鎹㈠巶 寰呭鏍�
- SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","","","",""),
+ SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","","鍟嗚瀹℃壒鎷掔粷閫氱煡","",""),
//寰呭瀹�
- EIGHT(8, "寰呭鏍�","","","","","","",""),
- NINE(9, "","","","","","","",""),
+ EIGHT(8, "寰呭鏍�","","","","","寰呯悊绠�","",""),
+ NINE(9, "","","","","","寰呮牳璧�","",""),
+ TEN(10, "","","","","","寰呮牳璧旂‘璁�","",""),
+ ELEVEN(11, "","","","","","璧斾粯閲戦宸插彉鏇�","",""),
+ TWELVE(12, "","","","","","寰呯粨妗�","",""),
+ THIRTEEN(13, "","","","","","宸茬粨妗�","",""),
+ FOURTEEN(14, "","","","","","宸叉挙妗�","",""),
;
// 鎴愬憳鍙橀噺
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 85c3211..81a7198 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
@@ -67,6 +67,8 @@
@Autowired
private SettleClaimsMapper settleClaimsMapper;
@Autowired
+ private MemberMapper memberMapper;
+ @Autowired
private SettleClaimsExtMapper settleClaimsExtMapper;
@Autowired
@@ -1347,10 +1349,17 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
}
+ Member member =memberMapper.selectById(settleClaimsDTO.getMemberId());
+ if(member == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍑洪櫓浜轰俊鎭笉姝ｇ‘锛�");
+ }
SettleClaims settleClaims = new SettleClaims();
BeanUtils.copyProperties(settleClaimsDTO,settleClaims);
settleClaims.setReportNumStatus(Constants.ZERO);
+ settleClaims.setCompanyId(loginUserInfo.getCompanyId());
settleClaims.setOrigin(Constants.ZERO);
+ settleClaims.setMemberName(member.getName());
+ settleClaims.setCreateDate(new Date());
if(Constants.equalsInteger(settleClaimsDTO.getSaveType(),Constants.ONE)&&StringUtils.isBlank(settleClaims.getCode())){
Long nextCode = settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda().ne(SettleClaims::getStatus,Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())
.eq(SettleClaims::getOrigin,Constants.ZERO) .like(SettleClaims::getCreateDate,DateUtil.getDate(new Date(),"yyyy-MM-dd"))
@@ -1370,9 +1379,7 @@
}
settleClaimsMapper.updateById(settleClaims);
}else{
- settleClaims.setCreateDate(new Date());
settleClaims.setIsdeleted(Constants.ZERO);
- settleClaims.setCompanyId(loginUserInfo.getCompanyId());
settleClaims.setStatus(Constants.equalsInteger(settleClaimsDTO.getSaveType(),Constants.ONE)?
Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey():Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey());
if(Constants.equalsInteger(settleClaimsDTO.getSaveType(),Constants.ONE)){
@@ -1390,9 +1397,23 @@
this.saveSettleClaimsLog(settleClaims,Constants.SettleClaimsLogType.PLATFORM_REGISTER,null,Constants.SettleClaimsStatus.CONFIRM_INFORMATION);
}
}
+ if( Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()) ||
+ Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())){
+ //-濡傛灉鏄緟绔嬫鎴栬�呭凡绔嬫寰呭鏍革紝鍙戝緟鍔為�氱煡-------------
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,settleClaims.getId()));
+ Notices notices = new Notices(noticeObjectType,Constants.ZERO,settleClaims.getId(),getNoticeConttent(settleClaims),
+ settleClaims.getCompanyId(),
+ Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey())?Constants.NoticeType.ZERO:Constants.NoticeType.TWO);
+ noticesMapper.insert(notices);
+ }
return settleClaims.getId();
}
+ private String getNoticeConttent(SettleClaims settleClaims) {
+ return "鎶ユ鍙凤細"+StringUtils.defaultString(settleClaims.getCode(),"")+" 鍑洪櫓浜猴細"+StringUtils.defaultString(settleClaims.getMemberName(),"");
+ }
+
public void saveRisk(SettleClaims settleClaims, SettleClaimsDTO settleClaimsDTO, SystemDictDataServiceImpl systemDictDataService){
//鏍规嵁淇濆崟淇℃伅 鏌ヨ鍑轰富鏂规
InsuranceApply insuranceApply = insuranceApplyMapper.selectById(settleClaims.getInsuranceApplyId());
--
Gitblit v1.9.3