Browse Source

项目暂停&启动审核列表部门多选后台逻辑开发

anderx 11 months ago
parent
commit
6cbc757135

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

@@ -3023,7 +3023,7 @@ progress_tid = values(progress_tid)
         <if test="shiro ==1">
             and c.salesman_id =#{aid}
         </if>
-        <if test="shiro ==2">
+        <if test="deps  !=null">
             and c.order_dep  in
             <foreach close=")" collection="deps" item="dep" open="(" separator=",">
                 #{dep}
@@ -3085,7 +3085,7 @@ progress_tid = values(progress_tid)
         <if test="shiro ==1">
             and c.salesman_id =#{aid}
         </if>
-        <if test="shiro ==2">
+        <if test="deps  !=null">
             and c.order_dep  in
             <foreach close=")" collection="deps" item="dep" open="(" separator=",">
                 #{dep}

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

@@ -731,12 +731,12 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * @param shiroType  0=我的列表 1=审核列表
 	 */
 	@RequestMapping(value = "/selectProjectStop" ,method = RequestMethod.GET)
-	public Result selectProjectStop(String orderNo,String userName,String depId,String contractNo, String projectName,Integer status,
+	public Result selectProjectStop(String orderNo,String userName,String deps,String contractNo, String projectName,Integer status,
 									String startTime, String endTime, String receiverId,
 									Integer shiroType,Integer pageNo,Integer pageSize){
 		Result res = new Result();
 
-		return res.data(orderProjectService.selectProjectStop(  orderNo, userName, depId, contractNo,
+		return res.data(orderProjectService.selectProjectStop(  orderNo, userName, deps, contractNo,
 				projectName, status,startTime,endTime,receiverId,  shiroType,pageNo, pageSize));
 	}
 

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

@@ -138,7 +138,7 @@ public interface OrderProjectService {
     Integer addProjectStop(InputProjectStop in);
 	Integer updateProjectStop(InputProjectStop in);
 
-	Pagination<?> selectProjectStop(String orderNo, String userName, String depId, String contractNo, String projectName,
+	Pagination<?> selectProjectStop(String orderNo, String userName, String deps, String contractNo, String projectName,
 							 Integer status,String startTime,String endTime,String receiverId, Integer shiroType,Integer pageNo, Integer pageSize);
 
 	List<TaskStopLogBo> projectStopList(Integer taskStopId);

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

@@ -1948,19 +1948,28 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	}
 
 	@Override
-	public Pagination<?> selectProjectStop(String orderNo, String userName, String depId, String contractNo, String projectName,
+	public Pagination<?> selectProjectStop(String orderNo, String userName, String deps, String contractNo, String projectName,
 										   Integer status,String startTime,String endTime,String receiverId,
 										   Integer shiroType,Integer pageNo, Integer pageSize) {
 		Map<String,Object>params =new HashMap<>();
 		if (orderNo!=null)params.put("orderNo",orderNo);
 		if (userName!=null)params.put("userName",userName);
-		if (depId!=null)params.put("depId",depId);
+
 		if (contractNo!=null)params.put("contractNo",contractNo);
 		if (projectName!=null)params.put("projectName",projectName);
 		if (status!=null)params.put("status",status);
 		if (startTime!=null)params.put("startTime",startTime);
 		if (endTime!=null)params.put("endTime",endTime+" 23:59:59");
 		if (receiverId!=null)params.put("receiverId",receiverId);
+		if (deps!=null){
+			if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
+				List<String> list= JSON.parseArray(deps,String.class);
+				params.put("deps",departmentService.selectSubDeps(list));
+			}else {
+				List<String> list= JSON.parseArray(deps,String.class);
+				params.put("deps",list);
+			}
+		}
 		if (shiroType==0){
 			if (TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
 				params.put("shiro",1);
@@ -1969,9 +1978,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		}else if (shiroType==1){
 			if (TokenManager.hasRole(AFTConstants.SUPERADMIN)){
 				params.put("shiro",0);
+
 			}else  if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
 				params.put("shiro",2);
-				params.put("deps",departmentService.selectMyDeps());
 			}
 		}else {
 			return new Pagination<>();