Browse Source

公出详情表新增合同编号查询

anderx 3 years ago
parent
commit
2e201bd396

+ 9 - 0
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -704,6 +704,9 @@
 	<if test="clockIn !=null">
 	and a.clock_in= #{clockIn}
 	</if>
+    <if test="contractNo !=null">
+	and f.contract_no= #{contractNo}
+	</if>
     order by b.status,b.create_time desc
 	<if test="page_sql!=null">
 			${page_sql}
@@ -714,6 +717,9 @@
   select count(*)
     from public_release_details a left join public_release b on a.prid =b.id
     left join admin c on b.aid =c.id left join `user` d on a.uid =d.id
+    <if test="contractNo !=null">
+    left join t_order_new f on b.order_no =f.order_no
+    </if>
     where 1=1
     <if test="publicType != null">
       and b.type= #{publicType}
@@ -745,6 +751,9 @@
     <if test="clockIn !=null">
       and a.clock_in= #{clockIn}
     </if>
+    <if test="contractNo !=null">
+      and f.contract_no= #{contractNo}
+    </if>
   </select>
 
   <select id="checkTime" resultType="java.lang.Integer">

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

@@ -6,6 +6,7 @@ public class InputPublicDtails {
 	private String releaseEnd;
 	private String createStart;
 	private String createEnd;
+	private String contractNo;
 	private String aid;
 	private String uid;
 	private Integer status;
@@ -23,6 +24,14 @@ public class InputPublicDtails {
 	private Integer pageSize;
 	private Integer pageNo;
 
+	public String getContractNo() {
+		return contractNo;
+	}
+
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+
 	public String getCreateStart() {
 		return createStart;
 	}

+ 1 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -769,6 +769,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if(in.getCreateStart()!=null) map.put("createStart", in.getCreateStart());
 		if(in.getCreateEnd()!=null) map.put("createEnd", in.getCreateEnd()+" 23:59:59");
 		if(in.getUid()!=null) map.put("uid", in.getUid());
+		if(in.getContractNo()!=null) map.put("contractNo", in.getContractNo());
 		if(in.getStatus()!=null) map.put("status", in.getStatus());
 		if(in.getClockIn()!=null) map.put("clockIn", in.getClockIn());
 		if(in.getPublicType()!=null)map.put("publicType",in.getPublicType());