Browse Source

版本切换

anderx 2 years ago
parent
commit
27fa9d8c39

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

@@ -700,15 +700,16 @@ 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,
-									String startTime, String endTime, String receiverId, Integer pageNo,Integer pageSize){
+									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,
-				projectName, status,startTime,endTime,receiverId, pageNo, pageSize));
+				projectName, status,startTime,endTime,receiverId,  shiroType,pageNo, pageSize));
 	}
 
 	/**
@@ -717,10 +718,10 @@ public class OrderProjectApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/selectProjectStop/export" ,method = RequestMethod.GET)
 	public Result selectProjectSotpExport(String orderNo,String userName,String depId,String contractNo, String projectName,Integer status,
-									String startTime, String endTime, String receiverId, Integer pageNo,Integer pageSize){
+									String startTime, String endTime, String receiverId,Integer shiroType, Integer pageNo,Integer pageSize){
 		NewExcelUtil newExcelUtil=new NewExcelUtil(OutselectProjectSotpBo.class);
 		Pagination<?> p = orderProjectService.selectProjectStop(orderNo, userName, depId, contractNo,
-				projectName, status, startTime, endTime, receiverId, pageNo, pageSize);
+				projectName, status, startTime, endTime, receiverId, shiroType, pageNo, pageSize);
 		List<OutselectProjectSotp> list = (List<OutselectProjectSotp>) p.getList();
 		List<OutselectProjectSotpBo> list2=new ArrayList<>();
 			for (OutselectProjectSotp use : list) {

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

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

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

@@ -1580,7 +1580,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	@Override
 	public Pagination<?> selectProjectStop(String orderNo, String userName, String depId, String contractNo, String projectName,
-										   Integer status,String startTime,String endTime,String receiverId, Integer pageNo, Integer pageSize) {
+										   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);
@@ -1591,17 +1592,22 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		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 (TokenManager.hasRole(AFTConstants.SUPERADMIN)){
-			params.put("shiro",0);
-		}else if (TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
-			params.put("shiro",1);
-			params.put("aid",TokenManager.getAdminId());
-		}else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
-			params.put("shiro",2);
-			params.put("deps",departmentService.selectMyDeps());
+		if (shiroType==0){
+			if (TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
+				params.put("shiro",1);
+				params.put("aid",TokenManager.getAdminId());
+			}
+		}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<>();
 		}
+
 		return findPage("selectProjectSotpList","selectProjectSotpCount",params,pageNo,pageSize);
 	}