From 2e8224782416e546a832aa8cff789bdc7505afa0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 一月 2024 19:24:53 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 52 ++
server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java | 18
company/src/components/business/OperaSettleClaimsCheckWindow.vue | 499 ++++++++++++++++++++++
server/service/src/main/java/com/doumee/core/utils/Constants.java | 6
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 188 +++++--
company/src/api/business/settleClaims.js | 40 +
company/src/views/business/settleClaims.vue | 83 ++-
server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java | 4
company/src/components/business/OperaSettleClaimsWindow.vue | 372 ++++++----------
9 files changed, 929 insertions(+), 333 deletions(-)
diff --git a/company/src/api/business/settleClaims.js b/company/src/api/business/settleClaims.js
index 877b2e0..b1d0af3 100644
--- a/company/src/api/business/settleClaims.js
+++ b/company/src/api/business/settleClaims.js
@@ -6,8 +6,48 @@
trim: true
})
}
+export function confirmFile (data) {
+ return request.post('/business/settleClaims/confirm', data, {
+ trim: true
+ })
+}
+export function remark (data) {
+ return request.post('/business/settleClaims/remark', data, {
+ trim: true
+ })
+}
+export function addCode (data) {
+ return request.post('/business/settleClaims/addCode', data, {
+ trim: true
+ })
+}
+export function dealBiz (data) {
+ return request.post('/business/settleClaims/dealBiz', data, {
+ trim: true
+ })
+}
+export function doneCommit (data) {
+ return request.post('/business/settleClaims/doneCommit', data, {
+ trim: true
+ })
+}
+export function back (data) {
+ return request.post('/business/settleClaims/back', data, {
+ trim: true
+ })
+}
+export function exportFiles (data) {
+ return request.post('/business/settleClaims/exportFiles', data, {
+ trim: true,
+ download: true
+ })
+}
// 淇敼
export function updateById (data) {
return request.post('/business/settleClaims/updateById', data)
}
+
+export function findById (id) {
+ return request.get(`business/settleClaims/${id}`)
+}
diff --git a/company/src/components/business/OperaSettleClaimsCheckWindow.vue b/company/src/components/business/OperaSettleClaimsCheckWindow.vue
new file mode 100644
index 0000000..a88f38b
--- /dev/null
+++ b/company/src/components/business/OperaSettleClaimsCheckWindow.vue
@@ -0,0 +1,499 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="60%"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <div v-if="visible1==true" class="form">
+ <div class="form_item">
+ <div class="form_item_label">
+ <span>*</span>鎶ユ鍙凤細
+ </div>
+ <div class="form_item_val">
+ <input type="text" v-model="form.reportNum" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ </div>
+
+ <div v-if="visible2==true" class="form">
+ <div class="form_item">
+ <div class="form_item_label">
+ <span>*</span>澶勭悊杩涘睍锛�
+ </div>
+ <div class="form_item_val">
+ <textarea v-model="form.bizInfo" placeholder="璇疯緭鍏�"></textarea>
+ </div>
+ </div>
+ </div>
+ <div v-if="visible3==true" class="form">
+ <div class="form_item">
+ <div class="form_item_label">
+ <span>*</span>濉啓鎾ら攢璇存槑锛�
+ </div>
+ <div class="form_item_val">
+ <textarea v-model="form.backInfo" placeholder="璇疯緭鍏�"></textarea>
+ </div>
+ </div>
+ </div>
+ <div v-if="visible4==true" class="form">
+ <div class="form_item">
+ <div class="form_item_label">
+ <span>*</span>缁撴鍐呭锛�
+ </div>
+ <div class="form_item_val">
+ <textarea v-model="form.doneInfo" placeholder="璇疯緭鍏�"></textarea>
+ </div>
+ </div>
+ <div class="form_item">
+ <div class="form_item_label">
+ 鍖荤枟鐞嗚禂锛�
+ </div>
+ <div class="form_item_val">
+ <input v-model="form.ylClaimAccount" placeholder="璇疯緭鍏�" />
+ </div>
+ </div>
+ <div class="form_item">
+ <div class="form_item_label">
+ 璇伐鐞嗚禂锛�
+ </div>
+ <div class="form_item_val">
+ <input v-model="form.wgClaimAccount" placeholder="璇疯緭鍏�" />
+ </div>
+ </div>
+ <div class="form_item">
+ <div class="form_item_label">
+ 浼ゆ畫鐞嗚禂锛�
+ </div>
+ <div class="form_item_val">
+ <input v-model="form.scClaimAccount" placeholder="璇疯緭鍏�" />
+ </div>
+ </div>
+ <div class="form_item">
+ <div class="form_item_label">
+ 姝讳骸鐞嗚禂锛�
+ </div>
+ <div class="form_item_val">
+ <input v-model="form.swClaimAccount" placeholder="璇疯緭鍏�" />
+ </div>
+ </div>
+ </div>
+ <div v-if="visible5 ==true" class="form">
+ <div class="form_span" v-for="(item,index) in remarkLogList" :key="index">
+ <span>鐞嗚禂鍛�-{{ item.creatorName }} {{item.createDate }}</span>
+ <span>{{item.content }}</span>
+ </div>
+ <div class="form_item">
+ <div class="form_item_label">
+ <span>*</span>濉啓澶囨敞鏍囩锛�
+ </div>
+ <div class="form_item_val">
+ <textarea v-model="form.remarkInfo" placeholder="璇疯緭鍏�"></textarea>
+ </div>
+ </div>
+ </div>
+ <template v-slot:footer>
+ <el-button type="primary" @click="doSubmit">纭畾</el-button>
+ <el-button @click="visible=false">杩斿洖</el-button>
+ </template>
+ </GlobalWindow>
+</template>
+
+<script>
+ import BaseOpera from '@/components/base/BaseOpera'
+ import GlobalWindow from '@/components/common/GlobalWindow'
+ import {addCode, back, dealBiz,doneCommit, remark} from "@/api/business/settleClaims";
+ export default {
+ name: 'OperaSettleClaimsCheckWindow',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ remarkLogList:[],
+ type:0,
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ id: null,
+ checkInfo: null,
+ bizInfo: null,
+ doneInfo: null,
+ backInfo: null,
+ remarkInfo: null,
+ ylClaimAccount: null,
+ wgClaimAccount: null,
+ swClaimAccount: null,
+ scClaimAccount: null,
+ reportNum: null,
+ },
+ model:{},
+ activeName: 'first',
+ reverse: true,
+ tableData: [],
+ visible1: false,
+ visible2: false,
+ visible3: false,
+ visible4: false,
+ visible5: false
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/settleClaims',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ open(title,target,target1,type){
+ this.model ={}
+ this.model = target
+ this.title=title
+ this.visible=true
+ this.type=type
+ this.remarkLogList= target1
+ this.visible1=false,
+ this.visible2= false,
+ this.visible3=false,
+ this. visible4= false,
+ this. visible5= false
+ this.form=target
+ this. form= {
+ id: null,
+ checkInfo: null,
+ doneInfo: null,
+ remarkInfo: null,
+ bizInfo: null,
+ backInfo: null,
+ ylClaimAccount: null,
+ wgClaimAccount: null,
+ swClaimAccount: null,
+ scClaimAccount: null,
+ reportNum: null,
+ }
+ if(type==1){
+ this.visible1=true
+ }
+ if(type==2){
+ this.visible2=true
+ }
+ if(type==3){
+ this.visible3=true
+ }
+ if(type==4){
+ this.visible4=true
+ }
+ if(type==5){
+ this.visible5=true
+ }
+ },
+ doSubmit(type) {
+ var that =this
+ if(this.type ===5){
+ // this.isWorking = true
+ remark({id:that.model.id,checkInfo:that.form.remarkInfo})
+ .then(response => {
+ this.visible=false
+ this.$emit('success')
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ }else if(this.type === 4){
+ // this.isWorking = true
+ doneCommit({id: that.model.id, checkInfo: that.form.doneInfo,
+ ylClaimAccount: that.form.ylClaimAccount,
+ wgClaimAccount: that.form.wgClaimAccount,
+ swClaimAccount: that.form.swClaimAccount,
+ scClaimAccount: that.form.scClaimAccount})
+ .then(response => {
+ this.visible=false
+ this.$emit('success')
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ }else if(this.type===2){
+ //鐞嗚禂澶勭悊
+ dealBiz({ id: that.model.id, checkInfo:that.form.bizInfo })
+ .then(response => {
+ this.visible=false
+ this.$emit('success')
+ }).catch(err => {
+ console.log(err)
+ this.$tip.apiFailed(err)
+ }).finally(() => {
+ this.isWorking = false
+ })
+ }else if(this.type===3){
+ //鐞嗚禂澶勭悊
+ back({ id: that.model.id, checkInfo:that.form.backInfo })
+ .then(response => {
+ this.visible=false
+ this.$emit('success')
+ }).catch(err => {
+ console.log(err)
+ this.$tip.apiFailed(err)
+ }).finally(() => {
+ this.isWorking = false
+ })
+ }else if(this.type===1){
+ //娣诲姞澶囨鍙�
+ addCode({ id: that.model.id, reportNum:that.form.reportNum })
+ .then(response => {
+ this.visible=false
+ this.$emit('success')
+ }).catch(err => {
+ console.log(err)
+ this.$tip.apiFailed(err)
+ }).finally(() => {
+ this.isWorking = false
+ })
+ }
+ }
+ }
+ }
+</script>
+<style>
+ .v-modal {
+ z-index: 2000 !important;
+ }
+</style>
+<style lang="scss" scoped>
+ .form {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ .form_span {
+ width: 100%;
+ display: flex;
+ align-items: start;
+ flex-direction: column;
+ margin-bottom: 20px;
+ span {
+ font-size: 14px;
+ &:nth-child(1) {
+ color: #8c939d;
+ margin-bottom: 5px;
+ }
+ &:nth-child(2) {
+ color: #8c939d;
+ color: black;
+ }
+ }
+ }
+ .form_item {
+ width: 100%;
+ display: flex;
+ align-items: start;
+ margin-bottom: 20px;
+ &:last-child {
+ margin: 0 !important;
+ }
+ .form_item_label {
+ flex-shrink: 0;
+ color: black;
+ font-size: 14px;
+ span {
+ color: red;
+ font-size: 14px;
+ }
+ }
+ .form_item_val {
+ flex: 1;
+ /*height: 40px;*/
+ margin-left: 20px;
+ textarea {
+ width: 100%;
+ height: 70px;
+ border: 1px solid #cbcbcb;
+ padding: 10px;
+ outline: none;
+ box-sizing: border-box;
+ }
+ input {
+ width: 100%;
+ height: 100%;
+ outline: none;
+ border-radius: 5px;
+ border: 1px solid #cbcbcb;
+ padding: 0 20px;
+ box-sizing: border-box;
+ }
+ }
+ }
+ }
+ .desc {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ .desc_label {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .desc_label_left {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ .desc_label_left_title {
+ font-size: 20px;
+ font-weight: bold;
+ color: black;
+ }
+ .desc_label_left_time {
+ font-size: 14px;
+ color: rgba(249, 86, 1, 0.996);
+ margin-left: 10px;
+ }
+ .desc_label_left_code {
+ font-size: 15px;
+ color: black;
+ margin-left: 30px;
+ }
+ }
+ .desc_label_right {
+ flex-shrink: 0;
+ }
+ }
+ .desc_list {
+ width: 100%;
+ margin-top: 20px;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ .desc_list_item {
+ width: 33.3%;
+ display: flex;
+ align-items: center;
+ margin-bottom: 10px;
+ .desc_list_item_label {
+ width: 130px;
+ flex-shrink: 0;
+ font-size: 15px;
+ color: black;
+ }
+ .desc_list_item_val {
+ flex: 1;
+ font-size: 15px;
+ color: black;
+ }
+ .desc_list_item_videos {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ .desc_list_item_imgs_video {
+ width: 150px;
+ height: 150px;
+ background: black;
+ margin-right: 10px;
+ video {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ }
+ }
+ }
+ .desc_xian {
+ width: 100%;
+ height: 1px;
+ margin: 10px 0;
+ background: #ececec;
+ }
+ .desc_data {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ margin-top: 20px;
+ .desc_data_label {
+ font-size: 16px;
+ color: black;
+ font-weight: 600;
+ margin-bottom: 20px;
+ }
+ .desc_data_cate {
+ width: 100%;
+ margin: 0 0 10px 0;
+ }
+ .desc_data_list {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ .desc_data_list_item1 {
+ width: 24.5%;
+ }
+ .desc_data_list_item {
+ width: 24.5%;
+ padding: 10px;
+ box-sizing: border-box;
+ border: 1px solid #e2e2e2;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ position: relative;
+ margin-bottom: 10px;
+ .desc_data_list_item_dele {
+ position: absolute;
+ top: 10px;
+ right: 10px;
+ font-size: 14px;
+ cursor: pointer;
+ color: rgba(249, 86, 1, 0.996078431372549);
+ }
+ .desc_data_list_item_upload {
+ flex: 1;
+ height: 80px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .desc_data_list_item_img {
+ flex-shrink: 0;
+ width: 80px;
+ height: 80px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ overflow: hidden;
+ .el-icon-plus {
+ font-size: 26px;
+ color: #ffffff;
+ }
+ img {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .desc_data_list_item_info {
+ flex: 1;
+ height: 80px;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ span {
+ &:nth-child(1) {
+ font-size: 14px;
+ color: black;
+ }
+ &:nth-child(2) {
+ font-size: 14px;
+ color: #888888;
+ }
+ &:nth-child(3) {
+ font-size: 14px;
+ color: #888888;
+ }
+ }
+ }
+ }
+ }
+ }
+ .desc_times {
+ width: 100%;
+ margin-top: 20px;
+ }
+ }
+</style>
diff --git a/company/src/components/business/OperaSettleClaimsWindow.vue b/company/src/components/business/OperaSettleClaimsWindow.vue
index 23a618d..854eb37 100644
--- a/company/src/components/business/OperaSettleClaimsWindow.vue
+++ b/company/src/components/business/OperaSettleClaimsWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="title"
- width="80%"
+ width="100%"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
@@ -13,17 +13,17 @@
鎶ユ璇︽儏
</span>
<span class="desc_label_left_time">
- 鎶ユ鏃ユ湡锛�2015-10-03 10:15:22
+ 鎶ユ鏃ユ湡锛歿{ model.createDate }}
</span>
<span class="desc_label_left_code">
- 鎶ユ鍙凤細214141241241
+ 鎶ユ鍙凤細{{ model.reportNum }}
</span>
</div>
<div class="desc_label_right">
- <el-button type="primary" @click="visible1 = true">娣诲姞鎶ユ鍙�</el-button>
- <el-button type="primary" @click="visible2 = true">鐞嗚禂澶勭悊</el-button>
- <el-button type="primary" @click="visible4 = true">缁撴鎻愪氦</el-button>
- <el-button type="danger" @click="visible3 = true">鎾ら攢鐢宠</el-button>
+ <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('娣诲姞鎶ユ鍙�',model,remarkLogList,1)">娣诲姞鎶ユ鍙�</el-button>
+ <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('鐞嗚禂澶勭悊',model,remarkLogList,2)">鐞嗚禂澶勭悊</el-button>
+ <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('缁撴鎻愪氦',model,remarkLogList,4)">缁撴鎻愪氦</el-button>
+ <el-button type="danger" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('鎾ら攢鐢宠',model,remarkLogList,3)">鎾ら攢鐢宠</el-button>
</div>
</div>
<div class="desc_list">
@@ -32,7 +32,7 @@
鍑洪櫓浜哄鍚嶏細
</div>
<div class="desc_list_item_val">
- 鍚翠笁涓�
+ {{model.memberName}}
</div>
</div>
<div class="desc_list_item">
@@ -40,7 +40,7 @@
鍑洪櫓浜鸿韩浠借瘉鍙凤細
</div>
<div class="desc_list_item_val">
- 320224403660011111
+ {{ model.memberIdcardNo }}
</div>
</div>
<div class="desc_list_item">
@@ -48,7 +48,7 @@
浜嬫晠鍙戠敓鏃堕棿锛�
</div>
<div class="desc_list_item_val">
- 2015-10-02 10:15:22
+ {{ model.createDate }}
</div>
</div>
<div class="desc_list_item">
@@ -56,8 +56,8 @@
鎵�灞炰繚鍗曞彿锛�
</div>
<div class="desc_list_item_val" style="cursor: pointer; color: rgba(39, 157, 255, 0.968627450980392);">
- 11121624116241
- <el-button type="primary" style="margin-left: 10px;">鏌ョ湅淇濋櫓鍗�</el-button>
+ {{ model.applyCode }}
+ <el-button v-if="model.baoxiandanFile && model.baoxiandanFile.fileurlFull" type="primary" style="margin-left: 10px;" @click="openBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
</div>
</div>
<div class="desc_list_item">
@@ -65,7 +65,7 @@
淇濋櫓鐢熸晥璧锋湡锛�
</div>
<div class="desc_list_item_val">
- 2015-10-02 10:15:22
+ {{ model.baoxianStartTime }}
</div>
</div>
<div class="desc_list_item">
@@ -73,7 +73,7 @@
淇濋櫓鐢熸晥姝㈡湡锛�
</div>
<div class="desc_list_item_val">
- 2015-10-02 10:15:22
+ {{ model.baoxianEndTime }}
</div>
</div>
<div class="desc_list_item">
@@ -81,7 +81,7 @@
娲鹃仯鍗曚綅锛�
</div>
<div class="desc_list_item_val">
- 鑺滄箹鏍煎姏绮惧瘑鍒堕�犳湁闄愬叕鍙�
+ {{ model.duName }}
</div>
</div>
<div class="desc_list_item">
@@ -89,7 +89,7 @@
鎵�灞炲伐绉嶏細
</div>
<div class="desc_list_item_val">
- 4绫绘満姊板姞宸�
+ {{ model.worktypeName }}
</div>
</div>
<div class="desc_list_item">
@@ -97,39 +97,39 @@
灏辫瘖鍖荤枟鏈烘瀯锛�
</div>
<div class="desc_list_item_val">
- 瀹夊窘鐪佷汉姘戝尰闄�
+ {{ model.hospital }}
</div>
</div>
<div class="desc_list_item">
<div class="desc_list_item_label">
浜嬫晠绫诲瀷锛�
</div>
- <div class="desc_list_item_val">
- 宸ヤ綔鏈熼棿鍙椾激
- </div>
+ <div class="desc_list_item_val" v-if="model.medicalInsurance ===1">涓婁笅鐝�斾腑鍙椾激</div>
+ <div class="desc_list_item_val" v-else-if="model.medicalInsurance ===2">闈炲伐浣滄椂闂村彈浼�</div>
+ <div class="desc_list_item_val" v-else-if="model.medicalInsurance ===3">鎰忓鍙�</div>
+ <div class="desc_list_item_val" v-else>宸ヤ綔鏈熼棿鍙椾激</div>
</div>
<div class="desc_list_item">
<div class="desc_list_item_label">
鏄惁浣忛櫌锛�
</div>
<div class="desc_list_item_val">
- 鍚�
+ <div class="desc_list_item_val" v-if="model.inHospital ===1">鏄�</div>
+ <div class="desc_list_item_val" v-else>鍚�</div>
</div>
</div>
<div class="desc_list_item">
<div class="desc_list_item_label">
鏄惁鏈夊尰鐤椾繚闄╋細
</div>
- <div class="desc_list_item_val">
- 鍚�
- </div>
+ <div class="desc_list_item_val">{{ model.medicalInsurance ===1?"鏄�":"鍚�" }}</div>
</div>
<div class="desc_list_item">
<div class="desc_list_item_label">
鍑洪櫓鍦板尯锛�
</div>
<div class="desc_list_item_val">
- 瀹夊窘鐪佸悎鑲ュ競
+ {{model.areaInfo}}
</div>
</div>
<div class="desc_list_item">
@@ -137,37 +137,27 @@
鎶ユ浜哄鍚嶏細
</div>
<div class="desc_list_item_val">
- 鐜嬫灄
+ {{model.informantName}}
</div>
</div>
<div class="desc_list_item">
- <div class="desc_list_item_label">
- 鎶ユ浜鸿仈绯绘柟寮忥細
- </div>
- <div class="desc_list_item_val">
- 13355667788
- </div>
+ <div class="desc_list_item_label"> 鎶ユ浜鸿仈绯绘柟寮忥細 </div>
+ <div class="desc_list_item_val"> {{model.informantPhone}} </div>
</div>
<div class="desc_list_item" style="width: 100%;">
- <div class="desc_list_item_label">
- 浜嬫晠鎻忚堪锛�
- </div>
- <div class="desc_list_item_val">
- 2021骞�01鏈�24鏃ュ噷鏅�03鐐瑰乏鍙筹紝鍛樺伐鍛ㄥ厜纾婂湪鑻忓窞宸ヤ笟鍥尯闀垮畯鍏夌數绉戞妧鏈夐檺鍏徃鍏夌數鐢熶骇閮ㄥ厜瀛﹁啘瑁佸垏璇捐溅闂达紝鐢ㄦ墜鍔ㄥ弶杞︽惉杩愬師鏉愭枡鏃讹紝鍘熸潗鏂欐帀钀界牳鍒板彸鑴氾紝鍑屾櫒3锛�30宸﹀彸鍏徃娲句笓杞﹂�佸線鑻忓窞宸ヤ笟鍥尯鏄熸箹鍖婚櫌灏辫瘖锛屼负鍛樺伐浼ゅ彛杩涜鍖呮墡姝㈣鍚庯紝鍑屾櫒05锛�45杞�佽嚦鑻忓窞鐟炲崕楠ㄧ鍖婚櫌杩涗竴姝ユ不鐤椼��
- </div>
+ <div class="desc_list_item_label"> 浜嬫晠鎻忚堪锛� </div>
+ <div class="desc_list_item_val">{{model.content}}</div>
</div>
<div class="desc_list_item" style="width: 100%;">
<div class="desc_list_item_label">
鎶ユ瑙嗛锛�
</div>
- <div class="desc_list_item_videos">
- <div class="desc_list_item_imgs_video">
- <video src="blob:https://www.bilibili.com/f8718314-82c5-43d2-9b26-2c4d701b6bab"></video>
- </div>
- <div class="desc_list_item_imgs_video">
- <video src="blob:https://www.bilibili.com/f8718314-82c5-43d2-9b26-2c4d701b6bab"></video>
+ <div v-if="model.reportFileList && model.reportFileList.length>0" class="desc_list_item_videos">
+ <div class="desc_list_item_imgs_video" v-for="(item, index) in reportFileList" :key="index">
+ <video src="${item.fileurlFull}"></video>
</div>
</div>
+ <div v-else class="desc_list_item_videos">-</div>
</div>
</div>
<div class="desc_xian"></div>
@@ -176,14 +166,14 @@
<span class="desc_label_left_title">
鐞嗚禂璧勬枡
</span>
- <span class="desc_label_left_time" style="color: black">
- 璧勬枡瀹屾垚鏃ユ湡锛�2015-10-03 10:15:22
+ <span v-if="doneFileDate!=null" class="desc_label_left_time" style="color: black">
+ 璧勬枡瀹屾垚鏃ユ湡锛歿{doneFileDate}}
</span>
</div>
<div class="desc_label_right">
- <el-button type="primary" @click="visible5 = true">澶囨敞鏍囩</el-button>
- <el-button type="primary" @click="submit">璧勬枡纭</el-button>
- <el-button type="primary">璧勬枡涓嬭浇</el-button>
+ <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('澶囨敞鏍囩',model,remarkLogList,5)">澶囨敞鏍囩</el-button>
+ <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="submit(0)">璧勬枡纭</el-button>
+ <el-button type="primary" @click="submit(1)">璧勬枡涓嬭浇</el-button>
</div>
</div>
<div class="desc_data">
@@ -284,196 +274,72 @@
<div class="desc_times">
<el-timeline :reverse="reverse">
<el-timeline-item
- v-for="(activity, index) in activities"
+ v-for="(activity, index) in model.settleClaimsLogList"
:key="index"
:timestamp="activity.timestamp">
- {{activity.content}}
+ <div style="display: flex; flex-direction: column;" v-if="activity.objType==3">
+ <span style="font-size: 16px; font-weight: bold; color: #0d5ada;">
+ {{activity.title}}
+ <span style="font-size: 16px; font-weight: bold; color: #0d5ada; margin-left: 10px;" >
+ <span v-if=" model.ylClaimAccount && model.ylClaimAccount>0">鍖荤枟鐞嗚禂{{ model.ylClaimAccount }}鍏冿紱</span>
+ <span v-if=" model.wgClaimAccount && model.wgClaimAccount>0">璇伐鐞嗚禂{{ model.wgClaimAccount }}鍏冿紱</span>
+ <span v-if=" model.scClaimAccount && model.scClaimAccount>0">浼ゆ畫鐞嗚禂{{ model.scClaimAccount }}鍏冿紱</span>
+ <span v-if=" model.swClaimAccount && model.swClaimAccount>0">姝讳骸鐞嗚禂{{ model.swClaimAccount }}鍏冿紱</span>
+ 鐞嗚禂鎬婚锛歿{ model.claimAccount }}鍏�
+ </span>
+ </span>
+ <span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
+ {{activity.content}}
+ </span>
+ <span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+ </span>
+ </div>
+ <div style="display: flex; flex-direction: column;" v-else>
+ <span style="font-size: 16px; font-weight: 400; color: black;">
+ {{activity.title}}
+ <span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" >
+ {{activity.content}}
+ </span>
+ </span>
+ <span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+ </span>
+ </div>
</el-timeline-item>
</el-timeline>
</div>
</div>
- <el-dialog
- title="娣诲姞鎶ユ鍙�"
- :visible.sync="visible1"
- :show-close="false"
- :close-on-click-modal="false"
- width="30%"
- center>
- <div class="form">
- <div class="form_item">
- <div class="form_item_label">
- <span>*</span>鎶ユ鍙凤細
- </div>
- <div class="form_item_val">
- <input type="text" placeholder="璇疯緭鍏�">
- </div>
- </div>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="visible1 = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="visible1 = false">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- <el-dialog
- title="鐞嗚禂澶勭悊"
- :visible.sync="visible2"
- :show-close="false"
- :close-on-click-modal="false"
- width="30%"
- center>
- <div class="form">
- <div class="form_item">
- <div class="form_item_label">
- <span>*</span>澶勭悊杩涘睍锛�
- </div>
- <div class="form_item_val">
- <textarea placeholder="璇疯緭鍏�"></textarea>
- </div>
- </div>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="visible2 = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="visible2 = false">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- <el-dialog
- title="鎾ら攢鐢宠"
- :visible.sync="visible3"
- :show-close="false"
- :close-on-click-modal="false"
- width="30%"
- center>
- <div class="form">
- <div class="form_item">
- <div class="form_item_label">
- <span>*</span>濉啓鎾ら攢璇存槑锛�
- </div>
- <div class="form_item_val">
- <textarea placeholder="璇疯緭鍏�"></textarea>
- </div>
- </div>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="visible3 = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="visible3 = false">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- <el-dialog
- title="鐞嗚禂缁撴"
- :visible.sync="visible4"
- :show-close="false"
- :close-on-click-modal="false"
- width="30%"
- center>
- <div class="form">
- <div class="form_item">
- <div class="form_item_label">
- <span>*</span>缁撴鍐呭锛�
- </div>
- <div class="form_item_val">
- <textarea placeholder="璇疯緭鍏�"></textarea>
- </div>
- </div>
- <div class="form_item">
- <div class="form_item_label">
- <span>*</span>鐞嗚禂璐圭敤锛�
- </div>
- <div class="form_item_val">
- <el-table
- :data="tableData"
- border
- style="width: 100%">
- <el-table-column
- prop="date"
- label="鍖荤枟鐞嗚禂">
- </el-table-column>
- <el-table-column
- prop="name"
- label="璇伐鐞嗚禂">
- </el-table-column>
- <el-table-column
- prop="address"
- label="浼ゆ畫鐞嗚禂">
- </el-table-column>
- <el-table-column
- prop="address"
- label="姝讳骸鐞嗚禂">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鐞嗚禂鎬婚">
- </el-table-column>
- </el-table>
- </div>
- </div>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="visible4 = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="visible4 = false">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- <el-dialog
- title="澶囨敞鏍囩"
- :visible.sync="visible5"
- :show-close="false"
- :close-on-click-modal="false"
- width="30%"
- center>
- <div class="form">
- <div class="form_span">
- <span>鐞嗚禂鍛�-鐜嬫灄 2023-11-11 10:33:12</span>
- <span>鏉庣璐� 鍙充腑鎸囪繙鑺傛寚楠ㄩ鎶樻墦鍖呭鐞�5000(鍚尰鐤楄宸� 浼�)鍏嶉壌瀹氬拰璁ゅ畾鍙互鍚�?</span>
- </div>
- <div class="form_span">
- <span>鐞嗚禂鍛�-鏉庢煇 2023-11-11 10:33:12</span>
- <span>鐞嗚禂璇曠潃鐢宠涓� 闇�鎻愪緵妫�鏌ユ姤鍛婂崟 鍘熶欢瀵勪繚鍙�</span>
- </div>
- <div class="form_item">
- <div class="form_item_label">
- <span>*</span>濉啓鎾ら攢璇存槑锛�
- </div>
- <div class="form_item_val">
- <textarea placeholder="璇疯緭鍏�"></textarea>
- </div>
- </div>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="visible5 = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="visible5 = false">娣� 鍔�</el-button>
- </span>
- </el-dialog>
+ <template v-slot:footer>
+ <el-button @click="visible=false">杩斿洖</el-button>
+ </template>
+ <OperaSettleClaimsCheckWindow ref="operaInsuranceApplyCheckWindow" @success="callback" />
</GlobalWindow>
</template>
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+ import OperaSettleClaimsCheckWindow from '@/components/business/OperaSettleClaimsCheckWindow'
+ import {confirmFile, findById,exportFiles} from '@/api/business/settleClaims';
export default {
name: 'OperaSettleClaimsWindow',
extends: BaseOpera,
- components: { GlobalWindow },
+ components: { GlobalWindow, OperaSettleClaimsCheckWindow },
data () {
return {
+ doneFileDate:null,
+ remarkLogList:[],
// 琛ㄥ崟鏁版嵁
form: {
id: null,
},
+ model:{},
// 楠岃瘉瑙勫垯
rules: {
},
activeName: 'first',
reverse: true,
- activities: [
- {
- content: '鎻愪氦鎶ユ鐢宠\n' +
- '\n' +
- '\n' +
- '鎻愪氦鎰忚锛�-',
- timestamp: '鎿嶄綔鍛�-寮犱紵锛堝畨寰藉钩瀹変汉鍔涜祫婧愭湁闄愬叕鍙革級\n' +
- '\n' +
- '2023-09-11 00:00:00'
- }
- ],
tableData: [],
visible1: false,
visible2: false,
@@ -489,24 +355,80 @@
})
},
methods: {
+ open(title,target){
+ this.model ={}
+ this.model = target
+ this.title=title
+ this.visible=true
+ this.doneFileDate=null
+ this.remarkLogList=[]
+ this.getDetail()
+ },
+ openBaoxiandan(){
+ window.open(this.model.baoxiandanFile.fileurlFull);
+ },
+ getDetail(){
+ findById( this.model.id)
+ .then(res => {
+ this.model = res
+ this.remarkLogList=[]
+ var logList = this.model.settleClaimsLogList
+ if(logList){
+ logList.forEach(item => {
+ if( item.objType==2){
+ this.doneFileDate = item.createDate
+ }
+ if(item.objType==7){
+ this.remarkLogList.push(item)
+ }
+
+ })
+ }
+ }).catch(err => {
+ })
+ },
handleClick(tab, event) {
console.log(tab, event);
},
- submit() {
- this.$confirm('鐞嗚禂鏉愭枡鏀堕泦瀹屾垚锛岃鍙婃椂鎻愪氦淇濋櫓鍏徃锛�', '璧勬枡鏀堕泦瀹屾垚', {
- confirmButtonText: '鎻愪氦',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- this.$message({
- type: 'success',
- message: '鎻愪氦鎴愬姛!'
- });
- }).catch(() => {
+ callback(){
+ this.getDetail()
+ this.$emit('success')
+ },
+ submit(type) {
+ var that =this
+ if(type ==0){
+ this.$dialog.messageConfirm('鐞嗚禂鏉愭枡鏀堕泦瀹屾垚锛岃鍙婃椂鎻愪氦淇濋櫓鍏徃锛�')
+ .then(() => {
+ // this.isWorking = true
+ confirmFile({id:that.model.id})
+ .then(response => {
+ that.getDetail()
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ })
+ }else if(type==1){
+ //璧勬枡涓嬭浇
+ this.$dialog.exportConfirm('纭杩涜璧勬枡涓嬭浇鍚楋紵')
+ .then(() => {
+ this.isWorking = true
+ exportFiles({ id: that.model.id })
+ .then(response => {
+ this.download(response)
+ }).catch(err => {
+ console.log(err)
+ this.$message.error("涓嬭浇璧勬枡澶辫触锛岃纭璧勬枡鏁版嵁涓嶄负绌�")
+ }).finally(() => {
+ this.isWorking = false
+ })
+ })
+ .catch(() => {
+ })
+ }
- });
}
}
+
}
</script>
<style>
diff --git a/company/src/views/business/settleClaims.vue b/company/src/views/business/settleClaims.vue
index ae53fde..4bf0a03 100644
--- a/company/src/views/business/settleClaims.vue
+++ b/company/src/views/business/settleClaims.vue
@@ -2,26 +2,26 @@
<TableLayout :permissions="['business:settleclaims:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鍛樺伐濮撳悕" prop="informantName">
- <el-input v-model="searchForm.informantName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鍛樺伐濮撳悕" prop="memberName">
+ <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鎶ユ鍗曚綅" prop="companyId">
<el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in companyList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="淇濋櫓鏂规" prop="solutionId">
- <el-select v-model="searchForm.solutionId" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
+ <el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
+ <el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in solutionList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -32,15 +32,8 @@
<el-option label="宸茬粨妗�" value="2"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="娲鹃仯鍗曚綅" prop="duId">
- <el-select v-model="searchForm.duId" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
+ <el-form-item label="娲鹃仯鍗曚綅" prop="duName">
+ <el-input v-model="searchForm.duName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -61,18 +54,18 @@
</template>
</el-table-column>
<el-table-column prop="reportNum" label="鎶ユ鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="companyId" label="鎶ユ浼佷笟" min-width="100px"></el-table-column>
- <el-table-column prop="companyId" label="鍑洪櫓浜�" min-width="100px"></el-table-column>
- <el-table-column prop="solutionId" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
- <el-table-column prop="duId" label="娲鹃仯鍗曚綅" min-width="100px"></el-table-column>
- <el-table-column prop="worktypeId" label="鎵�灞炲伐绉�" min-width="100px"></el-table-column>
- <el-table-column prop="worktypeId" label="淇濋櫓鐢熸晥璧锋湡" min-width="100px"></el-table-column>
- <el-table-column prop="create_date" label="鎶ユ鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鎶ユ浼佷笟" min-width="100px"></el-table-column>
+ <el-table-column prop="memberName" label="鍑洪櫓浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
+ <el-table-column prop="duName" label="娲鹃仯鍗曚綅" min-width="100px"></el-table-column>
+ <el-table-column prop="worktypeName" label="鎵�灞炲伐绉�" min-width="100px"></el-table-column>
+ <el-table-column prop="baoxianStartTime" label="淇濋櫓鐢熸晥璧锋湡" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鎶ユ鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="status" label="妗堜欢鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.status === 0 || row.status === 2">澶勭悊涓�</span>
- <span v-if="row.status === 1">宸叉挙妗�</span>
- <span v-if="row.status === 3">宸茬粨妗�</span>
+ <span style="color: #2E68EC" v-if="row.status === 0 || row.status === 2 || row.status === 3">澶勭悊涓�</span>
+ <span style="color: red" v-if="row.status === 1">宸叉挙妗�</span>
+ <span style="color: green " v-if="row.status ===4">宸茬粨妗�</span>
</template>
</el-table-column>
<el-table-column
@@ -82,7 +75,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaSettleClaimsWindow.open('缂栬緫鐞嗚禂鐢宠琛�', row)" icon="el-icon-edit" v-permissions="['business:settleclaims:update']">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.operaSettleClaimsWindow.open('鎶ユ鐞嗚禂鐢宠琛�', row)" icon="el-icon-view" v-permissions="['business:settleclaims:update']">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -103,6 +96,8 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaSettleClaimsWindow from '@/components/business/OperaSettleClaimsWindow'
+ import {all as solutionAll} from '@/api/business/solutions'
+ import {pageAll as companyAll} from '@/api/business/company'
export default {
name: 'SettleClaims',
extends: BaseTable,
@@ -110,10 +105,13 @@
data () {
return {
// 鎼滅储
+ solutionList:[],
+ companyList:[],
searchForm: {
- solutionId: '',
+ baseSolutionId: '',
companyId: '',
- duId: '',
+ duName: '',
+ memberName:'',
status: '',
informantName: ''
}
@@ -127,6 +125,23 @@
'field.main': 'id'
})
this.search()
+ this.loadSelectList()
+ },
+ methods:{
+ // handlePageChange() {
+ // this.search()
+ // },
+ loadSelectList() {
+ solutionAll({dataType:0}).then(res => {
+ this.solutionList = res
+ }).catch(err => {
+ })
+ companyAll({}).then(res => {
+ this.companyList = res
+ }).catch(err => {
+ })
}
+
+ }
}
</script>
diff --git a/server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java b/server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java
index f4a688c..2a37abe 100644
--- a/server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java
@@ -8,6 +8,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.dao.business.dto.SCSupplementDTO;
import com.doumee.dao.business.model.SettleClaims;
import com.doumee.service.business.SettleClaimsService;
import io.swagger.annotations.Api;
@@ -63,6 +64,15 @@
public ApiResponse back(@RequestBody SettleClaims settleClaims) {
return ApiResponse.success(settleClaimsService.back(settleClaims));
}
+ @ApiOperation("闄勪欢涓婁紶")
+ @PostMapping("/claimsUploadFile")
+ @RequiresPermissions("business:settleclaims:update")
+ public ApiResponse claimsUploadFile(@RequestBody SCSupplementDTO scSupplementDTO) {
+ settleClaimsService.claimsUploadFile(scSupplementDTO);
+ return ApiResponse.success(null);
+ }
+
+
@ApiOperation("澶囨敞鏍囩")
@PostMapping("/remark")
@RequiresPermissions("business:settleclaims:remark")
@@ -77,12 +87,12 @@
}
@ApiOperation("璧勬枡涓嬭浇")
@PostMapping("/exportFiles")
- @RequiresPermissions("business:locks:exportExcel")
- public void exportFiles(@RequestParam Integer id,HttpServletResponse response) {
- if(id == null){
+ @RequiresPermissions("business:settleclaims:exportExcel")
+ public void exportFiles(@RequestBody SettleClaims model,HttpServletResponse response) {
+ if(model.getId() == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- settleClaimsService.exportFiles(id,response);
+ settleClaimsService.exportFiles(model.getId(),response);
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
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 f55caa7..f2b834f 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
@@ -1012,12 +1012,12 @@
UPLOAD(0, "鎻愪氦鎶ユ","鎻愪氦鎰忚锛�${param}"),
PLATFORM_RETURN(1, "骞冲彴閫�鍥�","鎻愪氦鎰忚锛�${param}"),
PLATFORM_CONFIRM_INFORMATION(2, "骞冲彴纭璧勬枡",""),
- PLATFORM_FINISH(3, "骞冲彴瀹屾垚鍙楃悊","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_FINISH(3, "缁撴鎻愪氦","鎻愪氦鎰忚锛�${param}"),
UPDATE_DATA(4, "淇敼淇℃伅","鎻愪氦鎰忚锛�${param}"),
SUPPLEMENT(5, "琛ュ厖璇存槑","鎻愪氦鎰忚锛�${param}"),
PLATFORM_LP_DEAL(6, "骞冲彴鐞嗚禂澶勭悊","鎻愪氦鎰忚锛�${param}"),
- PLATFORM_REMARK(7, "骞冲彴澶囨敞鏍囩",""),
- PLATFORM_ADDCODE(8, "骞冲彴娣诲姞鎶ユ鍙�",""),
+ PLATFORM_REMARK(7, "骞冲彴澶囨敞鏍囩","${param}"),
+ PLATFORM_ADDCODE(8, "骞冲彴娣诲姞鎶ユ鍙�","澶囨鍙凤細${param}"),
PLATFORM_UN_AGREE_BACK(9, "浼佷笟涓嬭浇璧勬枡",""),
PLATFORM_DOWNLOAD(10, "骞冲彴涓嬭浇璧勬枡",""),
PLATFORM_CHECK_PASS(11, "骞冲彴涓婁紶璧勬枡",""),
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
index 32f37f4..a32df91 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
@@ -73,10 +73,9 @@
@ExcelColumn(name="浜嬫晠鍙戠敓鏃堕棿")
private String happenTime;
- @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
- @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
-
- private Date idcardNo;
+ @ApiModelProperty(value = "璇佷欢鍙�")
+ @ExcelColumn(name="璇佷欢鍙�")
+ private String idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1")
@ExcelColumn(name="娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
@@ -144,11 +143,12 @@
@ExcelColumn(name="鐞嗚禂鎬婚")
private BigDecimal claimAccount;
-
-
@ApiModelProperty(value = "鎶ユ浜鸿仈绯绘柟寮�")
@ExcelColumn(name="鎶ユ浜鸿仈绯绘柟寮�")
private String informantPhone;
+ @ApiModelProperty(value = "灏辫瘖鍖荤枟鏈烘瀯")
+ @ExcelColumn(name="灏辫瘖鍖荤枟鏈烘瀯")
+ private String hospital;
@ApiModelProperty(value = "鍑洪櫓鍦板尯(鍏宠仈areas)", example = "1")
@ExcelColumn(name="鍑洪櫓鍦板尯(鍏宠仈areas)")
@@ -167,6 +167,9 @@
private Integer insuranceApplyId;
+ @ApiModelProperty(value = "淇濋櫓鍗曢檮浠�")
+ @TableField(exist = false)
+ private Multifile baoxiandanFile;
@ApiModelProperty(value = "鎶ユ瑙嗛")
@TableField(exist = false)
private List<Multifile> reportFileList;
@@ -194,4 +197,41 @@
@ApiModelProperty(value = "鏃ュ織鍒楄〃")
@TableField(exist = false)
List<SettleClaimsLog> settleClaimsLogList;
+
+ @ApiModelProperty(value = "鍑洪櫓浜�")
+ @TableField(exist = false)
+ private String memberName;
+ @ApiModelProperty(value = "鍑洪櫓浜鸿韩浠借瘉")
+ @TableField(exist = false)
+ private String memberIdcardNo;
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "淇濋櫓鏂规鍚嶇О")
+ @TableField(exist = false)
+ private String solutionName;
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
+ @TableField(exist = false)
+ private String duName;
+ @ApiModelProperty(value = "宸ョ鍚嶇О")
+ @TableField(exist = false)
+ private String worktypeName;
+ @ApiModelProperty(value = "淇濆崟鍙�")
+ @TableField(exist = false)
+ private String applyCode;
+ @ApiModelProperty(value = "淇濋櫓鐢熸晥璧锋湡")
+ @TableField(exist = false)
+ private Date baoxianStartTime;
+ @ApiModelProperty(value = "淇濋櫓鐢熸晥璧锋湡")
+ @TableField(exist = false)
+ private Date baoxianEndTime;
+
+
+ @ApiModelProperty(value = "鏂规鍩鸿〃缂栫爜锛堝叧鑱攕olutions锛�", example = "1")
+ @TableField(exist = false)
+ private Integer baseSolutionId;
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅鍩鸿〃缂栫爜锛堝叧鑱攕olutions锛�", example = "1")
+ @TableField(exist = false)
+ private Integer baseDuId;
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
index d7f3458..a84af6d 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
@@ -31,6 +31,7 @@
this.objId=objId;
this.objType = objType;
this.beforeContent=before;
+ this.settleClainmsId=apply.getId();
this.afterContent=after;
}
@TableId(type = IdType.AUTO)
@@ -95,6 +96,9 @@
@ApiModelProperty(value = "鍒涘缓浜哄悕绉�", example = "1")
@TableField(exist = false)
private String creatorName;
+ @ApiModelProperty(value = "鍒涘缓浜虹被鍨� 0骞冲彴 1浼佷笟鐢ㄦ埛", example = "1")
+ @TableField(exist = false)
+ private Integer creatorType;
@ApiModelProperty(value = "鍏徃鍚嶇О", example = "1")
@TableField(exist = false)
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 c6d87a5..2a1ba34 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
@@ -17,6 +17,7 @@
import com.doumee.dao.business.join.SettleClaimsJoinMapper;
import com.doumee.dao.business.join.SettleClaimsLogJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SettleClaimsLogService;
import com.doumee.service.business.SettleClaimsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -114,8 +115,7 @@
*/
@Override
public Integer confirm(SettleClaims param){
- if(param.getId() == null
- ||StringUtils.isBlank( param.getCheckInfo()) ){
+ if(param.getId() == null ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -141,7 +141,7 @@
Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_CONFIRM_INFORMATION;
String info =applyLogType.getInfo();
- info = info.replace("${param}", update.getCheckInfo());
+// info = info.replace("${param}", update.getCheckInfo());
SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
settleClaimsLogMapper.insert(log);
return 1;
@@ -162,17 +162,17 @@
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+ /* if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
-
+*/
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SettleClaims update = new SettleClaims();
update.setEditDate(new Date());
update.setEditor(user.getId());
update.setCheckDate(update.getEditDate());
- update.setCheckInfo(param.getCheckInfo());
+ update.setCheckInfo("娣诲姞澶囨敞鏍囩");
update.setCheckUserId(user.getId());
update.setId(model.getId());
settleClaimsMapper.updateById(update);
@@ -277,7 +277,7 @@
@Override
public Integer addCode(SettleClaims param){
if(param.getId() == null
- ||StringUtils.isBlank( param.getCode()) ){
+ ||StringUtils.isBlank( param.getReportNum()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -285,10 +285,10 @@
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())){
+ if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
-
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SettleClaims update = new SettleClaims();
update.setEditDate(new Date());
@@ -298,11 +298,13 @@
update.setCheckUserId(user.getId());
update.setId(model.getId());
update.setStatus(Constants.SettleClaimsStatus.DEAL_ING.getKey());
- update.setCode(param.getCode());
+ update.setReportNum(param.getReportNum());
settleClaimsMapper.updateById(update);
Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_ADDCODE;
- SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), null,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+ String info =applyLogType.getInfo();
+ info = info.replace("${param}", update.getReportNum());
+ SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
settleClaimsLogMapper.insert(log);
return 1;
@@ -419,25 +421,55 @@
}
}
-
-
@Override
public SettleClaims getSettleClaimsDetail(Integer id){
- SettleClaims settleClaims = settleClaimsJoinMapper.selectJoinOne(SettleClaims.class,new MPJLambdaWrapper<SettleClaims>()
- .selectAll(SettleClaims.class)
+
+ MPJLambdaWrapper<SettleClaims> queryWrapper = new MPJLambdaWrapper<SettleClaims>();
+ queryWrapper.selectAll(SettleClaims.class)
+ .selectAs(Company::getName,SettleClaims::getCompanyName)
+ .selectAs(Solutions::getName,SettleClaims::getSolutionName)
+ .selectAs(Member::getName,SettleClaims::getMemberName)
+ .selectAs(Member::getIdcardNo,SettleClaims::getMemberIdcardNo)
+ .selectAs(InsuranceApply::getCode,SettleClaims::getApplyCode)
+ .selectAs(Worktype::getName,SettleClaims::getWorktypeName)
+ .selectAs(InsuranceApply::getStartTime,SettleClaims::getBaoxianStartTime)
+ .selectAs(InsuranceApply::getEndTime,SettleClaims::getBaoxianEndTime)
+ .selectAs(DispatchUnit::getName,SettleClaims::getDuName)
+ .leftJoin(Company.class,Company::getId,SettleClaims::getCompanyId)
.leftJoin(Member.class,Member::getId,SettleClaims::getMemberId)
- .leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
.leftJoin(DispatchUnit.class,DispatchUnit::getId,SettleClaims::getDuId)
.leftJoin(Worktype.class,Worktype::getId,SettleClaims::getWorktypeId)
- .eq(SettleClaims::getId,id)
- .last(" limit 1 ")
- );
-
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
+ .leftJoin(Solutions.class,Solutions::getId,SettleClaims::getSolutionId)
+ .eq(SettleClaims::getId,id);
+ SettleClaims settleClaims = settleClaimsJoinMapper.selectJoinOne(SettleClaims.class,queryWrapper);
+ if(settleClaims == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
.lambda().eq(Multifile::getObjId,id)
.eq(Multifile::getIsdeleted,Constants.ZERO)
.orderByAsc(Multifile::getCreateDate)
);
+ String rPath = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode();
+ String path = rPath+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.SETTLE_FILE).getCode();
+ if(multifileList!=null){
+ for(Multifile f : multifileList){
+ if(f!=null&& StringUtils.isNotBlank(f.getFileurl())){
+ f.setFileurlFull(path+f.getFileurl());
+ }
+ }
+ }
+ Multifile baoxiandanFile = multifileMapper.selectOne(new QueryWrapper<Multifile>()
+ .lambda().eq(Multifile::getObjId,settleClaims.getInsuranceApplyId())
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.MultiFile.BD_DONE_PDF.getKey())
+ .last("limit 1"));
+ if(baoxiandanFile!=null&& StringUtils.isNotBlank(baoxiandanFile.getFileurl())){
+ path = rPath+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+ baoxiandanFile.setFileurlFull(path+baoxiandanFile.getFileurl());
+ }
+ settleClaims.setBaoxiandanFile(baoxiandanFile);//淇濋櫓鍗�
if(CollectionUtils.isNotEmpty(multifileList)){
settleClaims.setReportFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_SGXC_FILE.getKey())).collect(Collectors.toList()));
@@ -450,17 +482,17 @@
settleClaims.setDisabilityFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_SCZL_FILE.getKey())).collect(Collectors.toList()));
settleClaims.setCompensationFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_JACL_FILE.getKey())).collect(Collectors.toList()));
-
}
//鏌ヨ鎿嶄綔璁板綍
List<SettleClaimsLog> settleClaimsLogList = settleClaimsLogJoinMapper.selectJoinList(SettleClaimsLog.class,
new MPJLambdaWrapper<SettleClaimsLog>()
.selectAll(SettleClaimsLog.class)
- .selectAs(Member::getName,SettleClaimsLog::getCreatorName)
+ .selectAs(SystemUser::getRealname,SettleClaimsLog::getCreatorName)
+ .selectAs(SystemUser::getType,SettleClaimsLog::getCreatorType)
.selectAs(Company::getName,SettleClaimsLog::getCompanyName)
- .leftJoin(Member.class,Member::getId,SettleClaimsLog::getCreator)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(SystemUser.class,SystemUser::getId,SettleClaimsLog::getCreator)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
.eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
.orderByAsc(SettleClaimsLog::getCreateDate)
);
@@ -640,6 +672,7 @@
@Override
public SettleClaims findById(Integer id) {
+
return settleClaimsMapper.selectById(id);
}
@@ -658,109 +691,142 @@
@Override
public PageData<SettleClaims> findPage(PageWrap<SettleClaims> pageWrap) {
IPage<SettleClaims> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<SettleClaims> queryWrapper = new QueryWrapper<>();
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Utils.MP.blankToNull(pageWrap.getModel());
+ MPJLambdaWrapper<SettleClaims> queryWrapper = new MPJLambdaWrapper<SettleClaims>();
+ queryWrapper.selectAll(SettleClaims.class)
+ .selectAs(Company::getName,SettleClaims::getCompanyName)
+ .selectAs(Solutions::getName,SettleClaims::getSolutionName)
+ .selectAs(Member::getName,SettleClaims::getMemberName)
+ .selectAs(Worktype::getName,SettleClaims::getWorktypeName)
+ .selectAs(InsuranceApply::getStartTime,SettleClaims::getBaoxianStartTime)
+ .selectAs(DispatchUnit::getName,SettleClaims::getDuName)
+ .leftJoin(Company.class,Company::getId,SettleClaims::getCompanyId)
+ .leftJoin(Member.class,Member::getId,SettleClaims::getMemberId)
+ .leftJoin(DispatchUnit.class,DispatchUnit::getId,SettleClaims::getDuId)
+ .leftJoin(Worktype.class,Worktype::getId,SettleClaims::getWorktypeId)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
+ .leftJoin(Solutions.class,Solutions::getId,SettleClaims::getSolutionId);
+ queryWrapper.eq(DispatchUnit::getIsdeleted,Constants.ZERO);
+ if(Constants.equalsInteger(user.getType(),Constants.ZERO)){
+ //鍙兘鐪嬫潈闄愯寖鍥村唴
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ queryWrapper. eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
+ }else {
+ queryWrapper. in(Company::getId, user.getCompanyIdList());
+ }
+ } else {
+ //浼佷笟鐢ㄦ埛鍙湅鑷繁鐨勬暟鎹�
+ pageWrap.getModel().setCompanyId(user.getCompanyId());
+ }
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),Member::getName, pageWrap.getModel().getMemberName());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDuName()),DispatchUnit::getName, pageWrap.getModel().getDuName());
+ queryWrapper.eq(pageWrap.getModel().getBaseSolutionId()!=null,Solutions::getBaseId, pageWrap.getModel().getBaseSolutionId());
+ queryWrapper.eq(pageWrap.getModel().getBaseDuId()!=null,DispatchUnit::getBaseId, pageWrap.getModel().getBaseDuId());
+
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(SettleClaims::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(SettleClaims::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(SettleClaims::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(SettleClaims::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(SettleClaims::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(SettleClaims::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(SettleClaims::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(SettleClaims::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(SettleClaims::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(SettleClaims::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(SettleClaims::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(SettleClaims::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(SettleClaims::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(SettleClaims::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(SettleClaims::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(SettleClaims::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(SettleClaims::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(SettleClaims::getSortnum, pageWrap.getModel().getSortnum());
+ queryWrapper.eq(SettleClaims::getSortnum, pageWrap.getModel().getSortnum());
}
if (pageWrap.getModel().getSolutionId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getSolutionId, pageWrap.getModel().getSolutionId());
+ queryWrapper.eq(SettleClaims::getSolutionId, pageWrap.getModel().getSolutionId());
}
if (pageWrap.getModel().getCompanyId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getCompanyId, pageWrap.getModel().getCompanyId());
+ queryWrapper.eq(SettleClaims::getCompanyId, pageWrap.getModel().getCompanyId());
}
if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.eq(SettleClaims::getMemberId, pageWrap.getModel().getMemberId());
}
if (pageWrap.getModel().getHappenTime() != null) {
- queryWrapper.lambda().eq(SettleClaims::getHappenTime, pageWrap.getModel().getHappenTime());
+ queryWrapper.eq(SettleClaims::getHappenTime, pageWrap.getModel().getHappenTime());
}
if (pageWrap.getModel().getIdcardNo() != null) {
- queryWrapper.lambda().ge(SettleClaims::getIdcardNo, Utils.Date.getStart(pageWrap.getModel().getIdcardNo()));
- queryWrapper.lambda().le(SettleClaims::getIdcardNo, Utils.Date.getEnd(pageWrap.getModel().getIdcardNo()));
+ queryWrapper.eq(SettleClaims::getIdcardNo, pageWrap.getModel().getIdcardNo());
+
}
if (pageWrap.getModel().getDuId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getDuId, pageWrap.getModel().getDuId());
+ queryWrapper.eq(SettleClaims::getDuId, pageWrap.getModel().getDuId());
}
if (pageWrap.getModel().getWorktypeId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getWorktypeId, pageWrap.getModel().getWorktypeId());
+ queryWrapper.eq(SettleClaims::getWorktypeId, pageWrap.getModel().getWorktypeId());
}
if (pageWrap.getModel().getFee() != null) {
- queryWrapper.lambda().eq(SettleClaims::getFee, pageWrap.getModel().getFee());
+ queryWrapper.eq(SettleClaims::getFee, pageWrap.getModel().getFee());
}
if (pageWrap.getModel().getCheckInfo() != null) {
- queryWrapper.lambda().eq(SettleClaims::getCheckInfo, pageWrap.getModel().getCheckInfo());
+ queryWrapper.eq(SettleClaims::getCheckInfo, pageWrap.getModel().getCheckInfo());
}
if (pageWrap.getModel().getCheckUserId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getCheckUserId, pageWrap.getModel().getCheckUserId());
+ queryWrapper.eq(SettleClaims::getCheckUserId, pageWrap.getModel().getCheckUserId());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(SettleClaims::getCode, pageWrap.getModel().getCode());
+ queryWrapper.eq(SettleClaims::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(SettleClaims::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(SettleClaims::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(SettleClaims::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(SettleClaims::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getInHospital() != null) {
- queryWrapper.lambda().eq(SettleClaims::getInHospital, pageWrap.getModel().getInHospital());
+ queryWrapper.eq(SettleClaims::getInHospital, pageWrap.getModel().getInHospital());
}
if (pageWrap.getModel().getMedicalInsurance() != null) {
- queryWrapper.lambda().eq(SettleClaims::getMedicalInsurance, pageWrap.getModel().getMedicalInsurance());
+ queryWrapper.eq(SettleClaims::getMedicalInsurance, pageWrap.getModel().getMedicalInsurance());
}
if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(SettleClaims::getContent, pageWrap.getModel().getContent());
+ queryWrapper.eq(SettleClaims::getContent, pageWrap.getModel().getContent());
}
if (pageWrap.getModel().getInformantName() != null) {
- queryWrapper.lambda().eq(SettleClaims::getInformantName, pageWrap.getModel().getInformantName());
+ queryWrapper.eq(SettleClaims::getInformantName, pageWrap.getModel().getInformantName());
}
if (pageWrap.getModel().getInformantPhone() != null) {
- queryWrapper.lambda().eq(SettleClaims::getInformantPhone, pageWrap.getModel().getInformantPhone());
+ queryWrapper.eq(SettleClaims::getInformantPhone, pageWrap.getModel().getInformantPhone());
}
if (pageWrap.getModel().getAreaId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getAreaId, pageWrap.getModel().getAreaId());
+ queryWrapper.eq(SettleClaims::getAreaId, pageWrap.getModel().getAreaId());
}
if (pageWrap.getModel().getAreaInfo() != null) {
- queryWrapper.lambda().eq(SettleClaims::getAreaInfo, pageWrap.getModel().getAreaInfo());
+ queryWrapper.eq(SettleClaims::getAreaInfo, pageWrap.getModel().getAreaInfo());
}
if (pageWrap.getModel().getReportNum() != null) {
- queryWrapper.lambda().eq(SettleClaims::getReportNum, pageWrap.getModel().getReportNum());
+ queryWrapper.eq(SettleClaims::getReportNum, pageWrap.getModel().getReportNum());
}
if (pageWrap.getModel().getInsuranceApplyId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getInsuranceApplyId, pageWrap.getModel().getInsuranceApplyId());
+ queryWrapper.eq(SettleClaims::getInsuranceApplyId, pageWrap.getModel().getInsuranceApplyId());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ queryWrapper.orderByAsc(SettleClaims::getCreateDate);
+ /*for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
} else {
queryWrapper.orderByAsc(sortData.getProperty());
}
- }
- return PageData.from(settleClaimsMapper.selectPage(page, queryWrapper));
+ }*/
+ PageData<SettleClaims> pageData = PageData.from(settleClaimsJoinMapper.selectJoinPage(page,SettleClaims.class, queryWrapper));
+ return pageData;
}
@Override
--
Gitblit v1.9.3