|
|
@@ -20,6 +20,8 @@ import com.hotent.project.model.CostProjectTask;
|
|
|
import com.hotent.project.model.CostProjectTaskPreliminaryOpinion;
|
|
|
import com.hotent.project.model.CostProjectTaskProccess;
|
|
|
import com.hotent.uc.api.model.IUser;
|
|
|
+import com.hotent.uc.manager.UserManager;
|
|
|
+import com.hotent.uc.model.User;
|
|
|
import com.hotent.uc.util.ContextUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -54,10 +56,25 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
|
|
|
@Autowired
|
|
|
private CostProjectTaskPreliminaryOpinionManager preliminaryOpinionManager;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private UserManager userService;
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
- public List<CostProjectTask> getTaskList(CostTaskSearchReq req) {
|
|
|
- LambdaQueryWrapper<CostProjectTask> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ public List<CostProjectTask> getTaskList(CostTaskSearchReq req) throws Exception {
|
|
|
+ IUser iUser = ContextUtil.getCurrentUser();
|
|
|
+ User user = userService.getByAccount(iUser.getAccount());
|
|
|
+ req.setDataScope(user.getDataScope());
|
|
|
+ req.setProvinceCode(user.getProvinceCode());
|
|
|
+ req.setCityCode(user.getCityCode());
|
|
|
+ req.setCountyCode(user.getCountyCode());
|
|
|
+ List<CostProjectTask> list =baseMapper.getCostProjectTaskList(req.getDataScope()
|
|
|
+ ,req.getProvinceCode()
|
|
|
+ ,req.getCityCode()
|
|
|
+ ,req.getCountyCode()
|
|
|
+ ,req.getYear()
|
|
|
+ ,req.getProjectName());
|
|
|
+ /*LambdaQueryWrapper<CostProjectTask> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
if (ObjectUtil.isNotEmpty(req.getYear())) {
|
|
|
queryWrapper.eq(CostProjectTask::getYear, req.getYear());
|
|
|
}
|
|
|
@@ -65,7 +82,10 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
|
|
|
queryWrapper.like(CostProjectTask::getProjectName, req.getProjectName());
|
|
|
}
|
|
|
queryWrapper.eq(CostProjectTask::getIsDeleted, BaseConstant.NORMAL_STATUS);
|
|
|
- return this.list(queryWrapper);
|
|
|
+
|
|
|
+ List<CostProjectTask> list = this.list(queryWrapper);*/
|
|
|
+
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
@Override
|