|
|
@@ -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<>();
|