111

k94314517

2024-02-05 15e588eb6a7549ecd2aaffb45e67f11e68354eb6

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

@@ -190,8 +190,9 @@
                .eq(Solutions::getBaseId,solutions.getId())
                .eq(Solutions::getDataType,Constants.TWO)
                .set(Solutions::getDataType,Constants.ONE)
                .set(StringUtils.isNotBlank(solutions.getSignKeyword()),Solutions::getSignKeyword,solutions.getSignKeyword())
        );
        //处理工作信息，新增最新的，同时产生历史版本
        //处理工种信息，新增最新的，同时产生历史版本
        dealWorkType(solutions,newModel,solutions.getWorktypeIdList(),false);
    }

@@ -261,6 +262,7 @@
    @Override
    public List<Solutions> findList(Solutions solutions) {
        solutions.setIsdeleted(Constants.ZERO);
        solutions.setStatus(Constants.ZERO);
        if(solutions.getDataType() == null){
            solutions.setDataType(Constants.TWO);
        }
@@ -422,23 +424,6 @@
                .eq(CompanySolution::getCompanyId,user.getCompanyId())
                .orderByAsc(Solutions::getSortnum)
        );

//        solutionsList.forEach(i->{
//            //保险时间单位 与 最小投保周期时间单位 规则相同 或者 最小投保周期时间单位 规则为 天时 默认金额
//            if(i.getTimeUnit().equals(i.getInsureCycleUnit())||i.getInsureCycleUnit().equals(Constants.ZERO)){
//                i.setCyclePrice(i.getPrice());
//            }else{
//                if(i.getInsureCycleUnit().equals(Constants.ONE)){
//                    //最小投保周期时间单位为半月
//                    i.setCyclePrice(i.getPrice().multiply(new BigDecimal(15)));
//                }else if(i.getInsureCycleUnit().equals(Constants.TWO)){
//                    //最小投保周期时间单位为月 则计算当月多少天
//                    if( ){
//
//                    }
//                }
//            }
//        });
        return solutionsList;
    }