提交

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

@@ -179,10 +179,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                 contractPageVO.setTypeId(contract.getTypeId());
                 contractPageVO.setTypeName(contract.getTypeName());
                 contractPageVO.setSecTypeId(contract.getSecTypeId());
-                if (contract.getSecTypeId() != null) {
-                    String secTypeName = secTypeList.stream().filter(c -> c.getId().equals(contract.getSecTypeId())).findFirst().get().getSecTypeName();
-                    contractPageVO.setSecTypeName(secTypeName);
-                }
+                contractPageVO.setSecTypeName(contract.getSecTypeName());
                 contractPageVO.setCheckerId(contract.getCheckerId());
                 contractPageVO.setRemarks(contract.getRemarks());
                 contractPageVO.setAmounts(contract.getAmounts());

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ContractMapper.xml

@@ -28,11 +28,12 @@
     </sql>
     <select id="selectContract" resultType="com.management.platform.entity.Contract">
         select contract.id,contract.company_id,contract.creator_id,contract.number,contract.name,contract.amounts,contract.type_id,contract_type.type_name,contract.status,contract.indate,contract.remarks,
-        contract.start_date as startDate,contract.end_date as endDate,
+        contract.start_date as startDate,contract.end_date as endDate,contract_type_sec.sec_type_name,contract.sec_type_id,
         user.name as creatorName,user.corpwx_userid as creatorWxCorpId, contract.project_id, contract.payment, cp.pay_date AS next_payment_date, cp.amount AS next_payment_amount
         from contract
         left join contract_type
         on contract.type_id = contract_type.id
+        left join contract_type_sec on contract.sec_type_id = contract_type_sec.id
         LEFT JOIN (SELECT contract_id, pay_date, amount FROM contract_payment WHERE is_payed = 0 GROUP BY contract_id) cp ON cp.contract_id=contract.id
         left join user
         on contract.creator_id = user.id