Browse Source

客户释放修改

anderx 1 year ago
parent
commit
3504ca29c6

+ 6 - 0
src/main/java/com/goafanti/common/mapper/UserServiceMapper.xml

@@ -279,6 +279,9 @@ from t_order_new a
 left join t_order_mid b on a.order_no =b.order_no  left join user_service c on a.buyer_id =c.uid
 left join admin d on c.aid =d.id
 where a.delete_sign in(0,2,3)
+    <if test="contractNo!=null">
+  and  a.contract_no like CONCAT('%', #{contractNo},'%')
+    </if>
   <if test="userName != null">
   and b.buyer_name like CONCAT('%', #{userName},'%')
   </if>
@@ -312,6 +315,9 @@ from t_order_new a
 left join t_order_mid b on a.order_no =b.order_no  left join user_service c on a.buyer_id =c.uid
 left join admin d on c.aid =d.id
 where a.delete_sign in(0,2,3)
+   <if test="contractNo!=null">
+     and a.contract_no like CONCAT('%', #{contractNo},'%')
+   </if>
     <if test="userName != null">
     and b.buyer_name like CONCAT('%', #{userName},'%')
     </if>

+ 10 - 0
src/main/java/com/goafanti/user/bo/InputListOrderUserService.java

@@ -22,8 +22,18 @@ public class InputListOrderUserService {
 //	合同签订时间
 	private String startSignTimes;
 	private String endSignTimes;
+	private String contractNo;
 	private Integer pageSize;
 	private Integer pageNo;
+
+	public String getContractNo() {
+		return contractNo;
+	}
+
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+
 	public String getUserName() {
 		return userName;
 	}

+ 10 - 14
src/main/java/com/goafanti/user/service/impl/UserServiceServiceImpl.java

@@ -1,15 +1,6 @@
 package com.goafanti.user.service.impl;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.goafanti.admin.service.DepartmentService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.UserServiceFollowMapper;
 import com.goafanti.common.dao.UserServiceMapper;
@@ -19,12 +10,16 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.user.bo.InputListOrderUserService;
-import com.goafanti.user.bo.InputUserServiceFollow;
-import com.goafanti.user.bo.OrderProject;
-import com.goafanti.user.bo.OutOrderUserService;
-import com.goafanti.user.bo.OutUserServiceFollow;
+import com.goafanti.user.bo.*;
 import com.goafanti.user.service.UserServiceService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class  UserServiceServiceImpl extends BaseMybatisDao<UserServiceMapper> implements UserServiceService {
@@ -84,6 +79,7 @@ public class  UserServiceServiceImpl extends BaseMybatisDao<UserServiceMapper> i
 		if(i.getEndSignTimes()!=null)map.put("endSignTimes", i.getEndSignTimes()+" 23:59:59");
 		if(i.getAddWechat()!=null)map.put("addWechat", i.getAddWechat());
 		if(i.getRenewal()!=null)map.put("renewal", i.getRenewal());
+		if (i.getContractNo()!=null)map.put("contractNo", i.getContractNo());
 		return map;
 	}