app项目详情接口修改

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/model/ContractResponse.java

@@ -16,7 +16,7 @@ public class ContractResponse {
     /**
      * 合同编号
      */
-    private String contractId;
+    private String contractCode;
     /**
      * 合同来源
      */
@@ -62,7 +62,7 @@ public class ContractResponse {
      */
     private String contractStatus;
     /**
-     * 上一个合同编号
+     * 签约合同编号
      */
-    private String previousId;
+    private String nextId;
 }

lift-business-service/src/main/resources/mapper/contract/ContractsMapper.xml

@@ -34,8 +34,8 @@
             parameterType="cn.com.ty.lift.business.contract.dao.entity.model.ContractRequest" >
         SELECT
             c.id            AS id,
-            c.next_id       AS contractId,
-            c.previous_id   AS previousId,
+            c.code          AS contractCode,
+            c.next_id       AS nextId,
             c.source        AS contractSource,
             c.type          AS contractType,
             c.star_date     AS starDate,

lift-business-service/src/main/resources/mapper/project/ProjectMapper.xml

@@ -165,7 +165,9 @@
 	<select id="findProjectById" parameterType="cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest"
 			resultType="cn.com.ty.lift.business.project.dao.entity.model.response.ProjectDetailResponse">
 		SELECT t.*,
-			   ui.name AS clerkName
+			   ui.name         AS clerkName,
+			   pcc.name        AS companyContact,
+			   pcc.telephone   AS telephone
 		FROM (SELECT p.project_name  AS projectName,
 					 p.project_usage AS projectUsage,
 					 p.address       AS address,
@@ -176,21 +178,21 @@
 					 p.start_date    AS startDate,
 					 p.end_date      AS endDate,
 					 pc.name         AS companyName,
-					 pcc.name        AS companyContact,
-					 pcc.telephone   AS telephone,
 					 ui.name         AS areaDirector,
 					 r.area_name     AS areaName,
-					 r.clerk         AS clerk_id
+					 r.clerk         AS clerk_id,
+		             r.id            AS regionId,
+		             p.pp_contact_id AS contact_id
 		FROM project p
-				LEFT JOIN property_company pc ON p.mt_company_id = pc.mt_company_id
-				LEFT JOIN property_contact pcc ON pc.id = pcc.pp_company_id
-				LEFT JOIN region r ON p.region_id = r.id
-				LEFT JOIN user_info ui ON r.user_id = ui.user_id
+				 LEFT JOIN region r ON p.region_id = r.id
+				 LEFT JOIN user_info ui ON r.user_id = ui.user_id
+				 LEFT JOIN property_company pc ON p.pp_company_id = pc.id
 		WHERE 1=1
 		<if test="request.id!=null and request.id!=''">
 			AND p.id = #{request.id,jdbcType=VARCHAR}
 		</if>
 		    ) t
+		LEFT JOIN property_contact pcc ON t.contact_id = pcc.id
 		LEFT JOIN user_info ui ON ui.user_id = t.clerk_id
 	</select>