Ver código fonte

查询BUG修改

anderx 3 anos atrás
pai
commit
d771fdcbd5

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

@@ -73,7 +73,9 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 	private List<String> selectCurrentDep(String managerId){
 		List<String> alldep = new ArrayList<>();
 		List<String> superData = departmentMapper.selectCurrentDeps(managerId);
-		if (!superData.isEmpty())iterationDep(alldep,superData);
+		if (!superData.isEmpty()){
+			iterationDep(alldep,superData);
+		}
 		return alldep;
 	}
 
@@ -94,9 +96,11 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 		List<String>ls= JSON.parseArray(deps,String.class);
 			List<String> myAll=new ArrayList<>();
 			List<String> my=selectMyDeps();
-			for (String dep : ls) {
-				for (String dep2 : my) {
-					if (dep.equals(dep2))myAll.add(dep);
+			if (!my.isEmpty()){
+				for (String dep : ls) {
+					for (String dep2 : my) {
+						if (dep.equals(dep2))myAll.add(dep);
+					}
 				}
 			}
 		return myAll;

+ 15 - 9
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1269,8 +1269,11 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     <if test="contractNo != null">
       and b.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
     </if>
-  	<if test="depId != null">
-  	and b.order_dep= #{depId,jdbcType=VARCHAR}
+  	<if test="deps != null">
+  	and b.order_dep in
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
+      </foreach>
   	</if>
 	<if test="dunStatus != null">
     and  a.status= #{dunStatus}
@@ -1341,9 +1344,12 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
      <if test="contractNo != null">
        and b.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
      </if>
-  	<if test="depId != null">
-  	and b.order_dep= #{depId,jdbcType=VARCHAR}
-  	</if>
+     <if test="deps != null">
+       and b.order_dep in
+       <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+         #{depId}
+       </foreach>
+     </if>
      <if test="dunStatus != null">
        and  a.status= #{dunStatus}
      </if>
@@ -1596,8 +1602,8 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     </if>
     <if test="deps != null">
       and b.order_dep in
-      <foreach close=")" collection="deps" item="deps" open="(" separator=",">
-        #{deps.id}
+      <foreach close=")" collection="deps" item="dep" open="(" separator=",">
+        #{dep}
       </foreach>
     </if>
     <if test="shiroType !=3 and aid != null">
@@ -1639,8 +1645,8 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     </if>
     <if test="deps != null">
       and b.order_dep in
-      <foreach close=")" collection="deps" item="deps" open="(" separator=",">
-        #{deps.id}
+      <foreach close=")" collection="deps" item="dep" open="(" separator=",">
+        #{dep}
       </foreach>
     </if>
     <if test="shiroType !=3 and aid != null">

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

@@ -11,10 +11,18 @@ public class InputArrearsDunListBo {
 	private String  tStarTime;
 	private String  tEndTime;
 	private String  adminName;
-	private List<String>  deps;
+	private String deps;
 	private Integer pageNo;
 	private Integer pageSize;
 
+	public String getDeps() {
+		return deps;
+	}
+
+	public void setDeps(String deps) {
+		this.deps = deps;
+	}
+
 	public String getContractNo() {
 		return contractNo;
 	}
@@ -55,14 +63,6 @@ public class InputArrearsDunListBo {
 		this.adminName = adminName;
 	}
 
-	public List<String> getDeps() {
-		return deps;
-	}
-
-	public void setDeps(List<String> deps) {
-		this.deps = deps;
-	}
-
 	public Integer getPageNo() {
 		return pageNo;
 	}

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

@@ -370,10 +370,10 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value="/dunOrderNewList", method = RequestMethod.GET)
 	public Result dunOrderNewList(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially,String aid,
-			String adminName,String depId,Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,
+			String adminName,String deps,Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,
 								  Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.data(orderNewService.dunOrderNewList(name, orderNo,contractNo, starTime, endTime,specially,aid,  adminName, depId,newStatus,
+		res.data(orderNewService.dunOrderNewList(name, orderNo,contractNo, starTime, endTime,specially,aid,  adminName, deps,newStatus,
 				approval,amountStatus,memberType,pageNo, pageSize));
 		return res;
 	}

+ 2 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -81,7 +81,8 @@ public interface OrderNewService {
 	 * @param pageNo
 	 * @param pageSize
 	 */
-	Pagination<outOrderDunListBo> dunOrderNewList(String name, String orderNo,String contractNo, String starTime, String endTime,Integer specially, String aid,String adminName,String depId,
+	Pagination<outOrderDunListBo> dunOrderNewList(String name, String orderNo,String contractNo, String starTime, String endTime,Integer specially, String aid,
+												  String adminName,String deps,
 			Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,Integer pageNo, Integer pageSize);
 
 	Result exportOrderDunData(String name, String orderNo, String contractNo, String starTime, String endTime, Integer specially, String aid, String adminName,

+ 5 - 5
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -969,7 +969,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<outOrderDunListBo> dunOrderNewList(String name, String orderNo,String contractNo, String starTime, String endTime,
-			Integer specially,String  aid, String adminName,String depId,Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,Integer pageNo, Integer pageSize) {
+			Integer specially,String  aid, String adminName,String deps,Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(newStatus!=null&&newStatus==0) {
 			params.put("newStatus", 0);
@@ -979,8 +979,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(name)) {
 			params.put("name", name);
 		}
-		if (StringUtils.isNotBlank(depId)) {
-			params.put("depId", depId);
+		if (StringUtils.isNotBlank(deps)) {
+			params.put("deps", departmentService.parseArray(deps));
 		}
 		if (StringUtils.isNotBlank(adminName)) {
 			params.put("adminName", adminName);
@@ -1720,8 +1720,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(in.getName())) {
 			params.put("name", in.getName());
 		}
-		if (!in.getDeps().isEmpty()) {
-			params.put("deps", in.getDeps());
+		if (in.getDeps()!=null) {
+			params.put("deps",departmentService.parseArray(in.getDeps()));
 		}
 		if (StringUtils.isNotBlank(in.getAdminName())) {
 			params.put("adminName", in.getAdminName());