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

jiangping

2024-06-28 b85e9515805a88914c5c97de8c312146510d1b4e

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

@@ -421,7 +421,7 @@
                        .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey())
                        .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey())
                        .eq(ApplyChange::getType,saveUnionChangeDTO.getBusinessType())
                        .le(ApplyChange::getApplyStartTime,DateUtil.getCurrDateTime())
                        .le(InsuranceApply::getStartTime,DateUtil.getCurrDateTime())
                        .in(ApplyChange::getId,saveUnionChangeDTO.getApplyIds())
                        .isNull(ApplyChange::getUnionChangeId)
        );
@@ -457,6 +457,8 @@
                .set(ApplyChagneDetail::getUnionChangeId,unionChange.getId())
                .in(ApplyChagneDetail::getApplyChangeId,saveUnionChangeDTO.getApplyIds()));



        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_UPLOAD;
        ApplyLog log = new ApplyLog(unionChange,applyLogType.getName(), null
                ,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange));