24282 3 kuukautta sitten
vanhempi
commit
b04f41f727

+ 2 - 2
jy-business/src/main/java/com/jy/business/contract/service/impl/ContractInfoServiceImpl.java

@@ -60,11 +60,11 @@ public class ContractInfoServiceImpl implements ContractInfoService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(ContractInfoDto dto) {
-        contractInfoDao.save(dto);
+        contractInfoDao.saveOrUpdate(dto);
 
         List<ContractDetail> list = dto.getList();
         list.forEach(item -> item.setContractId(dto.getId()));
-        contractDetailDao.saveBatch(list);
+        contractDetailDao.updateLinked(list, ContractDetail::getContractId, dto.getId());
     }
 
     @Transactional(rollbackFor = Exception.class)

+ 1 - 1
jy-business/src/main/java/com/jy/business/listener/JyRabbitListener.java

@@ -117,7 +117,7 @@ public class JyRabbitListener {
 
         capitalTransactionsService.add(dto);
 
-        if (ObjectUtil.equal(dto.getHasBulkOrder(), CommonConstant.YES) && dto.getContractInfo() != null) {
+        if (dto.getContractInfo() != null) {
             contractInfoService.add(dto.getContractInfo());
         }
     }

+ 1 - 1
jy-ui/src/views/business/capital/transactions/index.vue

@@ -25,7 +25,7 @@ const pageTotal = ref<number>(0)
 
 const queryData = ref<StrAnyObj>({ pageNum: 1, pageSize: 10 })
 const tableData = ref<StrAnyObjArr>([])
-const formData = ref<StrAnyObj>({ type: 1 })
+const formData = ref<StrAnyObj>({ type: 1, targetType: 99 })
 
 const dialogTitle = ref<string>('')
 const dialogVisible = ref<boolean>(false)