nidapeng
2024-04-01 4c179612568430d4d9ebdc41d520c96e0c6ecded
提交一把
已修改7个文件
64 ■■■■ 文件已修改
company/src/assets/style/style.scss 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/detailsEntrustedInsurance.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/unionApply.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/assets/style/style.scss
@@ -83,7 +83,7 @@
.change-status0,.change-status1,.change-status2,
.settle-status0,.settle-status2,.settle-status3,
.tax-status0,
.union-apply-status0,.union-apply-status1,.union-apply-status2
.union-apply-status0,.union-apply-status1,.union-apply-status2,
.du-status0 {
  color: #216EEE  !important;
}
company/src/components/business/detailsEntrustedInsurance.vue
@@ -512,7 +512,7 @@
        }
        this.isWorking = true
        if(this.form.type===0){
          getSignTBQRSLink(this.form).then(res => {
          getSignLink(this.form).then(res => {
            setTimeout(() => {
              this.visiblePhone=false
              window.open(res)
company/src/views/business/unionApply.vue
@@ -54,7 +54,7 @@
                </el-table-column>
                <el-table-column prop="statusInfo" label="状态" min-width="100px">
                    <template slot-scope="{row}">
                        <span :class="'union-apply-status'+row.status" v-if="row.status==0">{{ row.statusInfo}}</span>
                        <span :class="'union-apply-status'+row.status"  >{{ row.statusInfo}}</span>
                    </template>
                </el-table-column>
                <el-table-column prop="solutionName" label="保险方案" min-width="100px"></el-table-column>
server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
@@ -144,4 +144,14 @@
    @ApiModelProperty(value = "人员信息")
    @TableField(exist = false)
    private List<ApplyDetail> applyDetailList;
    @ApiModelProperty(value = "投保单对象")
    @TableField(exist = false)
    private Multifile toubaodanFile;
    @ApiModelProperty(value = "投保单(已签署)对象")
    @TableField(exist = false)
    private Multifile toubaodanSignedFile;
    @ApiModelProperty(value = "保险单对象")
    @TableField(exist = false)
    private Multifile baoxiandanFile;
}
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -765,7 +765,7 @@
        f.setCreator(model.getCreator());
        f.setObjId(update.getId());
        f.setCreateDate(update.getEditDate());
        f.setObjType(Constants.MultiFile.HBD_BD_APPLY_PDF.getKey());
        f.setObjType(Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey());
        f.setType(Constants.TWO);
        f.setFileurl(fileurl);
        f.setFileurlFull(fullUrl);
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -36,10 +36,7 @@
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -319,6 +316,8 @@
        }
        initStatusInfo(unionApply);
        //查询附件数据
        initImgData(unionApply);
        //查询操作记录
        List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
                new MPJLambdaWrapper<ApplyLog>()
@@ -333,10 +332,41 @@
                        .orderByAsc(ApplyLog::getCreateDate)
        );
        unionApply.setApplyLogList(applyLogList);
        return unionApply;
    }
    private void initImgData(UnionApply model) {
        List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
                .eq(Multifile::getObjId, model.getId())
                .in(Multifile::getObjType, Arrays.asList(new Integer[]{
                        Constants.MultiFile.HBD_BD_APPLY_PDF.getKey()
                        ,Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey()
                        ,Constants.MultiFile.WTB_BD_DONE_PDF.getKey() }))
                .eq(Multifile::getIsdeleted,Constants.ZERO)
                .orderByAsc(Multifile::getId));
        if(multifiles!=null){
            String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
            for(Multifile f : multifiles){
                if(StringUtils.isBlank(f.getFileurl())){
                    continue;
                }
                f.setFileurlFull(path+f.getFileurl());
                if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.HBD_BD_APPLY_PDF.getKey())){
                    //签署前的投保单
                    model.setToubaodanFile(f);
                }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey())){
                    //签署后的投保单
                    model.setToubaodanSignedFile(f);
                }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.WTB_BD_DONE_PDF.getKey())){
                    //最終保险单
                    model.setBaoxiandanFile(f);
                }
            }
        }
    }
    @Override
@@ -508,13 +538,14 @@
        if(Objects.isNull(unionApply)||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        unionApply.setStatus(Constants.formatIntegerNum(unionApply.getStatus()));
        if(!unionApply.getCompanyId().equals(user.getCompanyId())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起非您的合并单,您无法进行操作!");
        }
        if(unionApply.getStatus().equals(Constants.UnionApplyStatus.FINISH.getKey())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起,合并单业务已完结,您无法进行该操作!");
        }
        if(unionApply.getStatus().equals(Constants.UnionApplyStatus.MERGE.getKey())){
        if(!unionApply.getStatus().equals(Constants.UnionApplyStatus.MERGE.getKey())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起,合并单业务已流转,您无法进行该操作!");
        }
@@ -566,7 +597,7 @@
        multifile.setCreateDate(new Date());
        multifile.setObjId(uploadMultifileDTO.getBusinessId());
        multifile.setCreateDate(new Date());
        multifile.setObjType(Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey());
        multifile.setObjType(Constants.MultiFile.HBD_BD_APPLY_PDF.getKey());
        multifile.setType(Constants.TWO);
        multifile.setFileurl(uploadMultifileDTO.getFileurl());
        multifile.setName(uploadMultifileDTO.getName());
server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
@@ -126,8 +126,7 @@
    @PostMapping("/getSignLink")
    @RequiresPermissions("business:unionapply:query")
    public ApiResponse getSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
        unionApplyService.getSignLink(smsCheckDTO);
        return ApiResponse.success(null);
        return ApiResponse.success( unionApplyService.getSignLink(smsCheckDTO));
    }