提交一把

jiangping

2024-05-08 0a35a0ebbe694b87f2531d133b3be6b95bd62c69

提交一把

 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/'

 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"

 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>
@@ -134,6 +151,7 @@
          editCheckInfo:'',
          editValidCode: '',
          applyStartTime:null,
        delValidTime: null,
         validCode:null,
          pidanFile:null,
         editPidanFile:null,
@@ -145,7 +163,7 @@
      visible3: false,
      visible4: false,
      visible5: false,
      visible6: false,
      visible6: false
    }
  },
  created () {
@@ -164,6 +182,7 @@
         dealBackInfo:'',
         editCheckInfo:'',
         editValidCode: '',
        delValidTime: null,
         applyStartTime:null,
         validCode:null,
         pidanFile:null,
@@ -174,6 +193,7 @@
       },
       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
@@ -207,7 +227,11 @@
        this.backDo()
      } else if (this.flag == 3) {
          if (this.form.selectRadio === 1 && !this.form.applyStartTime) {
              this.$message.warning('请选择批单生效起期')
          this.$message.warning('请选择批增生效日期')
          return
        }
        if (this.form.selectRadio === 1 && !this.form.delValidTime) {
          this.$message.warning('请选择批减生效日期')
              return
          }
          if (!this.form.validCode) {
@@ -249,9 +273,11 @@
    },
    selectChange(){
       if(this.form.selectRadio == 0){
         this.form.applyStartTime = this.model.validTime
        this.form.applyStartTime = this.model.applyStartTime
        this.form.delValidTime = this.model.delValidTime
       }else{
        this.form.applyStartTime = ''
        // this.form.applyStartTime = ''
        // this.form.delValidTime = ''
       }
    },
    baoxianFileUploaded(data){
@@ -290,7 +316,7 @@
      this.$dialog.messageConfirm('确认进行该操作吗？')
          .then(() => {
            this.isWorking = true
            uploadChangePidan({id:this.model.id,applyStartTime:this.form.applyStartTime, validCode:this.form.validCode,pidanFile:this.form.pidanFile})
          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')
@@ -298,7 +324,6 @@
                  this.$tip.apiFailed(err)
                })
          })

    },
    editPidan(){
      this.$dialog.messageConfirm('确认进行该操作吗？')
@@ -314,28 +339,28 @@
          })
    },
      handleRemove(file, fileList) {
          console.log(file, fileList);
      console.log(file, fileList)
      },
      handlePreview(file) {
          console.log(file);
      console.log(file)
      },
      handleExceed(files, fileList) {
          this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
      this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
      },
      beforeRemove(file, fileList) {
          return this.$confirm(`确定移除 ${ file.name }？`);
      return this.$confirm(`确定移除 ${file.name}？`)
      },
      successEvent() {

      },
      handleSizeChange(val) {
          console.log(`每页 ${val} 条`);
      console.log(`每页 ${val} 条`)
      },
      handleCurrentChange(val) {
          console.log(`当前页: ${val}`);
      console.log(`当前页: ${val}`)
      },
      handleClick(tab, event) {
          console.log(tab, event);
      console.log(tab, event)
      },
      onSubmit() {


 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,

 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

 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" 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;

 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);