git ch

k94314517

2025-01-03 f1a64d400938d12478161b95aed0c38c28141110

git ch

 server/service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -3157,7 +3157,7 @@


    public static void main(String[] args) throws Exception{
        System.out.println(DateUtil.getLongDateTime(new Date()));;
        System.out.println(DateUtil.daysBetweenDates(DateUtil.getDateFromString("2024-12-31 23:59:59"),DateUtil.getDateFromString("2024-12-01 00:00:00")));
    }

    /**

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

@@ -797,6 +797,7 @@
                                .selectAs(DispatchUnit::getName, ApplyChagneDetail::getDuName)
                                .selectAs(Member::getName, ApplyChagneDetail::getMemberName)
                                .selectAs(Solutions::getName,ApplyChagneDetail::getSolutionsName)
                                .selectAs(Solutions::getId,ApplyChagneDetail::getSolutionId)
                                .selectAs(InsuranceApply::getCode,ApplyChagneDetail::getApplyCode)
                                .selectAs(InsuranceApply::getServerCost,ApplyChagneDetail::getServerCost)
                                .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
@@ -853,6 +854,7 @@
        List<ApplyChagneDetail> reduceList = applyChagneDetailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.ONE)).collect(Collectors.toList());
        List<ApplyChagneDetail> changeList = applyChagneDetailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.TWO)).collect(Collectors.toList());
        for (ApplyChagneDetail detail:reduceList) {
            solutions = solutionsMapper.selectById(detail.getSolutionId());
            Member member = memberMapper.selectById(detail.getMemberId());
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到员工数据");
@@ -866,6 +868,7 @@
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到员工数据");
            }
            solutions = solutionsMapper.selectById(detail.getSolutionId());
            this.addChangeDetailData(applyChange,detail,insuranceApply,solutions,bigDecimalVO,reduceList,i);
        }