From 35bd55ad951fe8c5fb997dfa7bd836ad53db96fe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 01 二月 2024 18:39:01 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 17 +++--
company/src/views/business/taxes.vue | 2
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 1
company/src/components/business/OperaInsuranceApplyCheckWindow.vue | 30 +++++-----
company/src/components/business/OperaTaxesWindow.vue | 106 ++++++++++++++++++-----------------
5 files changed, 79 insertions(+), 77 deletions(-)
diff --git a/company/src/components/business/OperaInsuranceApplyCheckWindow.vue b/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
index 3308baa..d0ceff9 100644
--- a/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
@@ -47,20 +47,20 @@
</el-form-item>
</el-form>
<!-- 淇敼淇濋櫓鍗� -->
- <el-form v-if="visible4==true" :model="form" ref="form4" :rules="rules4" style="width: 100%;">
- <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�">
- {{ model.startTime }}
- </el-form-item>
- <el-form-item label="淇濆崟鍙凤細" prop="editCode">
- <el-input v-model="form.editCode" placeholder="璇疯緭鍏�" v-trim/>
- </el-form-item>
- <el-form-item label="涓婁紶淇濋櫓鍗曪細" prop="editBaoxianFile">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="editBaoxianFileUploaded" />
- </el-form-item>
- <el-form-item label="淇敼鍘熷洜锛�" prop="editCheckInfo">
- <el-input type="textarea" v-model="form.editCheckInfo" placeholder="璇疯緭鍏�" v-trim/>
- </el-form-item>
- </el-form>
+ <el-form v-if="visible4==true" :model="form" ref="form4" :rules="rules4" style="width: 100%;">
+ <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�">
+ {{ model.startTime }}
+ </el-form-item>
+ <el-form-item label="淇濆崟鍙凤細" prop="editCode">
+ <el-input v-model="form.editCode" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ <el-form-item label="涓婁紶淇濋櫓鍗曪細" prop="editBaoxianFile">
+ <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="editBaoxianFileUploaded" />
+ </el-form-item>
+ <el-form-item label="淇敼鍘熷洜锛�" prop="editCheckInfo">
+ <el-input type="textarea" v-model="form.editCheckInfo" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ </el-form>
<el-form v-if="visible5==true || visible6==true" :model="form" ref="form5" :rules="rules5" style="width: 100%;">
<el-form-item label="濉啓璇存槑锛�" prop="dealBackInfo">
<el-input type="textarea" v-model="form.dealBackInfo" placeholder="璇疯緭鍏�" v-trim/>
@@ -130,7 +130,7 @@
],
editCheckInfo: [
{ required: true, message: '璇峰畬鍠勪俊鎭�' }
- ],
+ ]
},
form: {
id: null,
diff --git a/company/src/components/business/OperaTaxesWindow.vue b/company/src/components/business/OperaTaxesWindow.vue
index e3d809c..40e83e2 100644
--- a/company/src/components/business/OperaTaxesWindow.vue
+++ b/company/src/components/business/OperaTaxesWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="title"
- width="50%"
+ width="100%"
submitText="杩斿洖淇敼"
:visible.sync="visible"
:confirm-working="isWorking"
@@ -87,57 +87,59 @@
</template>
<script>
- import BaseOpera from '@/components/base/BaseOpera'
- import GlobalWindow from '@/components/common/GlobalWindow'
- export default {
- name: 'OperaCompanyWindow',
- extends: BaseOpera,
- components: { GlobalWindow },
- data () {
- return {
- // 琛ㄥ崟鏁版嵁
- form: {
- id: null
- },
- // 楠岃瘉瑙勫垯
- rules: {},
- tableData:[]
- }
- },
- created () {
- this.config({
- api: '/business/taxes',
- 'field.id': 'id'
- })
- },
- methods: {
- getSummaries(param) {
- const { columns, data } = param;
- const sums = [];
- columns.forEach((column, index) => {
- if (index === 0) {
- sums[index] = '鍚堣';
- return;
- } else {
- if (index == 9||index==10||index==11||index==12) {
- const values = data.map(item => Number(item[column.property]));
- if (!values.every(value => isNaN(value))) {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr);
- if (!isNaN(value)) {
- return prev + curr;
- } else {
- return prev;
- }
- }, 0);
- }
- }
- }
- });
- return sums;
- }
- }
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+export default {
+ name: 'OperaCompanyWindow',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ id: null
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {},
+ tableData: []
}
+ },
+ created () {
+ this.config({
+ api: '/business/taxes',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ open(title,targer){
+
+ },
+ getSummaries (param) {
+ const { columns, data } = param
+ const sums = []
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '鍚堣'
+ } else {
+ if (index == 9 || index == 10 || index == 11 || index == 12) {
+ const values = data.map(item => Number(item[column.property]))
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ }
+ }
+ }
+ })
+ return sums
+ }
+ }
+}
</script>
<style lang="scss" scoped>
@@ -150,7 +152,7 @@
justify-content: space-between;
margin-bottom: 20px;
span {
- font-size: 18px;
+ font-size: 14px;
font-weight: 500;
color: #000000;
}
diff --git a/company/src/views/business/taxes.vue b/company/src/views/business/taxes.vue
index 52006e9..eb05330 100644
--- a/company/src/views/business/taxes.vue
+++ b/company/src/views/business/taxes.vue
@@ -77,7 +77,7 @@
<template slot-scope="{row}">
<el-button v-if="row.status==0" type="text" @click="$refs.OperaTaxesUploadWindow.open('涓婁紶鍙戠エ',row)">涓婁紶鍙戠エ</el-button>
<el-button v-if="row.status ==1 " type="text" @click="$refs.OperaTaxesUploadWindow.open('淇敼鍙戠エ',row)">淇敼鍙戠エ</el-button>
- <el-button type="text">鐢宠璇︽儏</el-button>
+ <el-button type="text" @click="$refs.OperaTaxesWindow.open('鐢宠璇︽儏',row)">鐢宠璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index 489a5ee..0d06fbd 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -522,19 +522,20 @@
applyLogType = Constants.ApplyLogType.CA_PALTFORM_REFUSE_APPLY;
info = applyLogType.getInfo();
info = info.replace("${param}", param.getCheckInfo());
- update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
+//
+ if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
+ update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
+ }else if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey())){
+ update.setStatus(Constants.ApplyChangeStatus.UPLOAD.getKey());
+ }
}else{
//濡傛灉鏄悓鎰�,涓ょ鐢宠閫�鍥炵姸鎬侀兘鍙搷浣�
if(!(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
||Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
- applyLogType = Constants.ApplyLogType.CA_PALTFORM_REFUSE_APPLY;
- if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
- update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
- }else if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey())){
- update.setStatus(Constants.ApplyChangeStatus.UPLOAD.getKey());
- }
+ update.setStatus(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey());
+ applyLogType = Constants.ApplyLogType.CA_PLATFORM_AGREE_BACK_APPLY;
}
update.setEditDate(new Date());
update.setEditor(user.getId());
@@ -1320,7 +1321,7 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Company company = user.getCompany();
if(debugModel){
-company = companyMapper.selectById(model.getCompanyId());
+ company = companyMapper.selectById(model.getCompanyId());
}
if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠＄悊鍛樼‘璁");
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 10f893b..c3e08a2 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
@@ -697,7 +697,6 @@
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