提交一把

nidapeng

2024-04-03 056ed00799018426f21837c88a3e3abcd3c90d30

提交一把

 company/src/components/business/UnionChangeDetails.vue

@@ -35,7 +35,11 @@
          <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;">{{ apply.companyNames }}</div>
              <div class="box_table_content_item box_table_content_header" style=" flex: 7;">
                <p v-for="(item, index) in companyList" :key="index" >
                  {{index>0?'，':''}} {{ item[1]}}
                </p>
               </div>
            </div>
          </div>
            <div class="box_table" v-if="addList && addList.length>0">
@@ -125,6 +129,7 @@
              type:0,
              delList:[],
              addList:[],
              companyList:new Map(),
                // 表单数据
                form: {
                    id: null,
@@ -174,7 +179,9 @@
             this.addList=[]
             getChangeDetailList({unionChangeId: this.model.id})
                 .then(res => {
                   var index =0
                   res.forEach(item1 => {
                     this.companyList.set(item1.companyId, item1.companyName)
                     if (item1.type == 1) {
                       this.delList.push(item1);
                     } else {

 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java

@@ -358,6 +358,7 @@
        style.setVerticalAlignment(VerticalAlignment.CENTER);
        // 设置背景
        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
        // 字体
        Font font = workbook.createFont();
        font.setFontHeightInPoints((short)12);

 server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java

@@ -150,6 +150,9 @@
    @ApiModelProperty(value = "员工企业名称")
    @TableField(exist = false)
    private String companyName;
    @ApiModelProperty(value = "员工企业编码")
    @TableField(exist = false)
    private Integer companyId;

    @ApiModelProperty(value = "年龄")
    @TableField(exist = false)

 server/service/src/main/java/com/doumee/service/business/impl/ApplyChagneDetailServiceImpl.java

@@ -99,6 +99,7 @@
        queryWrapper.select("t4.name",ApplyChagneDetail::getOldWorkTypeName);
        queryWrapper.select("t5.name",ApplyChagneDetail::getOldDuName);
        queryWrapper.selectAs(Company::getName,ApplyChagneDetail::getCompanyName);
        queryWrapper.selectAs(Company::getId,ApplyChagneDetail::getCompanyId);
        queryWrapper.selectAs(Member::getName,ApplyChagneDetail::getMemberName);
        queryWrapper.selectAs(Member::getSex,ApplyChagneDetail::getSex);
        queryWrapper.selectAs(Member::getIdcardNo,ApplyChagneDetail::getMemberIdcardNo);
@@ -193,6 +194,7 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.selectAll(ApplyChagneDetail.class);
        queryWrapper.selectAs(Company::getName,ApplyChagneDetail::getCompanyName);
        queryWrapper.selectAs(Company::getId,ApplyChagneDetail::getCompanyId);
        queryWrapper.select("t2.name",ApplyChagneDetail::getWorkTypeName);
        queryWrapper.select("t3.name",ApplyChagneDetail::getDuName);
        queryWrapper.select("t4.name",ApplyChagneDetail::getOldWorkTypeName);