|
@@ -35,7 +35,6 @@ import com.jzg.organization.state.listener.CostStateListener;
|
|
|
import io.seata.spring.annotation.GlobalTransactional;
|
|
import io.seata.spring.annotation.GlobalTransactional;
|
|
|
import jakarta.annotation.Resource;
|
|
import jakarta.annotation.Resource;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.redisson.api.IdGenerator;
|
|
|
|
|
import org.redisson.api.RList;
|
|
import org.redisson.api.RList;
|
|
|
import org.redisson.api.RedissonClient;
|
|
import org.redisson.api.RedissonClient;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -48,7 +47,6 @@ import org.springframework.util.CollectionUtils;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
import java.time.format.DateTimeFormatter;
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
-import java.util.Collections;
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -99,8 +97,12 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public HttpResult save(PtlAgreemenCostAdd ptlAgreemenCostAdd) {
|
|
|
|
|
|
|
+ public HttpResult<String> save(PtlAgreemenCostAdd ptlAgreemenCostAdd) {
|
|
|
log.info("报价配置/费用管理/新增费用. ptlAgreemenCostAdd=[{}]", JSONUtil.toJsonStr(ptlAgreemenCostAdd));
|
|
log.info("报价配置/费用管理/新增费用. ptlAgreemenCostAdd=[{}]", JSONUtil.toJsonStr(ptlAgreemenCostAdd));
|
|
|
|
|
+ if(StrUtil.isEmpty(ptlAgreemenCostAdd.getPtlAgreementId()) || StrUtil.isEmpty(ptlAgreemenCostAdd.getPtlAgreementCode())){
|
|
|
|
|
+ log.info("新增费用的时候,需要指定关联的协议信息。ptlAgreemenCostAdd=[{}]", JSONUtil.toJsonStr(ptlAgreemenCostAdd));
|
|
|
|
|
+ return HttpResult.error("新增费用的时候,需要指定关联的协议信息");
|
|
|
|
|
+ }
|
|
|
List<CostAdd> costAddList = ptlAgreemenCostAdd.getCostAddList();
|
|
List<CostAdd> costAddList = ptlAgreemenCostAdd.getCostAddList();
|
|
|
if (costAddList.isEmpty()) {
|
|
if (costAddList.isEmpty()) {
|
|
|
log.info("费用管理:保存数据不能为空");
|
|
log.info("费用管理:保存数据不能为空");
|