소스 검색

公出详情新增合同编号

anderx 4 년 전
부모
커밋
8d98192493
2개의 변경된 파일14개의 추가작업 그리고 3개의 파일을 삭제
  1. 4 3
      src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml
  2. 10 0
      src/main/java/com/goafanti/weChat/bo/OutPublicRelease.java

+ 4 - 3
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -461,9 +461,10 @@
     select  a.id,b.nickname ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.user_name userName,
     date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
     a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,a.longitude ,a.aid ,c.superior_id suprId,a.uid,
-    a.clock_in clockIn ,a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo
-  	from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
-	where 1=1
+    a.clock_in clockIn ,a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo
+    from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
+    left join t_order_new d on a.order_no=d.order_no
+    where 1=1
 	<if test="id !=null">
 	and a.id= #{id}
 	</if>

+ 10 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicRelease.java

@@ -24,6 +24,16 @@ public class OutPublicRelease extends PublicRelease {
 
 	private String clockInTimes;
 
+	private  String contractNo;
+
+	public String getContractNo() {
+		return contractNo;
+	}
+
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+
 	public String getClockInTimes() {
 		return clockInTimes;
 	}