git ch

k94314517

2024-04-02 11927cefa1347d192105c9b0bc08d1b91badf18c

git ch

 server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java

@@ -52,6 +52,9 @@
    @ApiModelProperty(value = "单号")
    private String code;

    @ApiModelProperty(value = "方案名称")
    private String solutionName;

    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "提交日期开始")

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

@@ -1888,6 +1888,7 @@
        queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(pageWrap.getModel().getBaseSolutionId()!=null,Solutions::getBaseId,pageWrap.getModel().getBaseSolutionId());
        queryWrapper.in(statusList.size()>0,InsuranceApply::getStatus,statusList);
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getSolutionName()),Solutions::getName,pageWrap.getModel().getSolutionName());
        if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.THREE) ){
            queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
            queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));

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

@@ -101,7 +101,7 @@
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        //企业人员查看本企业数据
        if(loginUserInfo.getType().equals(Constants.ONE)){
        if(loginUserInfo.getType().equals(Constants.ONE)||loginUserInfo.getType().equals(Constants.TWO)){
            queryWrapper.eq(Notices::getCompanyId, loginUserInfo.getCompanyId());
        }else{
            if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
@@ -145,7 +145,6 @@
                queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.TAXES.getKey() });
            } else if(pageWrap.getModel().getQueryType().equals(Constants.TWO)){
                queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.SETTLE_CLAIMS.getKey() });

            }
        }
        if(CollectionUtils.isNotEmpty(pageWrap.getSorts())){

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

@@ -707,7 +707,7 @@
        if(unionApply == null ||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())){
        if(!unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该合并单状态已流转，当前不支持该操作~");
        }
        //加价参数