소스 검색

查询BUG修改

anderx 3 년 전
부모
커밋
bb08b83d0e

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

@@ -36,7 +36,7 @@ public interface DepartmentService {
 	 * @param deps 部门集合
 
 	 */
-	List<String> selectSubDeps(List<String>  deps);
+	List<String> selectSubDeps(String  deps);
 
 
 

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import com.alibaba.fastjson.JSON;
 import com.goafanti.admin.bo.DepartmentComboBox;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.DepartmentMapper;
@@ -89,10 +90,11 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 
 
 	@Override
-	public List<String> selectSubDeps(List<String>  deps) {
+	public List<String> selectSubDeps(String  deps) {
+		List<String>ls= JSON.parseArray(deps,String.class);
 			List<String> myAll=new ArrayList<>();
 			List<String> my=selectMyDeps();
-			for (String dep : deps) {
+			for (String dep : ls) {
 				for (String dep2 : my) {
 					if (dep.equals(dep2))myAll.add(dep);
 				}

+ 6 - 6
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -21,6 +21,7 @@ import com.goafanti.order.bo.InputTChangeTask;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
 
+import java.io.IOException;
 import java.util.List;
 
 @RestController
@@ -290,7 +291,6 @@ public class OrderChangeApiController extends CertifyApiController {
 	 * @param timeType
 	 * @param startTime
 	 * @param endTime
-	 * @param depId
 	 * @param salesmanName
 	 * @param complete
 	 * @param orderNo
@@ -302,7 +302,7 @@ public class OrderChangeApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value ="/orderChangeList",method = RequestMethod.GET)
 	public Result orderChangeList(String userName, Integer  processState, Integer timeType, String startTime, String endTime,
-								  List<String> deps, String salesmanName, Integer complete, String orderNo, String contractNo, Integer type, Integer pageSize, Integer pageNo) {
+								  String deps, String salesmanName, Integer complete, String orderNo, String contractNo, Integer type, Integer pageSize, Integer pageNo) {
 		Result res =new Result();
 		res.data(orderChangeService.selectOrderChangeList( userName,  processState, timeType, startTime, endTime,
 				 deps, salesmanName, complete, orderNo,  contractNo, type,pageSize,  pageNo));
@@ -434,12 +434,12 @@ public class OrderChangeApiController extends CertifyApiController {
      */
     @RequestMapping(value = "/exportMyChange" , method = RequestMethod.GET)
     public Result exportMyBill(HttpServletResponse response,String userName,Integer  processState,Integer timeType,String startTime,String endTime,
-							   List<String> deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo)  {
+							   String deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo)  {
     	Result res=new Result();
 			try {
-				orderChangeService.exportMyChange( response, userName,  processState, timeType, startTime, endTime,
-						 deps, salesmanName, complete, orderNo,  contractNo, type, pageSize,  pageNo);
-			} catch (Exception e) {
+				orderChangeService.exportMyChange(response,userName,processState,timeType,startTime,endTime,deps,salesmanName,complete,
+				orderNo,contractNo,type,pageSize,pageNo);
+			} catch (IOException e) {
 				res.getError().add(buildError("格式不正确"));
 				e.printStackTrace();
 				return res;

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

@@ -50,7 +50,7 @@ public interface OrderChangeService {
 	 * @return
 	 */
 	Pagination<NewOderCahngeListBo> selectOrderChangeList(String userName,Integer  processState,Integer timeType,String startTime,String endTime,
-														  List<String> deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize, Integer pageNo );
+														  String deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize, Integer pageNo );
 
 	int updateOrderChange(NewOrderChangeBo t, Integer changeType,String startRemarks);
 
@@ -67,7 +67,7 @@ public interface OrderChangeService {
 	Map<String ,Object> listOrderInvoiceAndBill(String orderNo);
 
 	void exportMyChange(HttpServletResponse response, String userName, Integer processState, Integer timeType,
-			String startTime, String endTime, List<String> deps, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize,
+			String startTime, String endTime, String deps, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize,
 			Integer pageNo) throws IOException ;
 
 

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

@@ -8,6 +8,7 @@ import java.util.*;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSON;
 import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.enums.UserFields;
@@ -494,7 +495,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<NewOderCahngeListBo> selectOrderChangeList(String userName,Integer  processState,Integer timeType,String startTime,String endTime,
-																 List<String> deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo) {
+																 String deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo) {
 		Map<String, Object> parameter=new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -520,8 +521,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 			parameter.put("deps",myDep);
 		}else {
-			if (!deps.isEmpty()) {
-				parameter.put("deps",deps);
+			if (deps!=null) {
+				List<String>ls= JSON.parseArray(deps,String.class);
+				parameter.put("deps",ls);
 			}
 		}
 		if (StringUtils.isNotBlank(salesmanName)) parameter.put("salesmanName", salesmanName);
@@ -824,7 +826,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@SuppressWarnings("unchecked")
 	@Override
 	public void exportMyChange(HttpServletResponse response, String userName, Integer processState, Integer timeType,
-			String startTime, String endTime, List<String> deps, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize,Integer pageNo) throws IOException {
+			String startTime, String endTime, String deps, String salesmanName, Integer complete,String orderNo, String contractNo,
+							   Integer type,Integer pageSize,Integer pageNo) throws IOException {
 		OutputStream out = response.getOutputStream();
 		List<NewOderCahngeListBo>list=(List<NewOderCahngeListBo>) selectOrderChangeList( userName,  processState, timeType, startTime, endTime,
 				 deps, salesmanName, complete, orderNo,  contractNo, type, pageSize,  pageNo).getList();

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

@@ -630,7 +630,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		List<String>departmentList=new ArrayList<>();
 		if(in.getSpecially()==1||in.getSpecially()==5) {
 			if (in.getDeps()!=null&&!ls.isEmpty()){
-				departmentList=departmentService.selectSubDeps(ls);
+				departmentList=departmentService.selectSubDeps(in.getDeps());
 			}else {
 				departmentList=departmentService.selectMyDeps();
 			}