From 0a35a0ebbe694b87f2531d133b3be6b95bd62c69 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 五月 2024 14:21:17 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OpearaUnionChange.vue | 2
company/src/components/business/OperaApplyChangeCheckWindow.vue | 415 ++++++++++++++++---------------
company/.env.developmentShop | 4
company/src/components/business/OperaUnionChangeCheckWindow.vue | 24 +
company/src/components/business/UnionChangeDetails.vue | 48 ++-
company/src/components/business/OperaUnionChangeDetailWindow.vue | 9
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 221 ++++++++--------
7 files changed, 393 insertions(+), 330 deletions(-)
diff --git a/company/.env.developmentShop b/company/.env.developmentShop
index b5bdc65..bfbe86e 100644
--- a/company/.env.developmentShop
+++ b/company/.env.developmentShop
@@ -5,8 +5,8 @@
# VUE_APP_API_PREFIX = '/yyb_admin_api'
VUE_APP_COOKIE_NAME='dmshop-auth-token'
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-鍟嗘埛绔�'
-VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'
+#VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'
# VUE_APP_API = 'http://192.168.0.143:10032/'
-#VUE_APP_API = 'http://localhost:10032/'
+VUE_APP_API = 'http://localhost:10032/'
diff --git a/company/src/components/business/OpearaUnionChange.vue b/company/src/components/business/OpearaUnionChange.vue
index 5b3991c..aa953ed 100644
--- a/company/src/components/business/OpearaUnionChange.vue
+++ b/company/src/components/business/OpearaUnionChange.vue
@@ -15,7 +15,7 @@
<span style="color: #F95601; font-size: 14px;">锛�1. 璇烽�夋嫨淇濋櫓鍗曞悗杩涜鎿嶄綔锛�</span>
</div>
</el-form-item>
- <el-form-item label="鎵瑰崟鐢熸晥璧锋湡锛�" prop="applyDate" style="margin-left: 40px">
+ <el-form-item label="鐢宠鏃ユ湡锛�" prop="applyDate" style="margin-left: 40px">
<div style="display: flex; flex-direction: column;">
<el-date-picker
v-model="form.applyDate"
diff --git a/company/src/components/business/OperaApplyChangeCheckWindow.vue b/company/src/components/business/OperaApplyChangeCheckWindow.vue
index 7450712..3b97ea4 100644
--- a/company/src/components/business/OperaApplyChangeCheckWindow.vue
+++ b/company/src/components/business/OperaApplyChangeCheckWindow.vue
@@ -18,8 +18,10 @@
<!-- 涓婁紶淇濋櫓鍗� -->
<div v-if="visible3==true" class="form">
<div class="form_item">
- <div class="form_item_label">瀹㈡埛鏈熸湜鎵瑰崟鐢熸晥璧锋湡锛�</div>
+ <div class="form_item_label">鏈熸湜鎵瑰鐢熸晥鏃ユ湡锛�</div>
<div class="form_item_val">{{ model.applyStartTime }}</div>
+ <div class="form_item_label">鏈熸湜鎵瑰噺鐢熸晥鏃ユ湡锛�</div>
+ <div class="form_item_val">{{ model.delValidTime }}</div>
</div>
<div class="form_item">
<div class="form_item_label">鎵瑰崟鐢熸晥璧锋湡鏄惁涓�鑷达細</div>
@@ -31,7 +33,7 @@
</div>
</div>
<div class="form_item" v-if="form.selectRadio === 1">
- <div class="form_item_label"><span>*</span>鎵瑰崟鐢熸晥璧锋湡锛�</div>
+ <div class="form_item_label"><span>*</span>鎵瑰鐢熸晥鏃ユ湡锛�</div>
<div class="form_item_val">
<el-date-picker
v-model="form.applyStartTime"
@@ -41,9 +43,22 @@
</el-date-picker>
</div>
</div>
+ <div class="form_item" v-if="form.selectRadio === 1">
+ <div class="form_item_label"><span>*</span>鎵瑰噺鐢熸晥鏃ユ湡锛�</div>
+ <div class="form_item_val">
+ <el-date-picker
+ v-model="form.delValidTime"
+ type="date"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </div>
+ </div>
<div class="form_item">
- <div class="form_item_label">鎵瑰崟鐢熸晥璧锋湡锛�</div>
+ <div class="form_item_label">鎵瑰鐢熸晥鏃ユ湡锛�</div>
<div class="form_item_val">{{ form.applyStartTime }}</div>
+ <div class="form_item_label">鎵瑰噺鐢熸晥鏃ユ湡锛�</div>
+ <div class="form_item_val">{{ form.delValidTime }}</div>
</div>
<div class="form_item">
<div class="form_item_label"><span>*</span>鎵瑰崟鍙凤細</div>
@@ -61,8 +76,10 @@
<!-- 淇敼淇濋櫓鍗� -->
<div v-if="visible4==true" class="form">
<div class="form_item">
- <div class="form_item_label">鎵瑰崟鐢熸晥璧锋湡锛�</div>
+ <div class="form_item_label">鎵瑰鐢熸晥鏃ユ湡锛�</div>
<div class="form_item_val">{{ model.applyStartTime }}</div>
+ <div class="form_item_label">鎵瑰噺鐢熸晥鏃ユ湡锛�</div>
+ <div class="form_item_val">{{ model.delValidTime }}</div>
</div>
<div class="form_item">
<div class="form_item_label"><span>*</span>鎵瑰崟鍙凤細</div>
@@ -121,225 +138,233 @@
export default {
name: 'OperaApplyChangeCheckWindow',
extends: BaseOpera,
- components: {UploadFile, GlobalWindow },
+ components: { UploadFile, GlobalWindow },
data () {
return {
// 琛ㄥ崟鏁版嵁
model: {},
- falg :0,
+ falg: 0,
form: {
- id: null,
- backCheckInfo:'',
- dealBackInfo:'',
- editCheckInfo:'',
- editValidCode: '',
- applyStartTime:null,
- validCode:null,
- pidanFile:null,
- editPidanFile:null,
- fileList1: [],
- fileList2: [],
- selectRadio:0
+ id: null,
+ backCheckInfo: '',
+ dealBackInfo: '',
+ editCheckInfo: '',
+ editValidCode: '',
+ applyStartTime: null,
+ delValidTime: null,
+ validCode: null,
+ pidanFile: null,
+ editPidanFile: null,
+ fileList1: [],
+ fileList2: [],
+ selectRadio: 0
},
visible1: false,
visible3: false,
visible4: false,
visible5: false,
- visible6: false,
+ visible6: false
}
},
created () {
- this.config({
- api: '/business/insuranceApply',
- 'field.id': 'id'
- })
+ this.config({
+ api: '/business/insuranceApply',
+ 'field.id': 'id'
+ })
},
methods: {
- open(title,target,flag){
- this.visible=true
- this.model={}
- this.form= {
- id: null,
- backCheckInfo:'',
- dealBackInfo:'',
- editCheckInfo:'',
- editValidCode: '',
- applyStartTime:null,
- validCode:null,
- pidanFile:null,
- editPidanFile:null,
- fileList1: [],
- fileList2: [],
- selectRadio:0
- },
- this.model=target
- this.form.applyStartTime=this.model.applyStartTime
- this.form.editValidCode=this.model.validCode
- this.title=title
- this.flag = flag
- this.visible1 = false
- this.visible3 = false
- this.visible4 = false
- this.visible5 = false
- this.visible6 = false
- if(flag == 1){
- this.visible1 = true
- }
- if(flag == 3){
- this.visible3 = true
- }
- if(flag == 4){
- this.visible4 = true
- }
- if(flag == 5){
- this.visible5 = true
- }
- if(flag == 6){
- this.visible6 = true
- }
- },
- doSubmit(){
+ open (title, target, flag) {
+ this.visible = true
+ this.model = {}
+ this.form = {
+ id: null,
+ backCheckInfo: '',
+ dealBackInfo: '',
+ editCheckInfo: '',
+ editValidCode: '',
+ delValidTime: null,
+ applyStartTime: null,
+ validCode: null,
+ pidanFile: null,
+ editPidanFile: null,
+ fileList1: [],
+ fileList2: [],
+ selectRadio: 0
+ },
+ this.model = target
+ this.form.applyStartTime = this.model.applyStartTime
+ this.form.delValidTime = this.model.delValidTime
+ this.form.editValidCode = this.model.validCode
+ this.title = title
+ this.flag = flag
+ this.visible1 = false
+ this.visible3 = false
+ this.visible4 = false
+ this.visible5 = false
+ this.visible6 = false
+ if (flag == 1) {
+ this.visible1 = true
+ }
+ if (flag == 3) {
+ this.visible3 = true
+ }
+ if (flag == 4) {
+ this.visible4 = true
+ }
+ if (flag == 5) {
+ this.visible5 = true
+ }
+ if (flag == 6) {
+ this.visible6 = true
+ }
+ },
+ doSubmit () {
if (this.flag == 1) {
- if (!this.form.backCheckInfo) {
- this.$message.warning('璇疯緭鍏ラ��鍥炶鏄�')
- return
- }
+ if (!this.form.backCheckInfo) {
+ this.$message.warning('璇疯緭鍏ラ��鍥炶鏄�')
+ return
+ }
this.backDo()
} else if (this.flag == 3) {
- if (this.form.selectRadio === 1 && !this.form.applyStartTime) {
- this.$message.warning('璇烽�夋嫨鎵瑰崟鐢熸晥璧锋湡')
- return
- }
- if (!this.form.validCode) {
- this.$message.warning('璇疯緭鍏ユ壒鍗曞彿')
- return
- }
- if (!this.form.pidanFile) {
- this.$message.warning('璇蜂笂浼犳壒鍗�')
- return
- }
+ if (this.form.selectRadio === 1 && !this.form.applyStartTime) {
+ this.$message.warning('璇烽�夋嫨鎵瑰鐢熸晥鏃ユ湡')
+ return
+ }
+ if (this.form.selectRadio === 1 && !this.form.delValidTime) {
+ this.$message.warning('璇烽�夋嫨鎵瑰噺鐢熸晥鏃ユ湡')
+ return
+ }
+ if (!this.form.validCode) {
+ this.$message.warning('璇疯緭鍏ユ壒鍗曞彿')
+ return
+ }
+ if (!this.form.pidanFile) {
+ this.$message.warning('璇蜂笂浼犳壒鍗�')
+ return
+ }
this.uploadPidan()
} else if (this.flag == 4) {
- if (!this.form.editValidCode) {
- this.$message.warning('璇疯緭鍏ユ壒鍗曞彿')
- return
- }
- if (!this.form.editPidanFile) {
- this.$message.warning('璇蜂笂浼犳壒鍗�')
- return
- }
- if (!this.form.editCheckInfo) {
- this.$message.warning('璇疯緭鍏ヤ慨鏀瑰師鍥�')
- return
- }
+ if (!this.form.editValidCode) {
+ this.$message.warning('璇疯緭鍏ユ壒鍗曞彿')
+ return
+ }
+ if (!this.form.editPidanFile) {
+ this.$message.warning('璇蜂笂浼犳壒鍗�')
+ return
+ }
+ if (!this.form.editCheckInfo) {
+ this.$message.warning('璇疯緭鍏ヤ慨鏀瑰師鍥�')
+ return
+ }
this.editPidan()
} else if (this.flag == 5) {
- if (!this.form.dealBackInfo) {
- this.$message.warning('璇疯緭鍏ヨ鏄�')
- return
- }
+ if (!this.form.dealBackInfo) {
+ this.$message.warning('璇疯緭鍏ヨ鏄�')
+ return
+ }
this.dealBackApply(1)
} else if (this.flag == 6) {
- if (!this.form.dealBackInfo) {
- this.$message.warning('璇疯緭鍏ラ��鍥炶鏄�')
- return
- }
+ if (!this.form.dealBackInfo) {
+ this.$message.warning('璇疯緭鍏ラ��鍥炶鏄�')
+ return
+ }
this.dealBackApply(0)
}
},
- selectChange(){
- if(this.form.selectRadio == 0){
- this.form.applyStartTime = this.model.validTime
- }else{
- this.form.applyStartTime = ''
- }
- },
- baoxianFileUploaded(data){
- this.form.pidanFile=data
- },
- editBaoxianFileUploaded(data){
- this.form.editPidanFile=data
- },
- backDo(){
- this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
- .then(() => {
- this.isWorking = true
- backChagne({id:this.model.id,checkInfo:this.form.backCheckInfo})
- .then(response => {
- this.visible = false
- this.$emit('success')
- }).catch(err => {
- this.$tip.apiFailed(err)
- })
- })
- },
- dealBackApply(type){
- this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
- .then(() => {
- this.isWorking = true
- dealBackChangeApply({ id: this.model.id, checkInfo: this.form.dealBackInfo, dealBackApply: type })
- .then(response => {
- this.visible = false
- this.$emit('success')
- }).catch(err => {
- this.$tip.apiFailed(err)
- })
- })
- },
- uploadPidan(){
- this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
- .then(() => {
- this.isWorking = true
- uploadChangePidan({id:this.model.id,applyStartTime:this.form.applyStartTime, validCode:this.form.validCode,pidanFile:this.form.pidanFile})
- .then(response => {
- this.visible = false
- this.$emit('success')
- }).catch(err => {
- this.$tip.apiFailed(err)
- })
- })
-
- },
- editPidan(){
- this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
- .then(() => {
- this.isWorking = true
- editChangePidan({id:this.model.id, checkInfo:this.form.editCheckInfo,validCode:this.form.editValidCode,pidanFile:this.form.editPidanFile})
- .then(response => {
- this.visible = false
- this.$emit('success')
- }).catch(err => {
- this.$tip.apiFailed(err)
- })
- })
- },
- handleRemove(file, fileList) {
- console.log(file, fileList);
- },
- handlePreview(file) {
- console.log(file);
- },
- handleExceed(files, fileList) {
- this.$message.warning(`褰撳墠闄愬埗閫夋嫨 3 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶);
- },
- beforeRemove(file, fileList) {
- return this.$confirm(`纭畾绉婚櫎 ${ file.name }锛焋);
- },
- successEvent() {
-
- },
- handleSizeChange(val) {
- console.log(`姣忛〉 ${val} 鏉);
- },
- handleCurrentChange(val) {
- console.log(`褰撳墠椤�: ${val}`);
- },
- handleClick(tab, event) {
- console.log(tab, event);
- },
- onSubmit() {
-
+ selectChange () {
+ if (this.form.selectRadio == 0) {
+ this.form.applyStartTime = this.model.applyStartTime
+ this.form.delValidTime = this.model.delValidTime
+ } else {
+ // this.form.applyStartTime = ''
+ // this.form.delValidTime = ''
}
+ },
+ baoxianFileUploaded (data) {
+ this.form.pidanFile = data
+ },
+ editBaoxianFileUploaded (data) {
+ this.form.editPidanFile = data
+ },
+ backDo () {
+ this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
+ .then(() => {
+ this.isWorking = true
+ backChagne({ id: this.model.id, checkInfo: this.form.backCheckInfo })
+ .then(response => {
+ this.visible = false
+ this.$emit('success')
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ })
+ },
+ dealBackApply (type) {
+ this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
+ .then(() => {
+ this.isWorking = true
+ dealBackChangeApply({ id: this.model.id, checkInfo: this.form.dealBackInfo, dealBackApply: type })
+ .then(response => {
+ this.visible = false
+ this.$emit('success')
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ })
+ },
+ uploadPidan () {
+ this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
+ .then(() => {
+ this.isWorking = true
+ uploadChangePidan({ id: this.model.id, applyStartTime: this.form.applyStartTime, delValidTime: this.form.delValidTime, validCode: this.form.validCode, pidanFile: this.form.pidanFile })
+ .then(response => {
+ this.visible = false
+ this.$emit('success')
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ })
+ },
+ editPidan () {
+ this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
+ .then(() => {
+ this.isWorking = true
+ editChangePidan({ id: this.model.id, checkInfo: this.form.editCheckInfo, validCode: this.form.editValidCode, pidanFile: this.form.editPidanFile })
+ .then(response => {
+ this.visible = false
+ this.$emit('success')
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ })
+ },
+ handleRemove (file, fileList) {
+ console.log(file, fileList)
+ },
+ handlePreview (file) {
+ console.log(file)
+ },
+ handleExceed (files, fileList) {
+ this.$message.warning(`褰撳墠闄愬埗閫夋嫨 3 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶)
+ },
+ beforeRemove (file, fileList) {
+ return this.$confirm(`纭畾绉婚櫎 ${file.name}锛焋)
+ },
+ successEvent () {
+
+ },
+ handleSizeChange (val) {
+ console.log(`姣忛〉 ${val} 鏉)
+ },
+ handleCurrentChange (val) {
+ console.log(`褰撳墠椤�: ${val}`)
+ },
+ handleClick (tab, event) {
+ console.log(tab, event)
+ },
+ onSubmit () {
+
+ }
}
}
</script>
diff --git a/company/src/components/business/OperaUnionChangeCheckWindow.vue b/company/src/components/business/OperaUnionChangeCheckWindow.vue
index 367b56b..94e5c04 100644
--- a/company/src/components/business/OperaUnionChangeCheckWindow.vue
+++ b/company/src/components/business/OperaUnionChangeCheckWindow.vue
@@ -14,8 +14,13 @@
</el-form>
<!-- 涓婁紶淇濋櫓鍗� -->
<el-form v-if="visible3==true" :model="form" ref="form3" :rules="rules3" style="width: 100%;">
- <el-form-item label="鏈熸湜淇濋櫓鐢熸晥鏈燂細">
- <span >{{( form.applyTime|| '-')}} </span>
+ <el-form-item >
+ <div style="display: inline;margin-right: 50px;" >
+ 鏈熸湜鎵瑰鐢熸晥鏈燂細 {{( form.applyTime|| '-')}}
+ </div>
+ <div style="display: inline" >
+ 鏈熸湜鎵瑰噺鐢熸晥鏈燂細 {{( form.delValidTime|| '-')}}
+ </div>
</el-form-item>
<el-form-item label="" >
<el-radio-group v-model="form.selectRadio" @change="selectChange">
@@ -23,9 +28,17 @@
<el-radio :label="1" >涓庝繚鍗曚笉涓�鑷�</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�" prop="applyTime" v-if="form.selectRadio === 1">
+ <el-form-item label="鎵瑰鐢熸晥鏃ユ湡锛�" prop="applyTime" v-if="form.selectRadio === 1">
<el-date-picker
v-model="form.applyTime"
+ type="date"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鎵瑰噺鐢熸晥鏃ユ湡锛�" prop="delValidTime" v-if="form.selectRadio === 1">
+ <el-date-picker
+ v-model="form.delValidTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨鏃ユ湡">
@@ -107,6 +120,7 @@
id: null,
backCheckInfo: '',
applyTime: null,
+ delValidTime: null,
code: null,
baoxianFile: null,
bxdMultifileList: [],
@@ -146,6 +160,7 @@
startTime: null,
code: null,
baoxianFile: null,
+ delValidTime: null,
bxdMultifileList:[],
fileList1: [],
selectRadio: 0,
@@ -154,6 +169,7 @@
this.model = target
this.form.applyTime = target.applyStartTime
+ this.form.delValidTime = target.delValidTime
this.title = title
this.flag = flag
this.visible1 = false
@@ -195,6 +211,7 @@
selectChange () {
if (this.form.selectRadio == 0) {
this.form.applyTime = this.model.applyStartTime
+ this.form.delValidTime = this.model.delValidTime
}
},
baoxianFileUploaded (data) {
@@ -224,6 +241,7 @@
var param ={
id: this.model.id,
applyDate: this.form.applyTime,
+ delValidTime: this.form.delValidTime,
code: this.form.code,
fileurl: this.form.baoxianFile.fileurl,
name: this.form.baoxianFile.name,
diff --git a/company/src/components/business/OperaUnionChangeDetailWindow.vue b/company/src/components/business/OperaUnionChangeDetailWindow.vue
index c5d1a1b..17b84e4 100644
--- a/company/src/components/business/OperaUnionChangeDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeDetailWindow.vue
@@ -89,6 +89,11 @@
align="center"
label="璐圭敤鍙樻洿锛堝厓锛�">
</el-table-column>
+ <el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
</el-table>
</div>
<div class="desc_item_cate">
@@ -146,6 +151,10 @@
prop="fee"
label="宸蹭骇鐢熻垂鐢紙鍏冿級">
</el-table-column>
+ <el-table-column
+ prop="remark"
+ label="澶囨敞">
+ </el-table-column>
</el-table>
<div class="desc_item_from_page">
<el-pagination
diff --git a/company/src/components/business/UnionChangeDetails.vue b/company/src/components/business/UnionChangeDetails.vue
index a07bb67..10819d7 100644
--- a/company/src/components/business/UnionChangeDetails.vue
+++ b/company/src/components/business/UnionChangeDetails.vue
@@ -12,30 +12,32 @@
</div>
<div class="box_table">
<div class="box_table_head">
- <div class="box_table_head_item">鎶曚繚浜�</div>
- <div class="box_table_head_item">淇濋櫓鏂规</div>
+ <div class="box_table_head_item" style="flex: 1.5">鎶曚繚浜�</div>
+ <div class="box_table_head_item" style="flex: 1.5">淇濋櫓鏂规</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥璧锋湡</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
<div class="box_table_head_item">淇濆崟鍙�</div>
- <div class="box_table_head_item">鍔犱繚浜烘暟</div>
- <div class="box_table_head_item">鍑忎繚浜烘暟</div>
- <div class="box_table_head_item">鎵瑰崟鐢熸晥鏈�</div>
+ <div class="box_table_head_item" style="flex: 0.5">鍔犱繚浜烘暟</div>
+ <div class="box_table_head_item" style="flex: 0.5">鍑忎繚浜烘暟</div>
+ <div class="box_table_head_item">鎵瑰鐢熸晥鏃ユ湡</div>
+ <div class="box_table_head_item">鎵瑰噺鐢熸晥鏃ユ湡</div>
</div>
<div class="box_table_content " >
- <div class="box_table_content_item box_table_content_header">{{ model.shopName }}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.solutionsName }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 1.5">{{ model.shopName }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 1.5">{{ model.solutionsName }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.startTime }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.endTime }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.applyCode }}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.addNum}}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.delNum}}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 0.5">{{ model.addNum}}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 0.5">{{ model.delNum}}</div>
<div class="box_table_content_item box_table_content_header">{{ model.applyStartTime}}</div>
+ <div class="box_table_content_item box_table_content_header">{{ model.delValidTime}}</div>
</div>
</div>
<div class="box_table">
<div class="box_table_head box_table_content">
- <div class="box_table_head_item" style=" flex: 1;border-bottom: 0px">琚繚闄╀汉</div>
- <div class="box_table_content_item box_table_content_header" style=" flex: 7;">
+ <div class="box_table_head_item" style=" flex: 1.5;border-bottom: 0px">琚繚闄╀汉</div>
+ <div class="box_table_content_item box_table_content_header" style=" flex: 7.5;">
<p v-for="(item, index) in companyList" :key="index" >
{{index>0?'锛�':''}} {{ item[1]}}
</p>
@@ -47,22 +49,24 @@
<div class="box_table_head_item1">鍔犱繚鍛樺伐</div>
</div>
<div class="box_table_head">
- <div class="box_table_head_item">搴忓彿</div>
+ <div class="box_table_head_item" style="flex: 0.5">搴忓彿</div>
<div class="box_table_head_item">鍛樺伐濮撳悕</div>
- <div class="box_table_head_item">鎬у埆</div>
+ <div class="box_table_head_item" style="flex: 0.5">鎬у埆</div>
<div class="box_table_head_item">韬唤璇佸彿</div>
<div class="box_table_head_item">琚繚闄╀汉</div>
<div class="box_table_head_item">娲鹃仯鍗曚綅</div>
<div class="box_table_head_item">鎵�灞炲伐绉�</div>
+ <div class="box_table_head_item">澶囨敞</div>
</div>
<div class="box_table_content" v-for="(item, index) in addList" :key="index">
- <div class="box_table_content_item">{{(index + 1)}}</div>
+ <div class="box_table_content_item" style="flex: 0.5">{{(index + 1)}}</div>
<div class="box_table_content_item" >{{ item.memberName }}</div>
- <div class="box_table_content_item">{{ item.sex==0?"鐢�":(item.sex==1?"濂�":"" )}}</div>
+ <div class="box_table_content_item" style="flex: 0.5">{{ item.sex==0?"鐢�":(item.sex==1?"濂�":"" )}}</div>
<div class="box_table_content_item">{{ item.memberIdcardNo }}</div>
<div class="box_table_content_item">{{ item.companyName }}</div>
<div class="box_table_content_item">{{ item.duName }}</div>
<div class="box_table_content_item">{{item.workTypeName}}</div>
+ <div class="box_table_content_item">{{item.remark}}</div>
</div>
</div>
<div class="box_table" v-if="delList && delList.length>0">
@@ -70,22 +74,24 @@
<div class="box_table_head_item1">鍑忎繚鍛樺伐</div>
</div>
<div class="box_table_head">
- <div class="box_table_head_item">搴忓彿</div>
- <div class="box_table_head_item">鍛樺伐濮撳悕</div>
+ <div class="box_table_head_item" style="flex: 0.5">搴忓彿</div>
+ <div class="box_table_head_item" >鍛樺伐濮撳悕</div>
<div class="box_table_head_item">韬唤璇佸彿</div>
<div class="box_table_head_item">琚繚闄╀汉</div>
- <div class="box_table_head_item">鎬у埆</div>
+ <div class="box_table_head_item" style="flex: 0.5">鎬у埆</div>
<div class="box_table_head_item">娲鹃仯鍗曚綅</div>
<div class="box_table_head_item">鎵�灞炲伐绉�</div>
+ <div class="box_table_head_item">澶囨敞</div>
</div>
<div class="box_table_content" v-for="(item, index) in delList" :key="index">
- <div class="box_table_content_item">{{(index + 1)}}</div>
+ <div class="box_table_content_item" style="flex: 0.5">{{(index + 1)}}</div>
<div class="box_table_content_item" >{{ item.memberName }}</div>
- <div class="box_table_content_item">{{ item.sex==0?"鐢�":(item.sex==1?"濂�":"" )}}</div>
+ <div class="box_table_content_item" style="flex: 0.5">{{ item.sex==0?"鐢�":(item.sex==1?"濂�":"" )}}</div>
<div class="box_table_content_item">{{ item.memberIdcardNo }}</div>
<div class="box_table_content_item">{{ item.companyName }}</div>
<div class="box_table_content_item">{{ item.duName }}</div>
<div class="box_table_content_item">{{item.workTypeName}}</div>
+ <div class="box_table_content_item">{{item.remark}}</div>
</div>
</div>
<div class="box_table" v-if="type==1" style="border-top: 0px solid #b4bbc5;" >
@@ -365,6 +371,8 @@
display: flex;
align-items: center;
justify-content: center;
+ word-wrap: break-word;
+ word-break: break-all;
font-size: 14px;
color: black;
border-right: 1px solid #b4bbc5;
diff --git a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
index 1729e96..a6c7e4b 100644
--- a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
+++ b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
@@ -1597,14 +1597,14 @@
try {
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
- for (int i = 0; i < 8; i++) {
- sheet.setColumnWidth(i, ((i==0|| i==1|| i== 3|| i== 4|| i== 7)?16:8) * 2 * 256);
+ for (int i = 0; i < 9; i++) {
+ sheet.setColumnWidth(i, ((i==0|| i==1|| i== 3|| i== 4|| i== 7|| i== 8)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
- sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,8));
Row title = sheet.createRow(0);
title.setHeight((short) 2000);
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 9; i++) {
title.createCell(i).setCellValue(i==0?sheetName:"");
configTitleCell(sxssfWorkbook,title.getCell(i));
}
@@ -1616,8 +1616,9 @@
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(5).setCellValue("鍔犱繚浜烘暟");
header1.createCell(6).setCellValue("鍑忎繚浜烘暟");
- header1.createCell(7).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
- for (int i = 0; i < 8; i++) {
+ header1.createCell(7).setCellValue("鎵瑰鐢熸晥鏃ユ湡");
+ header1.createCell(8).setCellValue("鎵瑰噺鐢熸晥鏃ユ湡");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
@@ -1629,8 +1630,9 @@
header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(5).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList()).size());
header2.createCell(6).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList()).size());
- header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
- for (int i = 0; i < 8; i++) {
+ header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
+ header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getDelValidTime()));
+ for (int i = 0; i < 9; i++) {
configDataCell(sxssfWorkbook, header2.getCell(i));
}
@@ -1643,11 +1645,11 @@
header3.createCell(5).setCellValue("");
header3.createCell(6).setCellValue("");
header3.createCell(7).setCellValue("");
- for (int i = 0; i < 8; i++) {
+ header3.createCell(8).setCellValue("");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header3.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(3 ,3,1,7));
-
+ sheet.addMergedRegion(new CellRangeAddress(3 ,3,1,8));
Integer row = 4;
List<ApplyChagneDetail> addChangeDetailList = data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(addChangeDetailList)){
@@ -1656,39 +1658,39 @@
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook, header4.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,0,8));
row = row + 1;
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
header5.createCell(1).setCellValue("鍛樺伐濮撳悕");
-// header5.createCell(2).setCellValue("鎬у埆");
- header5.createCell(2).setCellValue("韬唤璇佸彿");
- header5.createCell(3).setCellValue("琚繚闄╀汉");
- header5.createCell(4).setCellValue("娲鹃仯鍗曚綅");
- header5.createCell(5).setCellValue("");
- header5.createCell(6).setCellValue("鎵�灞炲伐绉�");
- header5.createCell(7).setCellValue("澶囨敞");
- for (int i = 0; i < 8; i++) {
+ header5.createCell(2).setCellValue("鎬у埆");
+ header5.createCell(3).setCellValue("韬唤璇佸彿");
+ header5.createCell(4).setCellValue("琚繚闄╀汉");
+ header5.createCell(5).setCellValue("娲鹃仯鍗曚綅");
+ header5.createCell(6).setCellValue("");
+ header5.createCell(7).setCellValue("鎵�灞炲伐绉�");
+ header5.createCell(8).setCellValue("澶囨敞");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
for (int rowIndex = 0; rowIndex < addChangeDetailList.size(); rowIndex++) {
row = row + 1 ;
Row header6 = sheet.createRow(row);
ApplyChagneDetail applyChagneDetail = addChangeDetailList.get(rowIndex);
header6.createCell(0).setCellValue(rowIndex + 1);
header6.createCell(1).setCellValue(applyChagneDetail.getMemberName());
-// header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
- header6.createCell(2).setCellValue(applyChagneDetail.getIdcardNo());
- header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName());
- header6.createCell(4).setCellValue(applyChagneDetail.getDuName());
- header6.createCell(5).setCellValue("");
- header6.createCell(6).setCellValue(applyChagneDetail.getWorkTypeName());
- header6.createCell(7).setCellValue(applyChagneDetail.getRemark());
- for (int i = 0; i < 8; i++) {
- configFirstCell(sxssfWorkbook,header6.getCell(i));
+ header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
+ header6.createCell(3).setCellValue(applyChagneDetail.getIdcardNo());
+ header6.createCell(4).setCellValue(applyChagneDetail.getCompanyName());
+ header6.createCell(5).setCellValue(applyChagneDetail.getDuName());
+ header6.createCell(6).setCellValue("");
+ header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
+ header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
+ for (int i = 0; i < 9; i++) {
+ configDataCell(sxssfWorkbook,header6.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
}
}
@@ -1697,26 +1699,26 @@
if(CollectionUtils.isNotEmpty(reduceChangeDetailList)){
Row header4 = sheet.createRow(row);
header4.createCell(0).setCellValue("鍑忎繚浜哄憳");
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook, header4.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,0,8));
row = row + 1;
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
header5.createCell(1).setCellValue("鍛樺伐濮撳悕");
-// header5.createCell(2).setCellValue("鎬у埆");
- header5.createCell(2).setCellValue("韬唤璇佸彿");
- header5.createCell(3).setCellValue("琚繚闄╀汉");
- header5.createCell(4).setCellValue("娲鹃仯鍗曚綅");
- header5.createCell(5).setCellValue("");
- header5.createCell(6).setCellValue("鎵�灞炲伐绉�");
- header5.createCell(7).setCellValue("澶囨敞");
- for (int i = 0; i < 8; i++) {
+ header5.createCell(2).setCellValue("鎬у埆");
+ header5.createCell(3).setCellValue("韬唤璇佸彿");
+ header5.createCell(4).setCellValue("琚繚闄╀汉");
+ header5.createCell(5).setCellValue("娲鹃仯鍗曚綅");
+ header5.createCell(6).setCellValue("");
+ header5.createCell(7).setCellValue("鎵�灞炲伐绉�");
+ header5.createCell(8).setCellValue("澶囨敞");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
row = row + 1 ;
for (int rowIndex = 0; rowIndex < reduceChangeDetailList.size(); rowIndex++) {
@@ -1725,17 +1727,17 @@
ApplyChagneDetail applyChagneDetail = reduceChangeDetailList.get(rowIndex);
header6.createCell(0).setCellValue(rowIndex + 1);
header6.createCell(1).setCellValue(applyChagneDetail.getMemberName());
-// header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
- header6.createCell(2).setCellValue(applyChagneDetail.getIdcardNo());
- header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName());
- header6.createCell(4).setCellValue(applyChagneDetail.getDuName());
- header6.createCell(5).setCellValue("");
- header6.createCell(6).setCellValue(applyChagneDetail.getWorkTypeName());
- header6.createCell(7).setCellValue(applyChagneDetail.getRemark());
- for (int i = 0; i < 8; i++) {
+ header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
+ header6.createCell(3).setCellValue(applyChagneDetail.getIdcardNo());
+ header6.createCell(4).setCellValue(applyChagneDetail.getCompanyName());
+ header6.createCell(5).setCellValue(applyChagneDetail.getDuName());
+ header6.createCell(6).setCellValue("");
+ header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
+ header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
+ for (int i = 0; i < 9; i++) {
configDataCell(sxssfWorkbook,header6.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
}
}
@@ -1745,27 +1747,27 @@
"1銆佸湪鐢宠涔︿笂濉啓鐨勪竴鍒囧唴瀹瑰睘瀹烇紝鍚﹀垯鏈紒涓氭壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
"2銆佺敱浜庡彉鏇村彈鐩婁汉浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
"3銆佹湰鐢宠琛ㄧ殑绛剧珷涓烘湰浼佷笟浜茶嚜绛剧讲锛屽鐢辨浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n");
- for (int i = 1; i < 8; i++) {
+ for (int i = 1; i < 9; i++) {
header6.createCell(i).setCellValue("");
}
- for (int i =0; i < 8; i++) {
+ for (int i =0; i < 9; i++) {
if(i>0){
header6.createCell(i).setCellValue("");
}
configInfoCell(sxssfWorkbook,header6.getCell(i),HorizontalAlignment.LEFT);
}
header6.setHeight((short) 2000);
- sheet.addMergedRegion(new CellRangeAddress(rowIndex ,rowIndex,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(rowIndex ,rowIndex,0,8));
Row header7= sheet.createRow(rowIndex+1);
header7.setHeight((short) 3000);
header7.createCell(0).setCellValue("鎶曚繚浜虹绔� 锛� \n \n \n" +"鏃ユ湡锛� 骞� 鏈� 鏃� ");
- for (int i =0; i < 8; i++) {
+ for (int i =0; i < 9; i++) {
if(i>0){
header7.createCell(i).setCellValue("");
}
configInfoCell(sxssfWorkbook,header7.getCell(i),HorizontalAlignment.RIGHT);
}
- sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,0,8));
//涓存椂缂撳啿鍖�
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -1818,14 +1820,14 @@
try {
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
- for (int i = 0; i < 8; i++) {
- sheet.setColumnWidth(i, ((i==3|| i==4|| i== 5 )?16:8) * 2 * 256);
+ for (int i = 0; i < 9; i++) {
+ sheet.setColumnWidth(i, ((i==0|| i==1|| i== 3|| i== 4|| i== 7|| i== 8)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
- sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,8));
Row title = sheet.createRow(0);
- title.setHeight((short) 1000);
- for (int i = 0; i < 8; i++) {
+ title.setHeight((short) 2000);
+ for (int i = 0; i < 9; i++) {
title.createCell(i).setCellValue(i==0?sheetName:"");
configTitleCell(sxssfWorkbook,title.getCell(i));
}
@@ -1837,8 +1839,9 @@
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(5).setCellValue("鍔犱繚浜烘暟");
header1.createCell(6).setCellValue("鍑忎繚浜烘暟");
- header1.createCell(7).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
- for (int i = 0; i < 8; i++) {
+ header1.createCell(7).setCellValue("鎵瑰鐢熸晥鏃ユ湡");
+ header1.createCell(8).setCellValue("鎵瑰噺鐢熸晥鏃ユ湡");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
@@ -1851,7 +1854,8 @@
header2.createCell(5).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList()).size());
header2.createCell(6).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList()).size());
header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
- for (int i = 0; i < 8; i++) {
+ header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getDelValidTime()));
+ for (int i = 0; i < 9; i++) {
configDataCell(sxssfWorkbook, header2.getCell(i));
}
@@ -1864,12 +1868,11 @@
header3.createCell(5).setCellValue("");
header3.createCell(6).setCellValue("");
header3.createCell(7).setCellValue("");
- configFirstCell(sxssfWorkbook,header3.getCell(0));
- for (int i = 1; i < 8; i++) {
- configDataCell(sxssfWorkbook,header3.getCell(i));
+ header3.createCell(8).setCellValue("");
+ for (int i = 0; i < 9; i++) {
+ configFirstCell(sxssfWorkbook,header3.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(3 ,3,1,7));
-
+ sheet.addMergedRegion(new CellRangeAddress(3 ,3,1,8));
Integer row = 4;
List<ApplyChagneDetail> addChangeDetailList = data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(addChangeDetailList)){
@@ -1878,39 +1881,39 @@
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook, header4.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,0,8));
row = row + 1;
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
header5.createCell(1).setCellValue("鍛樺伐濮撳悕");
-// header5.createCell(2).setCellValue("鎬у埆");
- header5.createCell(2).setCellValue("韬唤璇佸彿");
- header5.createCell(3).setCellValue("琚繚闄╀汉");
- header5.createCell(4).setCellValue("娲鹃仯鍗曚綅");
- header5.createCell(5).setCellValue("");
- header5.createCell(6).setCellValue("鎵�灞炲伐绉�");
- header5.createCell(7).setCellValue("澶囨敞");
- for (int i = 0; i < 8; i++) {
+ header5.createCell(2).setCellValue("鎬у埆");
+ header5.createCell(3).setCellValue("韬唤璇佸彿");
+ header5.createCell(4).setCellValue("琚繚闄╀汉");
+ header5.createCell(5).setCellValue("娲鹃仯鍗曚綅");
+ header5.createCell(6).setCellValue("");
+ header5.createCell(7).setCellValue("鎵�灞炲伐绉�");
+ header5.createCell(8).setCellValue("澶囨敞");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
for (int rowIndex = 0; rowIndex < addChangeDetailList.size(); rowIndex++) {
row = row + 1 ;
Row header6 = sheet.createRow(row);
ApplyChagneDetail applyChagneDetail = addChangeDetailList.get(rowIndex);
header6.createCell(0).setCellValue(rowIndex + 1);
header6.createCell(1).setCellValue(applyChagneDetail.getMemberName());
-// header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
- header6.createCell(2).setCellValue(applyChagneDetail.getIdcardNo());
- header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName());
- header6.createCell(4).setCellValue(applyChagneDetail.getDuName());
- header6.createCell(5).setCellValue("");
- header6.createCell(6).setCellValue(applyChagneDetail.getWorkTypeName());
- header6.createCell(7).setCellValue(applyChagneDetail.getRemark());
- for (int i = 0; i < 8; i++) {
+ header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
+ header6.createCell(3).setCellValue(applyChagneDetail.getIdcardNo());
+ header6.createCell(4).setCellValue(applyChagneDetail.getCompanyName());
+ header6.createCell(5).setCellValue(applyChagneDetail.getDuName());
+ header6.createCell(6).setCellValue("");
+ header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
+ header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
+ for (int i = 0; i < 9; i++) {
configDataCell(sxssfWorkbook,header6.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
}
}
@@ -1919,26 +1922,26 @@
if(CollectionUtils.isNotEmpty(reduceChangeDetailList)){
Row header4 = sheet.createRow(row);
header4.createCell(0).setCellValue("鍑忎繚浜哄憳");
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook, header4.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,0,8));
row = row + 1;
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
header5.createCell(1).setCellValue("鍛樺伐濮撳悕");
-// header5.createCell(2).setCellValue("鎬у埆");
- header5.createCell(2).setCellValue("韬唤璇佸彿");
- header5.createCell(3).setCellValue("琚繚闄╀汉");
- header5.createCell(4).setCellValue("娲鹃仯鍗曚綅");
- header5.createCell(5).setCellValue("");
- header5.createCell(6).setCellValue("鎵�灞炲伐绉�");
- header5.createCell(7).setCellValue("澶囨敞");
- for (int i = 0; i < 8; i++) {
+ header5.createCell(2).setCellValue("鎬у埆");
+ header5.createCell(3).setCellValue("韬唤璇佸彿");
+ header5.createCell(4).setCellValue("琚繚闄╀汉");
+ header5.createCell(5).setCellValue("娲鹃仯鍗曚綅");
+ header5.createCell(6).setCellValue("");
+ header5.createCell(7).setCellValue("鎵�灞炲伐绉�");
+ header5.createCell(8).setCellValue("澶囨敞");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
row = row + 1 ;
for (int rowIndex = 0; rowIndex < reduceChangeDetailList.size(); rowIndex++) {
@@ -1947,17 +1950,17 @@
ApplyChagneDetail applyChagneDetail = reduceChangeDetailList.get(rowIndex);
header6.createCell(0).setCellValue(rowIndex + 1);
header6.createCell(1).setCellValue(applyChagneDetail.getMemberName());
-// header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
- header6.createCell(2).setCellValue(applyChagneDetail.getIdcardNo());
- header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName());
- header6.createCell(4).setCellValue(applyChagneDetail.getDuName());
- header6.createCell(5).setCellValue("");
- header6.createCell(6).setCellValue(applyChagneDetail.getWorkTypeName());
- header6.createCell(7).setCellValue(applyChagneDetail.getRemark());
- for (int i = 0; i < 8; i++) {
- configFirstCell(sxssfWorkbook,header6.getCell(i));
+ header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
+ header6.createCell(3).setCellValue(applyChagneDetail.getIdcardNo());
+ header6.createCell(4).setCellValue(applyChagneDetail.getCompanyName());
+ header6.createCell(5).setCellValue(applyChagneDetail.getDuName());
+ header6.createCell(6).setCellValue("");
+ header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
+ header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
+ for (int i = 0; i < 9; i++) {
+ configDataCell(sxssfWorkbook,header6.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,2,3));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
}
}
sxssfWorkbook.write(os);
--
Gitblit v1.9.3