jiangping
2025-06-16 6cc2df2fd4eb4b7297f5a65b5adda103c6eadc56
提交一把订单
已修改2个文件
20 ■■■■■ 文件已修改
server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java
@@ -157,10 +157,10 @@
        if(StringUtils.isBlank(solutionsBase.getName())||
            StringUtils.isBlank(solutionsBase.getCompanyName())
                || Objects.isNull(solutionsBase.getValidType())
                || Objects.isNull(solutionsBase.getCanAdd())
                || Objects.isNull(solutionsBase.getCanReduce())
                || Objects.isNull(solutionsBase.getCanChangeUnit())
                || Objects.isNull(solutionsBase.getDelOnlyReplace())
//                || Objects.isNull(solutionsBase.getCanAdd())
//                || Objects.isNull(solutionsBase.getCanReduce())
//                || Objects.isNull(solutionsBase.getCanChangeUnit())
//                || Objects.isNull(solutionsBase.getDelOnlyReplace())
                || Objects.isNull(solutionsBase.getAddValidDays())
                || Objects.isNull(solutionsBase.getDelValidDays())
                || Objects.isNull(solutionsBase.getInsuranceId())
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -79,9 +79,10 @@
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到主方案数据!");
        }
        solutions.setInsuranceId(solutionsBase.getInsuranceId());
        solutions.setCanAdd(solutionsBase.getCanAdd());
        solutions.setCanReduce(solutionsBase.getCanReduce());
        solutions.setCanChangeUnit(solutionsBase.getCanChangeUnit());
//        solutions.setCanAdd(solutionsBase.getCanAdd());
//        solutions.setCanReduce(solutionsBase.getCanReduce());
//        solutions.setCanChangeUnit(solutionsBase.getCanChangeUnit());
//        solutions.setDelOnlyReplace(solutionsBase.getDelOnlyReplace());
        solutions.setAddValidDays(solutionsBase.getAddValidDays());
        solutions.setDelValidDays(solutionsBase.getDelValidDays());
        solutions.setMinAge(solutionsBase.getMinAge());
@@ -98,7 +99,6 @@
        solutions.setDataType(Constants.ZERO);
        solutions.setStatus(Constants.ZERO);
        solutions.setCorrectWarnTime(solutionsBase.getCorrectWarnTime());
        solutions.setDelOnlyReplace(solutionsBase.getDelOnlyReplace());
        //2024年6月17日15:56:18 仅支持替换模式下,批增日期 等于 批减日期
        if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)){
            solutions.setAddValidDays(solutions.getDelValidDays());
@@ -211,6 +211,10 @@
                ||Objects.isNull(solutions.getType())
                ||Objects.isNull(solutions.getRetrial())
                ||Objects.isNull(solutions.getFanganFile())
               || Objects.isNull(solutions.getCanAdd())
                || Objects.isNull(solutions.getCanReduce())
                || Objects.isNull(solutions.getCanChangeUnit())
                || Objects.isNull(solutions.getDelOnlyReplace())
//                ||Constants.formatIntegerNum(solutions.getPriceCycleUnit()) < 0
                ||Constants.formatIntegerNum(solutions.getInsureCycle()) < 0
                ||Constants.formatIntegerNum(solutions.getInsureCycleUnit()) < 0