Browse Source

接口部门搜索

anderx 3 years ago
parent
commit
a7728e2ca5

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

@@ -883,8 +883,11 @@
     <if test="projectStatus != null">
       and a.project_status = #{projectStatus,jdbcType=INTEGER}
     </if>
-    <if test="depId != null">
-      and e.order_dep= #{depId,jdbcType=VARCHAR}
+    <if test="deps != null">
+      and e.order_dep in
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
+      </foreach>
     </if>
     <if test="name != null">
       and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
@@ -952,8 +955,11 @@
     <if test="projectStatus != null">
       and a.project_status = #{projectStatus,jdbcType=INTEGER}
     </if>
-    <if test="depId != null">
-      and e.order_dep = #{depId,jdbcType=VARCHAR}
+    <if test="deps != null">
+      and e.order_dep in
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
+      </foreach>
     </if>
     <if test="name != null">
       and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')

+ 9 - 6
src/main/java/com/goafanti/order/bo/inuptTaskListBo.java

@@ -7,7 +7,7 @@ public class inuptTaskListBo {
 	private Integer taskStatus;
 	private String adminName;
 	private Integer specially;
-	private String depId;
+	private String deps;
 	private  String contractNo;
 	private Integer projectStatus;
 	private  Integer approval;
@@ -63,12 +63,15 @@ public class inuptTaskListBo {
 	public void setSpecially(Integer specially) {
 		this.specially = specially;
 	}
-	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 String getContractNo() {
 		return contractNo;
 	}
@@ -123,5 +126,5 @@ public class inuptTaskListBo {
 	public void setPageSize(Integer pageSize) {
 		this.pageSize = pageSize;
 	}
-	
+
 }

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

@@ -321,7 +321,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		params.put("outsource", ib.getOutsource()==null?0:ib.getOutsource());
 		if (null!=ib.getSpecially()) params.put("specially", ib.getSpecially());
 		if (StringUtils.isNotBlank(ib.getName())) params.put("name", ib.getName());
-		if (StringUtils.isNotBlank(ib.getDepId())) params.put("depId", ib.getDepId());
+		if (StringUtils.isNotBlank(ib.getDeps())) params.put("deps", departmentService.parseArray(ib.getDeps()));
 		if (StringUtils.isNotBlank(ib.getOrderNo())) params.put("orderNo", ib.getOrderNo());
 		if (StringUtils.isNotBlank(ib.getContractNo())) params.put("contractNo", ib.getContractNo());
 		if (ib.getProjectStatus() !=null ) params.put("projectStatus", ib.getProjectStatus());