工资系统推送费用单

cost-core/src/main/java/com/blt/other/other_cost/service/impl/CostApiServiceImpl.java

@@ -274,17 +274,19 @@ public class CostApiServiceImpl implements CostApiService {
         costDomain.setCostRemark(wageCostDto.getCostRemark());
         costDomain.setCostReason(wageCostDto.getCostReason());
 
-        CostTypeDomain costTypeDomain = costTypeDao.selectByCompanyNameAndTypeName(wageCostDto.getCompanyName(), "人工支出");
+//        CostTypeDomain costTypeDomain = costTypeDao.selectByCompanyNameAndTypeName(wageCostDto.getCompanyName(), "人工支出");
 
         CostTypeKindDomain sqlParam = new CostTypeKindDomain();
-        sqlParam.setTypeNo(costTypeDomain.getTypeNo());
+//        sqlParam.setTypeNo(costTypeDomain.getTypeNo());
         sqlParam.setKindName("工资");
+        sqlParam.setCompanyName(wageCostDto.getCompanyName());
+
         CostTypeKindDomain costTypeKindDomain = costTypeKindDao.selectByTypeNoAndKindName(sqlParam);
 
-        costDomain.setTypeNo(costTypeDomain.getTypeNo());
-        costDomain.setTypeName(costTypeDomain.getTypeName());
-        costDomain.setSubjectCode(costTypeDomain.getSubjectCode());
-        costDomain.setCompanyNo(costTypeDomain.getCompanyNo());
+        costDomain.setTypeNo(costTypeKindDomain.getTypeNo());
+        costDomain.setTypeName(costTypeKindDomain.getTypeName());
+        costDomain.setSubjectCode(costTypeKindDomain.getSubjectCode());
+        costDomain.setCompanyNo(costTypeKindDomain.getCompanyNo());
         costDomain.setCompanyName(wageCostDto.getCompanyName()); //dy
         costDomain.setCompanyValue(wageCostDto.getCompanyValue());