jiangping
2024-02-04 6e41324f84f0cf70871ca05292c5420bdcaaa98c
Merge remote-tracking branch 'origin/master'
已修改2个文件
8 ■■■■ 文件已修改
company/src/views/business/switchCourt.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/switchCourt.vue
@@ -75,15 +75,13 @@
        <el-table-column prop="companyName" label="投保企业" min-width="100px"></el-table-column>
        <el-table-column prop="applyCode" label="关联保单号" min-width="100px"></el-table-column>
        <el-table-column prop="solutionsName" label="保险方案" min-width="100px"></el-table-column>
        <el-table-column prop="addNum" label="加保人数(人)" min-width="100px"></el-table-column>
        <el-table-column prop="delNum" label="减保人数(人)" min-width="100px"></el-table-column>
        <el-table-column prop="changeNum" label="换厂人数" min-width="100px"></el-table-column>
        <el-table-column prop="fee" label="费用变更" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="提交时间" min-width="100px"></el-table-column>
        <el-table-column
            label="操作"
            min-width="120"
            fixed="right"
        >
            fixed="right">
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaApplyChangeDetailWindow.open('加减保详情', row)">查看详情</el-button>
          </template>
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -1134,12 +1134,14 @@
                .selectAll(ApplyChange.class)
                .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
                .selectAs(Solutions::getName,ApplyChange::getSolutionsName)
                .selectAs(Company::getName,ApplyChange::getCompanyName)
                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0  )",ApplyChange::getAddNum)
                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1  )",ApplyChange::getDelNum)
                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2  )",ApplyChange::getChangeNum)
                .select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID  )",ApplyChange::getChangeMoney)
                .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
                .eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
                .eq(!Objects.isNull(model.getStatus())&&!model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,model.getStatus())
                .in(!Objects.isNull(model.getStatus())&&model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,