提交一把

jiangping

2024-06-20 09da100729793848bc01b51f7b05ca3f1e7ec64f

提交一把

 company/company/static/css/app.d5bac303.css

ÎļþÒÑɾ³ý

 company/company/static/js/app.3d081695.js

ÎļþÒÑɾ³ý

 company/company/static/js/app.3d081695.js.map

ÎļþÒÑɾ³ý

 company/src/components/business/InsuranceDetailsWtb.vue

@@ -43,7 +43,7 @@
                <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.sex==0?"男":"女" }}</div>
                  <div class="box_table_content_item">{{ item.sex==0?"男":(item.sex==1?"女":"" ) }}</div>
                  <div class="box_table_content_item">{{ item.idcardNo }}</div>
                    <div class="box_table_content_item">{{ item.companyName }}</div>
                    <div class="box_table_content_item">{{ item.duName }}</div>

 company/src/components/business/OperaApplyChangeDetailWindow.vue

@@ -138,7 +138,7 @@
                            label="性别">
                            <template slot-scope="{row}">
                                <span v-if="row.sex === 0">男</span>
                                <span v-else>女</span>
                                <span  v-if="row.sex === 1">女</span>
                            </template>
                        </el-table-column>
                        <el-table-column

 company/src/components/business/OperaApplyChangeUnitDetailWindow.vue

@@ -118,7 +118,7 @@
                            label="性别">
                            <template slot-scope="{row}">
                                <span v-if="row.sex === 0">男</span>
                                <span v-else>女</span>
                              <span  v-if="row.sex === 1">女</span>
                            </template>
                        </el-table-column>
                        <el-table-column

 company/src/components/business/OperaInsuranceApplyShopWindow.vue

@@ -221,7 +221,7 @@
                            label="性别">
                            <template slot-scope="{row}">
                                <span v-if="row.sex === 0">男</span>
                                <span v-else>女</span>
                              <span  v-if="row.sex === 1">女</span>
                            </template>
                        </el-table-column>
                        <el-table-column

 company/src/components/business/OperaInsuranceApplyWindow.vue

@@ -222,7 +222,7 @@
                            label="性别">
                            <template slot-scope="{row}">
                                <span v-if="row.sex === 0">男</span>
                                <span v-else>女</span>
                              <span  v-if="row.sex === 1">女</span>
                            </template>
                        </el-table-column>
                        <el-table-column

 company/src/components/business/OperaUnionChangeDetailWindow.vue

@@ -124,7 +124,7 @@
                            label="性别">
                            <template slot-scope="{row}">
                                <span v-if="row.sex === 0">男</span>
                                <span v-else>女</span>
                              <span  v-if="row.sex === 1">女</span>
                            </template>
                        </el-table-column>
                        <el-table-column

 company/src/components/business/OperaWtbApplyShopWindow.vue

@@ -230,7 +230,7 @@
                            label="性别">
                            <template slot-scope="{row}">
                                <span v-if="row.sex === 0">男</span>
                                <span v-else>女</span>
                              <span  v-if="row.sex === 1">女</span>
                            </template>
                        </el-table-column>
                        <el-table-column

 company/src/components/business/UnionChangeUnitDetails.vue

@@ -55,7 +55,7 @@
                <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" >{{ item.memberName }}</div>
                  <div class="box_table_content_item">{{  item.sex==0?"男":(item.sex==1?"女":"" )}}</div>
                  <div class="box_table_content_item">{{  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.oldDuName }}</div>

 company/src/components/business/detailsEntrustedInsurance.vue

@@ -158,7 +158,7 @@
                label="性别">
              <template slot-scope="{row}">
                <span v-if="row.sex === 0">男</span>
                <span v-else>女</span>
                <span  v-if="row.sex === 1">女</span>
              </template>
            </el-table-column>
            <el-table-column

 company/src/views/business/member.vue

@@ -78,7 +78,7 @@
                <el-table-column label="性别" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.sex === 0">男</span>
                        <span v-else>女</span>
                      <span  v-if="row.sex === 1">女</span>
                    </template>
                </el-table-column>
                <el-table-column prop="idcardNo" label="身份证号码" min-width="100px"></el-table-column>

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

@@ -32,6 +32,7 @@
import lombok.extern.java.Log;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -436,6 +437,9 @@
            if(!StringUtils.equals(model.getName(), detail.getMemberName())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，员工【" +model.getName()+ model.getIdCard() + "】与其登记在保记录姓名不一致，请核实填写正确再操作");
            }
            if(!Constants.equalsInteger(Constants.ZERO, detail.getChangeStatus())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，员工【" +model.getName()+ model.getIdCard() + "】已进行过减保申请，不能再次进行该操作");
            }
            model.setDuId(detail.getDuId());
            model.setDuName(detail.getDuName());
            model.setWorktypeId(detail.getWorktypeId());