Browse Source

查询BUG修改

anderx 3 years ago
parent
commit
5f5be34f76

+ 1 - 1
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -96,7 +96,7 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 		List<String>ls= JSON.parseArray(deps,String.class);
 			List<String> myAll=new ArrayList<>();
 			List<String> my=selectMyDeps();
-			if (!ls.isEmpty()&&!my.isEmpty()){
+			if (ls!=null&&!my.isEmpty()){
 				for (String dep : ls) {
 					for (String dep2 : my) {
 						if (dep.equals(dep2))myAll.add(dep);

+ 10 - 4
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1645,8 +1645,11 @@
     <if test="pname !=null">
       and a.commodity_name like concat('%',#{pname},'%')
     </if>
-    <if test="depId !=null">
-      and b.order_dep = #{depId}
+    <if test="deps !=null">
+      and b.order_dep in
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
+      </foreach>
     </if>
     <if test="page_sql!=null">
       ${page_sql}
@@ -1676,8 +1679,11 @@
     <if test="pname !=null">
       and a.commodity_name like concat('%',#{pname},'%')
     </if>
-    <if test="depId !=null">
-      and b.order_dep = #{depId}
+    <if test="deps !=null">
+      and b.order_dep in
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
+      </foreach>
     </if>
   </select>
   <update id="resstPayment">

+ 11 - 9
src/main/java/com/goafanti/order/bo/InputProjectCheck.java

@@ -5,7 +5,7 @@ public class InputProjectCheck {
 	private String orderNo;
 	private String contractNo;
 	private String pname;
-	private String depId;
+	private String deps;
 	private Integer pageSize;
 	private Integer pageNo;
 	public String getName() {
@@ -27,12 +27,14 @@ public class InputProjectCheck {
 		this.contractNo = contractNo;
 	}
 
-	public String getDepId() {
-		return depId;
+	public String getDeps() {
+		return deps;
 	}
-	public void setDepId(String depId) {
-		this.depId = depId;
+
+	public void setDeps(String deps) {
+		this.deps = deps;
 	}
+
 	public Integer getPageSize() {
 		return pageSize;
 	}
@@ -51,8 +53,8 @@ public class InputProjectCheck {
 	public void setPname(String pname) {
 		this.pname = pname;
 	}
-	
-	
-	
-	
+
+
+
+
 }

+ 3 - 20
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -298,26 +298,9 @@ public class AdminNewOrderApiController extends CertifyApiController {
 
 	/**
 	 * 		订单列表
-	 * @param aid
-	 * @param name
-	 * @param orderNo
-	 * @param starTime
-	 * @param endTime
-	 * @param specially 0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单
-	 * @param approval
-	 * @param distribution (咨询师管理列表 0 未分配 1部分 2全部
-	 * @param depId
-	 * @param contractNo
-	 * @param outsource
-	 * @param liquidationStatus
-	 * @param amountStatus  0 10万元以下 1 10万~20万 2 20万~30万 3 30万~40万  4 40万以上
-	 * @param contractStart
-	 * @param contractEnd
-	 * @param uid
-	 * @param projectType
-	 * @param processStatus
-	 * @param pageNo
-	 * @param pageSize
+	 *  specially 0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单
+	 *  distribution (咨询师管理列表 0 未分配 1部分 2全部
+	 *  amountStatus  0 10万元以下 1 10万~20万 2 20万~30万 3 30万~40万  4 40万以上
 	 * @return
 	 */
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -511,7 +511,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (StringUtils.isNotBlank(endTime)) parameter.put("endTime", endTime+" 23:59:59");
 		if (processState==1){
 			List<String > myDep;
-			if (deps==null) {
+			if (deps!=null) {
 				myDep=departmentService.selectSubDeps(deps);
 				if (myDep.isEmpty()){
 					return new Pagination(1,10,0);

+ 3 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1056,7 +1056,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (in.getOrderNo()!=null) map.put("orderNo", in.getOrderNo());
 		if (in.getContractNo()!=null) map.put("contartNo", in.getContractNo());
 		if (in.getPname()!=null) map.put("pname", in.getPname());
-		if (in.getDepId()!=null) map.put("depId", in.getDepId());
+		if (in.getDeps()!=null) {
+			map.put("deps", departmentService.parseArray(in.getDeps()));
+		}
 		map.put("aid", TokenManager.getAdminId());
 		return (Pagination<OutProjectCheck>)findPage("selectProjectCheck", "countProjectCheck", map, in.getPageNo(), in.getPageSize());
 	}