Merge remote-tracking branch 'origin/dev-nx' into dev-nx

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java

@@ -344,7 +344,9 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
         return leaseList;
     }
 
-    /**结算单号编码生成规则*/
+    /**
+     * 结算单号编码生成规则
+     */
     private String sltCodeRule(String code) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
         Date nowDate = DateUtils.getNowDate();

sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml

@@ -94,12 +94,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getSltAgreementInfo" resultType="com.bonus.sgzb.material.domain.AgreementInfo">
         SELECT bai.agreement_id, bai.agreement_code, contract_code,file_url ,file_name,sign_time,
         bui.unit_id,bui.unit_name , bp.lot_id as projectId , bp.lot_name as projectName,
-        plan_start_time,lease_day,auth_person,phone,bai.remark,bai.protocol,sar.cost as cost,
+        plan_start_time,lease_day,auth_person,phone,saa.remark,bai.protocol,sar.cost as cost,
         case when sar.id is null then '1' when sar.status = '0' then '2' when sar.status = '1' then '3' end as sltStatus
         FROM bm_agreement_info bai
         LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id
         LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
-        left join slt_agreement_relation sar on bai.agreement_id = sar.agreement_id
+        LEFT JOIN slt_agreement_relation sar on bai.agreement_id = sar.agreement_id
+        LEFT JOIN slt_agreement_apply saa on saa.id = sar.apply_id
         where bai.status = '1'
         <if test="unitId != null  and unitId != ''">
             and bui.unit_id = #{unitId}