提交一把

jiangping

2024-06-20 ad5c2bf44c99d299cbb5b8182675aec514d55a57

提交一把

 company/src/components/enterprise/reinsurance.vue

@@ -12,7 +12,7 @@
                <el-form-item label="保险方案">
                    <span>{{form.solutionsName}}</span>
                </el-form-item>
                <el-form-item label="批单生效起期" prop="applyStartTime">
                <el-form-item label="批单生效起期" prop="applyStartTime" v-if="1==2">
                    <div style="display: flex; flex-direction: column;">
                        <el-date-picker
                            @change="changeApplyStartTime"
@@ -268,7 +268,7 @@
                    applyStartTime: '',
                    applyEndTime: '',
                    addDetailList: [],
                    delDetailList: [],
        delDetailList: []
                },
                newVersionSolutionId: '',
                activeName: '0',
@@ -399,7 +399,7 @@
                                // - 8.64e7
                                // return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().getTime()
                            }
                        };
          }
                        // this.changeSolution1(res.solutionId)
                    })
            },
@@ -409,7 +409,6 @@
                columns.forEach((column, index) => {
                    if (index === 0) {
                        sums[index] = '总价'
                        return
                    } else if (index === 7) {
                        let total = 0
                        if (this.activeName === '0') {
@@ -423,7 +422,7 @@
                                total += item.fee
                            })
                            // if (total < 0) {
                            sums[index] = total.toFixed(2)
            sums[index] = (total||0).toFixed(2)
                            // } else {
                            //     sums[index] = '-' + total
                            // }
@@ -512,9 +511,9 @@
                    return
                }
                if (this.activeName === '0') {
                    this.$refs.selectEmployees.open('选取员工', { arr: this.form.addDetailList, price: this.price, notInInsuranceApplyId: this.form.id })
        this.$refs.selectEmployees.open('选取加保员工', { arr: this.form.addDetailList, price: this.price, notInInsuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
                } else {
                    this.$refs.selectEmployees.open('选取员工', { arr: this.form.delDetailList, price: this.price, insuranceApplyId: this.form.id })
        this.$refs.selectEmployees.open('选取减保员工', { arr: this.form.delDetailList, price: this.reducePrice, insuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
                }
            },
            addUser() {
@@ -523,9 +522,9 @@
                    return
                }
                if (this.activeName === '0') {
                    this.$refs.addEmployee.open('添加员工', { arr: this.form.addDetailList, price: this.price })
        this.$refs.addEmployee.open('添加加保员工', { arr: this.form.addDetailList, solutionId: this.item.newVersionSolutionId, price: this.price })
                } else {
                    this.$refs.addEmployee.open('添加员工', { arr: this.form.delDetailList, price: this.price })
        this.$refs.addEmployee.open('添加减保员工', { arr: this.form.delDetailList, solutionId: this.item.newVersionSolutionId, price: this.reducePrice })
                }
            },
            uploadUser() {
@@ -534,9 +533,9 @@
                    return
                }
                if (this.activeName === '0') {
                    this.$refs.importEmployees.open('上传名单', { arr: this.form.addDetailList, price: this.price })
        this.$refs.importEmployees.open('加保员工名单', { arr: this.form.addDetailList, type: 1, price: this.price, solutionId: this.item.newVersionSolutionId })
                } else {
                    this.$refs.importEmployees.open('上传名单', { arr: this.form.delDetailList, price: this.price })
        this.$refs.importEmployees.open('减保员工名单', { arr: this.form.delDetailList, type: 0, price: this.reducePrice, solutionId: this.item.newVersionSolutionId, insuranceApplyId: this.form.id })
                }
            },
            // 切换方案
@@ -580,7 +579,7 @@
                    }
                })
                this.seleData = []
                this.$refs.multipleTable.clearSelection();
      this.$refs.multipleTable.clearSelection()
            },
            // 选择员工
            sele() {

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

@@ -1137,10 +1137,14 @@
    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public Integer update(ApplyChange applyChange) {
        if(applyChange.getType().equals(Constants.ZERO)){
            //2024年5月9日14:59:24  修改 默认入当前天
            applyChange.setValidTime(DateUtil.getMontageDate(new Date(),1));
        }
        if (Objects.isNull(applyChange)
                || Objects.isNull(applyChange.getId())
                || Objects.isNull(applyChange.getApplyId())
                || Objects.isNull(applyChange.getValidTime())
//                || Objects.isNull(applyChange.getValidTime())
                || Objects.isNull(applyChange.getType())
                || !(applyChange.getType().equals(Constants.ZERO) || applyChange.getType().equals(Constants.ONE))
        ) {

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

@@ -960,7 +960,6 @@
                .set(Member::getWorktypeId,memberInsurance.getWorktypeId())
                .eq(Member::getId, memberInsurance.getMemberId())
        );

//        if(1==1){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED);
//        }