Explorar el Código

我的公出列表新增合同编号

anderx hace 7 meses
padre
commit
2384aac3bc

+ 2 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -664,6 +664,7 @@
 
     <select id="listPublicRelease" resultType="com.goafanti.weChat.bo.OutPublicReleaseList">
         select a.id ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.aid,a.public_type publicType,a.order_no orderNo,
+        ton.contract_no contractNo,
         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,
         date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,a.district_name districtName,
         a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_name mainName,a.reject_name rejectName,
@@ -681,8 +682,8 @@
             left join public_release_details b on a.id=b.prid
             left join user e on b.uid=e.id  left join admin ad on e.aid=ad.id
         </if>
-        <if test="type==5">
             left join t_order_new ton on a.order_no =ton.order_no
+        <if test="type==5">
             left join t_order_mid tom on a.order_no=tom.order_no
         </if>
         <if test="type==1">

+ 9 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicReleaseList.java

@@ -8,6 +8,7 @@ public class OutPublicReleaseList {
 	private Integer id;
 	private String nickname;
 	private String orderNo;
+	private String contractNo;
 	private String districtName;
 	private String aid;
 	private String aname;
@@ -43,6 +44,14 @@ public class OutPublicReleaseList {
 	private Integer assistProcess;
 	private Integer alone;
 
+	public String getContractNo() {
+		return contractNo;
+	}
+
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+
 	public Integer getMaxProcess() {
 		return maxProcess;
 	}