合同定制字段

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractServiceImpl.java

@@ -156,6 +156,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             }
             ArrayList<ContractPageVO> contractPageVOS = new ArrayList<>();
             List<Map<String, Object>> contractLogs = contractLogMapper.selectMsg(user.getCompanyId());
+            List<ContractCustom> customList = contractCustomMapper.selectList(new QueryWrapper<ContractCustom>().in("contract_id", contractCollect));
+
             for (Contract contract : contracts) {
                 ContractPageVO contractPageVO = new ContractPageVO();
                 List<ContractDocument> files = new ArrayList<>();
@@ -200,6 +202,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                     }
                 }
                 contractPageVO.setFiles(files);
+                for (ContractCustom custom : customList) {
+                    if (contract.getId().equals(custom.getContractId())){
+                        contractPageVO.setCustomData(custom);
+                    }
+                }
                 contractPageVOS.add(contractPageVO);
             }
             HashMap<String, Object> map = new HashMap<>();