|
|
@@ -1,32 +1,26 @@
|
|
|
package com.imed.costaccount.service.impl;
|
|
|
|
|
|
-import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
-import cn.hutool.extra.template.TemplateUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import com.imed.costaccount.common.constants.Constant;
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.imed.costaccount.common.exception.CostException;
|
|
|
import com.imed.costaccount.common.util.PageUtils;
|
|
|
import com.imed.costaccount.mapper.CostIncomeGroupMapper;
|
|
|
+import com.imed.costaccount.mapper.IncomeCollectionMapper;
|
|
|
import com.imed.costaccount.model.AfterIncomegroup;
|
|
|
import com.imed.costaccount.model.CostIncomeGroup;
|
|
|
+import com.imed.costaccount.model.IncomeCollection;
|
|
|
import com.imed.costaccount.model.dto.CollectDTO;
|
|
|
import com.imed.costaccount.model.vo.CollectedVO;
|
|
|
import com.imed.costaccount.model.vo.CollectionVO;
|
|
|
+import com.imed.costaccount.service.IncomeCollectionService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-
|
|
|
-import com.imed.costaccount.mapper.IncomeCollectionMapper;
|
|
|
-import com.imed.costaccount.model.IncomeCollection;
|
|
|
-import com.imed.costaccount.service.IncomeCollectionService;
|
|
|
import org.springframework.transaction.annotation.Propagation;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.math.BigInteger;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -125,6 +119,11 @@ public class IncomeCollectionServiceImpl
|
|
|
if (Objects.isNull(afterIncomegroup)) {
|
|
|
throw new CostException("未能正确归集对应的....");
|
|
|
}
|
|
|
+ // 转换一下其他的
|
|
|
+ if (afterIncomegroup.getDirectStatus() == 2) {
|
|
|
+ afterIncomegroup.setDirectStatus(0);
|
|
|
+ }
|
|
|
+ incomeCollection.setIsDirectIncome(afterIncomegroup.getDirectStatus());
|
|
|
// 开单中心的数据
|
|
|
incomeCollection.setDepartmentCode(afterIncomegroup.getOpenDepartmentCode());
|
|
|
incomeCollection.setDepartmentName(afterIncomegroup.getOpenDepartmentName());
|
