Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

k94314517

2025-05-20 e567a81f9dd15c15981c25576cc83df6331ea2b5

Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

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

@@ -32,7 +32,6 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
@@ -41,7 +40,6 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
@@ -74,7 +72,6 @@

    @ApiModelProperty(value = "出险人出生日期")
    @ExcelColumn(name="出险人出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date memberBirthday;

    @ApiModelProperty(value = "出险人年纪", example = "1")
@@ -103,12 +100,10 @@

    @ApiModelProperty(value = "保险开始时间")
    @ExcelColumn(name="保险开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date bxStartdate;

    @ApiModelProperty(value = "保险结束时间")
    @ExcelColumn(name="保险结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date bxEnddate;

    @ApiModelProperty(value = "投保人姓名")
@@ -137,7 +132,6 @@

    @ApiModelProperty(value = "注销事件")
    @ExcelColumn(name="注销事件")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date logoffDate;

    @ApiModelProperty(value = "注销处理人")
@@ -174,7 +168,6 @@

    @ApiModelProperty(value = "人员伤亡-出院时间")
    @ExcelColumn(name="人员伤亡-出院时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date rsCyDate;

    @ApiModelProperty(value = "人员伤亡-医疗机构")
@@ -251,7 +244,6 @@

    @ApiModelProperty(value = "鉴定信息-评定日期")
    @ExcelColumn(name="鉴定信息-评定日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date jdPdDate;

    @ApiModelProperty(value = "鉴定信息-伤残等级 0-10", example = "1")

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

@@ -19,6 +19,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.CompensationVO;
import com.doumee.dao.business.vo.RiskConfigVO;
import com.doumee.dao.business.vo.SettleClaimsMoneyVO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SettleClaimsLogService;
import com.doumee.service.business.SettleClaimsService;
@@ -61,6 +62,8 @@

    @Autowired
    private SettleClaimsMapper settleClaimsMapper;
    @Autowired
    private SettleClaimsExtMapper settleClaimsExtMapper;

    @Autowired
    private SettleClaimsLogMapper settleClaimsLogMapper;
@@ -381,39 +384,41 @@
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        settleClaims.setOrigin(Constants.ONE);
        if(Objects.isNull(settleClaims)
                || Objects.isNull(settleClaims.getMemberName())
                || Objects.isNull(settleClaims.getSolutionName())
                || Objects.isNull(settleClaims.getDuId())
                || Objects.isNull(settleClaims.getWorktypeId())
                || Objects.isNull(settleClaims.getHappenTime())
                || Objects.isNull(settleClaims.getType())
                || Objects.isNull(settleClaims.getInHospital())
                || Objects.isNull(settleClaims.getMedicalInsurance())
                || Objects.isNull(settleClaims.getContent())
                || Objects.isNull(settleClaims.getInformantName())
                || Objects.isNull(settleClaims.getInformantPhone())){
                || Objects.isNull(settleClaims.getExtData())
                || Objects.isNull(settleClaims.getExtData().getMemberName())
                || Objects.isNull(settleClaims.getExtData().getMemberIdcardType())
                || Objects.isNull(settleClaims.getExtData().getMemberIdcard())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(!loginUserInfo.getType().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业员工无法进行该操作");
        if(!Constants.equalsObject(settleClaims.getStatus(),Constants.ZERO)
                &&(  Objects.isNull(settleClaims.getExtData().getBxName())
                || Objects.isNull(settleClaims.getExtData().getBxCode())
                || Objects.isNull(settleClaims.getExtData().getBxEnddate())
                || Objects.isNull(settleClaims.getExtData().getBxOrg())
                || Objects.isNull(settleClaims.getInformantPhone()) )){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //查询是否存在已提报的数据  根据人员和保险方案进行过滤 是否存在进行中的数据
        if(settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda()
                .eq(SettleClaims::getSolutionId,settleClaims.getSolutionId())
                .eq(SettleClaims::getMemberId,loginUserInfo.getId())
                .in(SettleClaims::getStatus,Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey(),
                        Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())
        )>Constants.ZERO){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"存在提报中的报案数据!");
        if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非平台管理员无法进行该操作");
        }
        settleClaims.setCreateDate(new Date());
        Date date =new Date();
        settleClaims.setCreateDate(date);
        settleClaims.setEditDate(date);
        settleClaims.setIsdeleted(Constants.ZERO);
        settleClaims.setCompanyId(loginUserInfo.getCompanyId());
        settleClaims.setStatus(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey());
        settleClaims.setCreator(loginUserInfo.getId());
        settleClaims.setCheckUserId(loginUserInfo.getId());
        //
        List<SettleClaimsMoneyVO> feeList = settleClaims.getAccountList();
        settleClaimsMapper.insert(settleClaims);


        settleClaims.getExtData().setCreator(settleClaims.getCreator());
        settleClaims.getExtData().setCreateDate(date);
        settleClaims.getExtData().setEditor(settleClaims.getCreator());
        settleClaims.getExtData().setEditDate(date);
        settleClaims.getExtData().setSettileClaimsId(settleClaims.getId());
        settleClaimsExtMapper.insert(settleClaims.getExtData());

        //--------------处理附件开始----------------
        List<Multifile> reportVideo = settleClaims.getReportFileList();
        if(CollectionUtils.isNotEmpty(reportVideo)){
            for (int i = 0; i < reportVideo.size(); i++) {
@@ -433,6 +438,7 @@
                multifileJoinMapper.insert(multifile);
            }
        }
        //--------------处理附件结束----------------

        return  settleClaims.getId();
    }