From 0f409b25f91717e00e10c37738740b22583cb4ff Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 08 五月 2024 09:00:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OperaWtbApplyShopWindow.vue | 30 +
company/src/components/enterprise/OperaInsuranceApplyWindow.vue | 12
company/src/components/business/OperaInsuranceApplyWindow.vue | 26 +
company/src/components/business/detailsEntrustedInsurance.vue | 2
company/src/views/enterprise/myPolicy.vue | 246 +++++++-------
company/.env.developmentCom | 4
company/src/components/business/OperaInsuranceApplyShopWindow.vue | 2
server/company/src/main/resources/application.yml | 2
company/src/components/business/OpearaUnionApply.vue | 2
company/src/components/business/OperaApplyChangeDetailWindow.vue | 19
server/shop/src/main/resources/application.yml | 2
company/src/components/business/InsuranceDetails.vue | 10
company/src/components/business/ApplyChangeDetails.vue | 48 ++
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 6
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 493 +++++++++++++++++-------------
15 files changed, 521 insertions(+), 383 deletions(-)
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 6f250bc..0396725 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -8,6 +8,6 @@
VUE_APP_COOKIE_NAME='doumee-auth-token'
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
-VUE_APP_API = 'http://192.168.0.143:10031/'
+#VUE_APP_API = 'http://192.168.0.143:10031/'
-#VUE_APP_API = 'http://localhost:10031/'
+VUE_APP_API = 'http://localhost:10031/'
diff --git a/company/src/components/business/ApplyChangeDetails.vue b/company/src/components/business/ApplyChangeDetails.vue
index c6725e8..19f6125 100644
--- a/company/src/components/business/ApplyChangeDetails.vue
+++ b/company/src/components/business/ApplyChangeDetails.vue
@@ -19,7 +19,8 @@
<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>
<div class="box_table_content " >
<div class="box_table_content_item box_table_content_header">{{ apply.companyName }}</div>
@@ -30,6 +31,7 @@
<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">{{ model.applyStartTime}}</div>
+ <div class="box_table_content_item box_table_content_header">{{ model.delValidTime}}</div>
</div>
</div>
<div class="box_table">
@@ -41,29 +43,41 @@
<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">澶囨敞</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">澶囨敞</div>
</div>
<div class="box_table_content" v-for="(item, index) in detailList" :key="index">
<div class="box_table_content_item">{{item.add.id!=null?(index + 1):''}}</div>
<div class="box_table_content_item" >{{ item.add.memberName }}</div>
<div class="box_table_content_item">{{ item.add.memberIdcardNo }}</div>
+<!--
<div class="box_table_content_item">{{ item.add.sex==0?"鐢�":(item.add.sex==1?"濂�":"" )}}</div>
+-->
<div class="box_table_content_item">{{ item.add.duName }}</div>
<div class="box_table_content_item">{{item.add.workTypeName}}</div>
+ <div class="box_table_content_item">{{item.add.remark}}</div>
<div class="box_table_content_item">{{item.del.id!=null?(index + 1):''}}</div>
<div class="box_table_content_item" >{{ item.del.memberName }}</div>
<div class="box_table_content_item">{{ item.del.memberIdcardNo }}</div>
+<!--
<div class="box_table_content_item">{{ item.del.sex==0?"鐢�":(item.del.sex==1?"濂�":"" ) }}</div>
+-->
<div class="box_table_content_item">{{ item.del.duName }}</div>
<div class="box_table_content_item">{{item.del.workTypeName}}</div>
+ <div class="box_table_content_item">{{item.del.remark}}</div>
</div>
</div>
<div class="box_table" v-if="type==1" style="border-top: 0px solid #b4bbc5;" >
@@ -134,7 +148,9 @@
this.model = target2
this.form.id = target2.id
this.type = target3
- this.getDetailListDo()
+ if(this.form.id){
+ this.getDetailListDo()
+ }
},
check (type) {
this.form.dealBackApply = type
@@ -314,12 +330,12 @@
border-right: 1px solid #b4bbc5;
border-bottom: 1px solid #b4bbc5;
box-sizing: border-box;
- &:nth-child(3) {
- flex: 1.5;;
- }
- &:nth-child(9) {
- flex: 1.5;;
- }
+ //&:nth-child(3) {
+ // flex: 1.5;;
+ //}
+ //&:nth-child(9) {
+ // flex: 1.5;;
+ //}
}
.box_table_head_item5 {
flex: 1;
@@ -334,7 +350,7 @@
border-bottom: 1px solid #b4bbc5;
box-sizing: border-box;
&:nth-child(2) {
- flex: 5.5;
+ flex: 5;
}
}
.box_form_item {
@@ -370,15 +386,17 @@
justify-content: center;
font-size: 14px;
color: black;
+ word-wrap: break-word;
+ word-break: break-all;
border-right: 1px solid #b4bbc5;
border-bottom: 1px solid #b4bbc5;
box-sizing: border-box;
- &:nth-child(3) {
- flex: 1.5;
- }
- &:nth-child(9) {
- flex: 1.5;
- }
+ //&:nth-child(3) {
+ // flex: 1.5;
+ //}
+ //&:nth-child(9) {
+ // flex: 1.5;
+ //}
}
}
}
diff --git a/company/src/components/business/InsuranceDetails.vue b/company/src/components/business/InsuranceDetails.vue
index 9951c2e..28f4f54 100644
--- a/company/src/components/business/InsuranceDetails.vue
+++ b/company/src/components/business/InsuranceDetails.vue
@@ -33,17 +33,19 @@
<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">鎵�灞炲伐绉�</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 detailList" :key="index">
<div class="box_table_content_item">{{index + 1}}</div>
<div class="box_table_content_item">{{ item.memberName }}</div>
<div class="box_table_content_item">{{ item.idcardNo }}</div>
- <div class="box_table_content_item">{{ item.sex==0?"鐢�":"濂�" }}</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.workTypeName}}</div>
+ <div class="box_table_content_item">{{item.remark}}</div>
+<!-- <div class="box_table_content_item">{{ item.sex==0?"鐢�":"濂�" }}</div>-->
</div>
</div>
<div class="box_table" v-if="type==1" style="border-top: 0px solid #b4bbc5;" >
diff --git a/company/src/components/business/OpearaUnionApply.vue b/company/src/components/business/OpearaUnionApply.vue
index 5892db2..41a3126 100644
--- a/company/src/components/business/OpearaUnionApply.vue
+++ b/company/src/components/business/OpearaUnionApply.vue
@@ -25,7 +25,7 @@
<el-form-item label="淇濋櫓鐢熸晥璧锋鏈燂細" prop="startDate" style="margin-left: 40px">
<div style="display: flex; flex-direction: column;">
<el-date-picker
- @change="changeTime"
+ @change="changeTime"
v-model="time"
type="daterange"
format="yyyy 骞� MM 鏈� dd 鏃�"
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index ee7b975..d2d6eb9 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -90,7 +90,12 @@
<el-table-column
prop="applyStartTime"
align="center"
- label="鎵瑰崟鐢熸晥璧锋湡">
+ label="鎵瑰鐢熸晥鏃ユ湡">
+ </el-table-column>
+ <el-table-column
+ prop="delValidTime"
+ align="center"
+ label="鎵瑰噺鐢熸晥鏃ユ湡">
</el-table-column>
<el-table-column
prop="addNum"
@@ -156,10 +161,14 @@
prop="endTime"
label="淇濋櫓鐢熸晥姝㈡湡">
</el-table-column>
- <el-table-column
- prop="fee"
- label="宸蹭骇鐢熻垂鐢紙鍏冿級">
- </el-table-column>
+ <el-table-column
+ 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/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 1450699..204ecf2 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -149,6 +149,10 @@
prop="endTime"
label="淇濋櫓鐢熸晥姝㈡湡">
</el-table-column>
+ <el-table-column
+ prop="remark"
+ label="澶囨敞">
+ </el-table-column>
</el-table>
<div class="desc_item_from_page">
<el-pagination
@@ -250,7 +254,7 @@
import { sendSms } from '@/api/business/smsEmail'
export default {
- name: 'OperaApplyChangeDetailWindow',
+ name: 'OperaApplyChangeUnitDetailWindow',
extends: BaseOpera,
components: {
GlobalWindow,
diff --git a/company/src/components/business/OperaInsuranceApplyShopWindow.vue b/company/src/components/business/OperaInsuranceApplyShopWindow.vue
index a668334..76923bc 100644
--- a/company/src/components/business/OperaInsuranceApplyShopWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyShopWindow.vue
@@ -449,7 +449,7 @@
import { mapState } from 'vuex'
export default {
- name: 'OperaInsuranceApplyWindow1',
+ name: 'OperaInsuranceApplyShopWindow',
extends: BaseOpera,
components: {
GlobalWindow,
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index efe4123..5467066 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -264,6 +264,12 @@
<span>{{row.fee!=null?row.fee: '-'}}</span>
</template>
</el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
</el-table>
<el-table
:data="list1"
@@ -319,8 +325,20 @@
:key="Math.random()"
prop="applyStartTime"
align="center"
- label="鎵瑰崟鐢熸晥璧锋湡">
+ label="鎵瑰鐢熸晥鏃ユ湡">
</el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="delValidTime"
+ align="center"
+ label="鎵瑰噺鐢熸晥鏃ユ湡">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
<el-table-column
align="center"
:key="Math.random()"
@@ -381,6 +399,12 @@
</el-table-column>
<el-table-column
:key="Math.random()"
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
align="center"
label="鎿嶄綔">
<template slot-scope="{row}">
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index d31b62f..39cddd5 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -271,6 +271,11 @@
<span>{{row.fee!=null?row.fee: '-'}}</span>
</template>
</el-table-column>
+ <el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
</el-table>
<el-table
:data="list1"
@@ -326,8 +331,20 @@
:key="Math.random()"
prop="applyStartTime"
align="center"
- label="鎵瑰崟鐢熸晥璧锋湡">
+ label="鎵瑰鐢熸晥鏃ユ湡">
</el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="delValidTime"
+ align="center"
+ label="鎵瑰噺鐢熸晥鏃ユ湡">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
<el-table-column
align="center"
:key="Math.random()"
@@ -387,6 +404,11 @@
label="鎵瑰崟鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
+ <el-table-column
:key="Math.random()"
align="center"
label="鎿嶄綔">
@@ -432,7 +454,7 @@
<!-- 浼佷笟鐢宠閫�鍥� -->
<applyReturn ref="applyReturn" @success="successEvent" />
<!-- 鏂板鎶曚繚 -->
- <OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
+ <OperaInsuranceApplyWindow ref="OperaInsuranceApply" @success="successEvent" />
<!-- 鍔犲噺淇濈敵璇� -->
<additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
<!-- 鏇存崲娲鹃仯鍗曚綅鐢宠 -->
@@ -485,6 +507,7 @@
import factoryChange from '@/components/enterprise/factoryChange'
import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
+import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
import applyReturn from '@/components/enterprise/applyReturn'
@@ -500,7 +523,6 @@
import { findListByDTO } from '@/api/business/dispatchUnit'
import { fetchList } from '@/api/business/applyChange'
import { findListByDTO as worktypeFindListByDTO } from '@/api/business/worktype'
-import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
import { mapState } from 'vuex'
import {sendSms} from "@/api/business/smsEmail";
@@ -512,7 +534,7 @@
InsuranceDetails,
OperaWtbApplyCheckWindow,
applyReturn,
- OperaInsuranceApply,
+ OperaInsuranceApplyWindow,
additionSubtractionApplication,
factoryChange,
OperaApplyChangeDetailWindow,
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index bdfd97e..7fd889b 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -436,7 +436,7 @@
import { sendSms } from '@/api/business/smsEmail'
export default {
- name: 'OperaWtbApplyShopWindow',
+ name: 'OperaWtbApplyShopWindow1',
extends: BaseOpera,
components: {
GlobalWindow,
diff --git a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
index e0c78be..2423a30 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -121,6 +121,14 @@
{{item.type==1?'-':row.fee}}
</template>
</el-table-column>
+ <el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ <template slot-scope="{row}">
+ <el-input v-model="row.remark" placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
<el-table-column
label="鎿嶄綔">
<template slot-scope="scope">
@@ -164,7 +172,7 @@
import { mapState } from 'vuex'
import { create, getCountCyclePriceVO, getDetail, findList, updateData } from '@/api/business/insuranceApply'
export default {
- name: 'OperaInsuranceApplyWindow2',
+ name: 'OperaInsuranceApplyWindow',
extends: BaseOpera,
components: { GlobalWindow, selectEmployees, addEmployee, OperaWtbApplyShopWindow, importEmployees, confirmJobType, detailsPolicyholder, OperaInsuranceApplyDetails },
data () {
@@ -310,7 +318,7 @@
if (index === 0) {
sums[index] = '鎬讳环'
} else if (index === 7) {
- if(this.item.type == 1){
+ if(this.item || this.item.type == 1){
sums[index] = "-"
}else{
let total = 0
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index 8ba7467..cebff07 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -152,129 +152,129 @@
</template>
<script>
- import BaseTable from '@/components/base/BaseTable'
- import TableLayout from '@/layouts/TableLayout'
- import Pagination from '@/components/common/Pagination'
- import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
- import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
- import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
- import renewalInsurance from '@/components/enterprise/renewalInsurance'
- import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
+import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
+import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
+import renewalInsurance from '@/components/enterprise/renewalInsurance'
+import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
- import { all as solutionAll} from '@/api/business/solutions'
- import { getCaptcha, closeApplyNotice } from '@/api/business/notices'
- export default {
- name: 'myPolicy',
- extends: BaseTable,
- components: {
- TableLayout,
- Pagination,
- OperaInsuranceApplyWindow,
- OperaInsuranceApplyDetails,
- renewalInsurance,
- additionSubtractionApplication,
- OperaWtbApplyShopWindow
- },
- data () {
- return {
- // 鎼滅储
- searchForm: {
- code: '',
- endTimeE: '',
- endTimeS: '',
- startTimeE: '',
- startTimeS: '',
- baseSolutionId: '',
- statusCollect: '2'
- },
- obj: {
- renewalNum: 0,
- waitSignNum: 0
- },
- time1: [],
- time2: [],
- solutionList:[]
- }
- },
- created () {
- this.config({
- module: '鎶曚繚鐢宠淇℃伅琛�',
- api: '/business/insuranceApply',
- 'field.id': 'id',
- 'field.main': 'id'
- })
- this.search()
- this.loadSelectList()
- this.getNum()
- },
- methods:{
- godetail (row) {
- if (row.solutionType == 1) {
- this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: row.id })
- } else {
- this.$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: row.id })
- }
- },
- see() {
- this.searchForm.statusCollect = '7'
- this.search()
- },
- closeRemind(type) {
- this.$confirm('纭畾鍏抽棴姝ゆ彁绀哄悧?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- closeApplyNotice(type)
- .then(res => {
- this.getNum()
- })
- }).catch(() => {
-
- });
- },
- getNum() {
- getCaptcha()
- .then(res => {
- this.obj.renewalNum = res.renewalNum
- this.obj.waitSignNum = res.waitSignNum
- })
- },
- reset() {
- this.time1 = []
- this.time2 = []
- this.searchForm.endTimeE = ''
- this.searchForm.endTimeS = ''
- this.searchForm.startTimeE = ''
- this.searchForm.startTimeS = ''
- this.$refs.searchForm.resetFields()
- this.search()
- },
- changeE(e) {
- if (e.length > 0) {
- this.searchForm.endTimeS = e[0]
- this.searchForm.endTimeE = e[1]
- } else {
- this.searchForm.endTimeS = ''
- this.searchForm.endTimeE = ''
- }
- this.search()
- },
- changeS(e) {
- if (e.length > 0) {
- this.searchForm.startTimeS = e[0]
- this.searchForm.startTimeE = e[1]
- } else {
- this.searchForm.startTimeS = ''
- this.searchForm.startTimeE = ''
- }
- this.search()
- },
- loadSelectList() {
- solutionAll({ dataType: 0 }).then(res => {
- this.solutionList = res
- })
- }
- }
+import { all as solutionAll } from '@/api/business/solutions'
+import { getCaptcha, closeApplyNotice } from '@/api/business/notices'
+export default {
+ name: 'myPolicy',
+ extends: BaseTable,
+ components: {
+ TableLayout,
+ Pagination,
+ OperaInsuranceApplyWindow,
+ OperaInsuranceApplyDetails,
+ renewalInsurance,
+ additionSubtractionApplication,
+ OperaWtbApplyShopWindow
+ },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ code: '',
+ endTimeE: '',
+ endTimeS: '',
+ startTimeE: '',
+ startTimeS: '',
+ baseSolutionId: '',
+ statusCollect: '2'
+ },
+ obj: {
+ renewalNum: 0,
+ waitSignNum: 0
+ },
+ time1: [],
+ time2: [],
+ solutionList: []
}
+ },
+ created () {
+ this.config({
+ module: '鎶曚繚鐢宠淇℃伅琛�',
+ api: '/business/insuranceApply',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ this.loadSelectList()
+ this.getNum()
+ },
+ methods: {
+ godetail (row) {
+ if (row.solutionType == 1) {
+ this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: row.id })
+ } else {
+ this.$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: row.id })
+ }
+ },
+ see () {
+ this.searchForm.statusCollect = '7'
+ this.search()
+ },
+ closeRemind (type) {
+ this.$confirm('纭畾鍏抽棴姝ゆ彁绀哄悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ closeApplyNotice(type)
+ .then(res => {
+ this.getNum()
+ })
+ }).catch(() => {
+
+ })
+ },
+ getNum () {
+ getCaptcha()
+ .then(res => {
+ this.obj.renewalNum = res.renewalNum
+ this.obj.waitSignNum = res.waitSignNum
+ })
+ },
+ reset () {
+ this.time1 = []
+ this.time2 = []
+ this.searchForm.endTimeE = ''
+ this.searchForm.endTimeS = ''
+ this.searchForm.startTimeE = ''
+ this.searchForm.startTimeS = ''
+ this.$refs.searchForm.resetFields()
+ this.search()
+ },
+ changeE (e) {
+ if (e.length > 0) {
+ this.searchForm.endTimeS = e[0]
+ this.searchForm.endTimeE = e[1]
+ } else {
+ this.searchForm.endTimeS = ''
+ this.searchForm.endTimeE = ''
+ }
+ this.search()
+ },
+ changeS (e) {
+ if (e.length > 0) {
+ this.searchForm.startTimeS = e[0]
+ this.searchForm.startTimeE = e[1]
+ } else {
+ this.searchForm.startTimeS = ''
+ this.searchForm.startTimeE = ''
+ }
+ this.search()
+ },
+ loadSelectList () {
+ solutionAll({ dataType: 0 }).then(res => {
+ this.solutionList = res
+ })
+ }
+ }
+}
</script>
diff --git a/server/company/src/main/resources/application.yml b/server/company/src/main/resources/application.yml
index 2107f6a..dba634a 100644
--- a/server/company/src/main/resources/application.yml
+++ b/server/company/src/main/resources/application.yml
@@ -12,7 +12,7 @@
# application:git
# name: doumeemes
profiles:
- active: pro
+ active: dev
# JSON杩斿洖閰嶇疆
jackson:
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 26c8c4c..1729e96 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
@@ -536,10 +536,11 @@
Row header4 = sheet.createRow(3);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(5).setCellValue("鎵�灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(4).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(5).setCellValue("澶囨敞");
header4.setHeight((short) 500);
for (int i = 0; i < 6; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
@@ -552,10 +553,11 @@
// header5.setHeight((short) 300);
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(d.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(d.getSex(),0)?"鐢�":(Constants.equalsInteger(d.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(d.getIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(d.getDuName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(d.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(d.getSex(),0)?"鐢�":(Constants.equalsInteger(d.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(d.getIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(d.getDuName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(d.getWorkTypeName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(d.getRemark(),""));
// 璁剧疆鏁版嵁鍗曞厓鏍�
for (int i = 0; i < 6; i++) {
configDataCell(sxssfWorkbook, header5.getCell(i));
@@ -626,7 +628,7 @@
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
for (int i = 0; i < 12; i++) {
- sheet.setColumnWidth(i, ((i==3|| i== 5 || i==9|| i==11)?16:8) * 2 * 256);
+ sheet.setColumnWidth(i, ((i==2|| i== 3 || i==8|| i==9|| i==10)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,11));
@@ -640,34 +642,47 @@
}
Row header1 = sheet.createRow(1);
header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
- header1.createCell(3).setCellValue("淇濋櫓鏂规");
- header1.createCell(4).setCellValue("淇濆崟鍙�");
- header1.createCell(5).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+ header1.createCell(1).setCellValue("");
+ header1.createCell(2).setCellValue("淇濋櫓鏂规");
+ header1.createCell(3).setCellValue("淇濆崟鍙�");
+ header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+ header1.createCell(5).setCellValue("");
header1.createCell(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
- header1.createCell(9).setCellValue("鍔犱繚浜烘暟");
- header1.createCell(10).setCellValue("鍑忎繚浜烘暟");
- header1.createCell(11).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+ header1.createCell(7).setCellValue("");
+ header1.createCell(8).setCellValue("鏈熸湜鎵瑰鐢熸晥鏃ユ湡");
+ header1.createCell(9).setCellValue("鏈熸湜鎵瑰噺鐢熸晥鏃ユ湡");
+ header1.createCell(10).setCellValue("鍔犱繚浜烘暟");
+ header1.createCell(11).setCellValue("鍑忎繚浜烘暟");
for (int i = 0; i < 12; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,2));
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,6,8));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,6,7));
Row header2 = sheet.createRow(2);
header2.createCell(0).setCellValue(data.getCompanyName());
- header2.createCell(3).setCellValue(data.getSolutionsName());
- header2.createCell(4).setCellValue(data.getApplyCode());
- header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+ header2.createCell(1).setCellValue("");
+ header2.createCell(2).setCellValue(data.getSolutionsName());
+ header2.createCell(3).setCellValue(data.getApplyCode());
+ header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+ header2.createCell(5).setCellValue("");
header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
- header2.createCell(9).setCellValue(data.getAddNum());
- header2.createCell(10).setCellValue(data.getDelNum());
- header2.createCell(11).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,2));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,6,8));
+ header2.createCell(7).setCellValue("");
+ header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
+ header2.createCell(9).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getDelValidTime()));
+ header2.createCell(10).setCellValue(data.getAddNum());
+ header2.createCell(11).setCellValue(data.getDelNum());
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,6,7));
for (int i = 0; i < 12; i++) {
configDataCell(sxssfWorkbook, header2.getCell(i));
}
Row header3 = sheet.createRow(3);
+ for (int i = 0; i < 12; i++) {
+ header3.createCell(i).setCellValue("");
+ }
header3.createCell(0).setCellValue("鍔犱繚浜哄憳");
header3.createCell(6).setCellValue("鍑忎繚浜哄憳");
sheet.addMergedRegion(new CellRangeAddress(3 ,3,0,5));
@@ -678,16 +693,18 @@
Row header4 = sheet.createRow(4);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(5).setCellValue("鎵�灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(4).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(5).setCellValue("澶囨敞");
header4.createCell(6).setCellValue("搴忓彿");
header4.createCell(7).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(8).setCellValue("鎬у埆");
- header4.createCell(9).setCellValue("韬唤璇佸彿");
- header4.createCell(10).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(11).setCellValue("鎵�灞炲伐绉�");
+// header4.createCell(8).setCellValue("鎬у埆");
+ header4.createCell(8).setCellValue("韬唤璇佸彿");
+ header4.createCell(9).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(10).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(11).setCellValue("澶囨敞");
for (int i = 0; i < 12; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
}
@@ -700,10 +717,11 @@
if(addModel!=null){
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
}else{
for (int i = 0; i < 6; i++) {
header5.createCell(i).setCellValue("");
@@ -712,10 +730,11 @@
if(delModel!=null){
header5.createCell(6).setCellValue(rowIndex+1);
header5.createCell(7).setCellValue(StringUtils.defaultString(delModel.getMemberName(),""));
- header5.createCell(8).setCellValue(Constants.equalsInteger(delModel.getSex(),0)?"鐢�":(Constants.equalsInteger(delModel.getSex(),1)?"濂�":"-"));
- header5.createCell(9).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
- header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
- header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+// header5.createCell(8).setCellValue(Constants.equalsInteger(delModel.getSex(),0)?"鐢�":(Constants.equalsInteger(delModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(8).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
+ header5.createCell(9).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
+ header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+ header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getRemark(),""));
}else{
for (int i =6; i < 12; i++) {
header5.createCell(i).setCellValue("");
@@ -751,46 +770,54 @@
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
for (int i = 0; i < 12; i++) {
- sheet.setColumnWidth(i, ((i==3|| i==4|| i== 5 || i==9||i==10|| i==11)?16:8) * 2 * 256);
+ sheet.setColumnWidth(i, ((i==2|| i== 3 || i==8|| i==9|| i==10)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,11));
Row title = sheet.createRow(0);
- title.setHeight((short) 2000);
+ title.setHeight((short) 800);
+ Cell c = title.createCell(0);
+ c.setCellValue(sheetName);
for (int i = 0; i < 12; i++) {
- title.createCell(i).setCellValue(i==0?sheetName:"");
+// title.createCell(i).setCellValue(i==0?sheetName:"");
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue(cellValue);
- header1.createCell(3).setCellValue("淇濋櫓鏂规");
- header1.createCell(4).setCellValue("淇濆崟鍙�");
- header1.createCell(5).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+ header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
+ header1.createCell(1).setCellValue("");
+ header1.createCell(2).setCellValue("淇濋櫓鏂规");
+ header1.createCell(3).setCellValue("淇濆崟鍙�");
+ header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+ header1.createCell(5).setCellValue("");
header1.createCell(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
- header1.createCell(9).setCellValue("鍔犱繚浜烘暟");
- header1.createCell(10).setCellValue("鍑忎繚浜烘暟");
- header1.createCell(11).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+ header1.createCell(7).setCellValue("");
+ header1.createCell(8).setCellValue("鏈熸湜鎵瑰鐢熸晥鏃ユ湡");
+ header1.createCell(9).setCellValue("鏈熸湜鎵瑰噺鐢熸晥鏃ユ湡");
+ header1.createCell(10).setCellValue("鍔犱繚浜烘暟");
+ header1.createCell(11).setCellValue("鍑忎繚浜烘暟");
for (int i = 0; i < 12; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,2));
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,6,8));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,6,7));
Row header2 = sheet.createRow(2);
header2.createCell(0).setCellValue(data.getCompanyName());
header2.createCell(1).setCellValue("");
- header2.createCell(2).setCellValue("");
- header2.createCell(3).setCellValue(data.getSolutionsName());
- header2.createCell(4).setCellValue(data.getApplyCode());
- header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+ header2.createCell(2).setCellValue(data.getSolutionsName());
+ header2.createCell(3).setCellValue(data.getApplyCode());
+ header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+ header2.createCell(5).setCellValue("");
header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(7).setCellValue("");
- header2.createCell(8).setCellValue("");
- header2.createCell(9).setCellValue(data.getAddNum());
- header2.createCell(10).setCellValue(data.getDelNum());
- header2.createCell(11).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,2));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,6,8));
+ header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
+ header2.createCell(9).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getDelValidTime()));
+ header2.createCell(10).setCellValue(data.getAddNum());
+ header2.createCell(11).setCellValue(data.getDelNum());
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,6,7));
for (int i = 0; i < 12; i++) {
configDataCell(sxssfWorkbook, header2.getCell(i));
}
@@ -805,16 +832,18 @@
Row header4 = sheet.createRow(4);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(5).setCellValue("鎵�灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(4).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(5).setCellValue("澶囨敞");
header4.createCell(6).setCellValue("搴忓彿");
header4.createCell(7).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(8).setCellValue("鎬у埆");
- header4.createCell(9).setCellValue("韬唤璇佸彿");
- header4.createCell(10).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(11).setCellValue("鎵�灞炲伐绉�");
+// header4.createCell(8).setCellValue("鎬у埆");
+ header4.createCell(8).setCellValue("韬唤璇佸彿");
+ header4.createCell(9).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(10).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(11).setCellValue("澶囨敞");
for (int i = 0; i < 12; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
}
@@ -827,10 +856,11 @@
if(addModel!=null){
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
}else{
for (int i = 0; i < 6; i++) {
header5.createCell(i).setCellValue("");
@@ -839,10 +869,11 @@
if(delModel!=null){
header5.createCell(6).setCellValue(rowIndex+1);
header5.createCell(7).setCellValue(StringUtils.defaultString(delModel.getMemberName(),""));
- header5.createCell(8).setCellValue(Constants.equalsInteger(delModel.getSex(),0)?"鐢�":(Constants.equalsInteger(delModel.getSex(),1)?"濂�":"-"));
- header5.createCell(9).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
- header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
- header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+// header5.createCell(8).setCellValue(Constants.equalsInteger(delModel.getSex(),0)?"鐢�":(Constants.equalsInteger(delModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(8).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
+ header5.createCell(9).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
+ header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+ header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getRemark(),""));
}else{
for (int i =6; i < 12; i++) {
header5.createCell(i).setCellValue("");
@@ -912,7 +943,7 @@
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
for (int i = 0; i < 8; i++) {
- sheet.setColumnWidth(i, ((i==3|| i== 5 || i==7)?16:8) * 2 * 256);
+ sheet.setColumnWidth(i, ((i==2|| i==3 || i==6|| i==7|| i==4|| i==5)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,7));
@@ -929,8 +960,8 @@
}
Row header1 = sheet.createRow(1);
header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
- header1.createCell(1).setCellValue("淇濋櫓鏂规");
- header1.createCell(2).setCellValue("");
+ header1.createCell(1).setCellValue("");
+ header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("淇濆崟鍙�");
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
@@ -939,30 +970,31 @@
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,1,2));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
Row header2 = sheet.createRow(2);
header2.createCell(0).setCellValue(data.getCompanyName());
- header2.createCell(1).setCellValue(data.getSolutionsName());
- header2.createCell(2).setCellValue("");
+ header2.createCell(1).setCellValue("");
+ header2.createCell(2).setCellValue(data.getSolutionsName());
header2.createCell(3).setCellValue(data.getApplyCode());
header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(6).setCellValue(data.getChangeNum());
header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,1,2));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
for (int i = 0; i < 8; i++) {
configDataCell(sxssfWorkbook,header2.getCell(i));
}
Row header4 = sheet.createRow(3);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("鍘熸淳閬ｅ崟浣�");
- header4.createCell(5).setCellValue("鍘熸墍鎵�灞炲伐绉�");
- header4.createCell(6).setCellValue("鏇存敼鍚庢淳閬ｅ崟浣�");
- header4.createCell(7).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("鍘熸淳閬ｅ崟浣�");
+ header4.createCell(4).setCellValue("鍘熸墍鎵�灞炲伐绉�");
+ header4.createCell(5).setCellValue("鏇存敼鍚庢淳閬ｅ崟浣�");
+ header4.createCell(6).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+ header4.createCell(7).setCellValue("澶囨敞");
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
}
@@ -972,12 +1004,13 @@
Row header5 = sheet.createRow(rowIndex + 4);
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
- header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
- header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+ header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+ header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
for (int i = 0; i < 8; i++) {
configDataCell(sxssfWorkbook,header5.getCell(i));
}
@@ -1007,12 +1040,12 @@
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
for (int i = 0; i < 8; i++) {
- sheet.setColumnWidth(i, ((i==3|| i== 4|| i== 5 ||i== 6 || i==7)?16:8) * 2 * 256);
+ sheet.setColumnWidth(i, ((i==2|| i==3 || i==6|| i==7|| i==4|| i==5)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,7));
Row title = sheet.createRow(0);
- title.setHeight((short) 2000);
+ title.setHeight((short) 1000);
Cell c = title.createCell(0);
c.setCellValue(sheetName);
configFirstCell(sxssfWorkbook,c);
@@ -1023,9 +1056,9 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue(cellValue);
- header1.createCell(1).setCellValue("淇濋櫓鏂规");
- header1.createCell(2).setCellValue("");
+ header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
+ header1.createCell(1).setCellValue("");
+ header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("淇濆崟鍙�");
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
@@ -1034,30 +1067,31 @@
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,1,2));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
Row header2 = sheet.createRow(2);
header2.createCell(0).setCellValue(data.getCompanyName());
- header2.createCell(1).setCellValue(data.getSolutionsName());
- header2.createCell(2).setCellValue("");
+ header2.createCell(1).setCellValue("");
+ header2.createCell(2).setCellValue(data.getSolutionsName());
header2.createCell(3).setCellValue(data.getApplyCode());
header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(6).setCellValue(data.getChangeNum());
header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,1,2));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
for (int i = 0; i < 8; i++) {
configDataCell(sxssfWorkbook,header2.getCell(i));
}
Row header4 = sheet.createRow(3);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("鍘熸淳閬ｅ崟浣�");
- header4.createCell(5).setCellValue("鍘熸墍鎵�灞炲伐绉�");
- header4.createCell(6).setCellValue("鏇存敼鍚庢淳閬ｅ崟浣�");
- header4.createCell(7).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("鍘熸淳閬ｅ崟浣�");
+ header4.createCell(4).setCellValue("鍘熸墍鎵�灞炲伐绉�");
+ header4.createCell(5).setCellValue("鏇存敼鍚庢淳閬ｅ崟浣�");
+ header4.createCell(6).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+ header4.createCell(7).setCellValue("澶囨敞");
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
}
@@ -1067,12 +1101,13 @@
Row header5 = sheet.createRow(rowIndex + 4);
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
- header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
- header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+ header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+ header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
for (int i = 0; i < 8; i++) {
configDataCell(sxssfWorkbook,header5.getCell(i));
}
@@ -1178,10 +1213,11 @@
Row header4 = sheet.createRow(3);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(5).setCellValue("鎵�鎵�灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(4).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(5).setCellValue("澶囨敞");
for (int i = 0; i < 6; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
}
@@ -1191,10 +1227,11 @@
Row header5 = sheet.createRow(rowIndex + 4);
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
for (int i = 0; i < 6; i++) {
configDataCell(sxssfWorkbook,header5.getCell(i));
}
@@ -1324,11 +1361,12 @@
Row header4 = sheet.createRow(3);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("琚繚闄╀汉");
- header4.createCell(5).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(6).setCellValue("鎵�灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("琚繚闄╀汉");
+ header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(5).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(6).setCellValue("澶囨敞");
header4.setHeight((short) 500);
for (int i = 0; i < 7; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
@@ -1341,11 +1379,12 @@
// header5.setHeight((short) 300);
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(d.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(d.getSex(),0)?"鐢�":(Constants.equalsInteger(d.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(d.getIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(d.getCompanyName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(d.getDuName(),""));
- header5.createCell(6).setCellValue(StringUtils.defaultString(d.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(d.getSex(),0)?"鐢�":(Constants.equalsInteger(d.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(d.getIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(d.getCompanyName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(d.getDuName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(d.getWorkTypeName(),""));
+ header5.createCell(6).setCellValue(StringUtils.defaultString(d.getRemark(),""));
// 璁剧疆鏁版嵁鍗曞厓鏍�
for (int i = 0; i < 7; i++) {
configDataCell(sxssfWorkbook, header5.getCell(i));
@@ -1468,13 +1507,14 @@
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
header5.createCell(1).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("鏇存敼鍚庢淳閬ｅ崟浣�");
- header5.createCell(8).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("鏇存敼鍚庢墍灞炲伐绉�");
+ header5.createCell(8).setCellValue("澶囨敞");
for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
@@ -1484,13 +1524,14 @@
ApplyChagneDetail applyChagneDetail = otherChangeDetailList.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(3).setCellValue(applyChagneDetail.getIdcardNo());
- header6.createCell(4).setCellValue(applyChagneDetail.getCompanyName());
- header6.createCell(5).setCellValue(applyChagneDetail.getOldDuName());
- header6.createCell(6).setCellValue(applyChagneDetail.getOldWorkTypeName());
- header6.createCell(7).setCellValue(applyChagneDetail.getDuName());
- header6.createCell(8).setCellValue(applyChagneDetail.getWorkTypeName());
+// 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.getOldDuName());
+ header6.createCell(5).setCellValue(applyChagneDetail.getOldWorkTypeName());
+ header6.createCell(6).setCellValue(applyChagneDetail.getDuName());
+ header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
+ header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
for (int i = 0; i < 9; i++) {
configDataCell(sxssfWorkbook,header6.getCell(i));
}
@@ -1620,32 +1661,34 @@
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
header5.createCell(1).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("鎵�灞炲伐绉�");
+// 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++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
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(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(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));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
}
}
@@ -1663,16 +1706,17 @@
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
header5.createCell(1).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("鎵�灞炲伐绉�");
+// 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++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
row = row + 1 ;
for (int rowIndex = 0; rowIndex < reduceChangeDetailList.size(); rowIndex++) {
@@ -1681,16 +1725,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(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(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++) {
configDataCell(sxssfWorkbook,header6.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
}
}
@@ -1838,32 +1883,34 @@
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
header5.createCell(1).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("鎵�灞炲伐绉�");
+// 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++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
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(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(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++) {
configDataCell(sxssfWorkbook,header6.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
}
}
@@ -1881,16 +1928,17 @@
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
header5.createCell(1).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("鎵�灞炲伐绉�");
+// 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++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5));
row = row + 1 ;
for (int rowIndex = 0; rowIndex < reduceChangeDetailList.size(); rowIndex++) {
@@ -1899,16 +1947,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(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(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));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,2,3));
}
}
sxssfWorkbook.write(os);
@@ -2011,13 +2060,14 @@
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
header5.createCell(1).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("鏇存敼鍚庢淳閬ｅ崟浣�");
- header5.createCell(8).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("鏇存敼鍚庢墍灞炲伐绉�");
+ header5.createCell(8).setCellValue("澶囨敞");
for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
@@ -2027,13 +2077,14 @@
ApplyChagneDetail applyChagneDetail = otherChangeDetailList.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(3).setCellValue(applyChagneDetail.getIdcardNo());
- header6.createCell(4).setCellValue(applyChagneDetail.getCompanyName());
- header6.createCell(5).setCellValue(applyChagneDetail.getOldDuName());
- header6.createCell(6).setCellValue(applyChagneDetail.getOldWorkTypeName());
- header6.createCell(7).setCellValue(applyChagneDetail.getDuName());
- header6.createCell(8).setCellValue(applyChagneDetail.getWorkTypeName());
+// 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.getOldDuName());
+ header6.createCell(5).setCellValue(applyChagneDetail.getOldWorkTypeName());
+ header6.createCell(6).setCellValue(applyChagneDetail.getDuName());
+ header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
+ header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
for (int i = 0; i < 9; i++) {
configDataCell(sxssfWorkbook,header6.getCell(i));
}
diff --git a/server/shop/src/main/resources/application.yml b/server/shop/src/main/resources/application.yml
index b5c9b1e..0252e02 100644
--- a/server/shop/src/main/resources/application.yml
+++ b/server/shop/src/main/resources/application.yml
@@ -12,7 +12,7 @@
# application:git
# name: doumeemes
profiles:
- active: pro
+ active: dev
# JSON杩斿洖閰嶇疆
jackson:
--
Gitblit v1.9.3