备忘录管理-按项目查询

assistMg/src/main/java/com/hotent/baseInfo/manager/CostDistrictManager.java

@@ -4,6 +4,7 @@ import com.hotent.baseInfo.model.CostDistrict;
 import com.hotent.base.manager.BaseManager;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 地区表 服务类
@@ -27,6 +28,4 @@ public interface CostDistrictManager extends BaseManager<CostDistrict> {
 
 	//获取省市区树结构
 	List<CostDistrict> getDistrictTree();
-
-
 }

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostDistrictManagerImpl.java

@@ -7,6 +7,7 @@ import com.hotent.baseInfo.manager.CostDistrictManager;
 import com.hotent.base.manager.impl.BaseManagerImpl;
 import org.springframework.stereotype.Service;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 地区表 服务实现类

assistMg/src/main/java/com/hotent/project/controller/CostProjectApprovalController.java

@@ -57,7 +57,7 @@ public class CostProjectApprovalController extends BaseController<CostProjectApp
 	 * 根据id获取成本监审立项主表数据详情
 	 * @param id
 	 * @return
-	 * @throws Exception 
+	 * @throws Exception
 	 * ModelAndView
 	 */
 	@GetMapping(value="/getDetail")
@@ -94,7 +94,7 @@ public class CostProjectApprovalController extends BaseController<CostProjectApp
 	@PostMapping(value = "list")
 	@ApiOperation(value = "查询list", httpMethod = "POST", notes = "查询list")
 	public CommonResult<List<CostProjectApproval>> list() {
-		return CommonResult.<List<CostProjectApproval>>ok().value(baseService.list());
+		return CommonResult.<List<CostProjectApproval>>ok().value(baseService.getList());
 	}
 
 	/**

assistMg/src/main/java/com/hotent/project/manager/CostProjectApprovalManager.java

@@ -9,6 +9,8 @@ import com.hotent.project.req.CostProjectApprovalPageReq;
 import com.hotent.project.req.CostProjectApprovalPublishReq;
 import com.hotent.project.resp.CostProjectApprovalDetailResp;
 
+import java.util.List;
+
 /**
  * 成本监审立项主表 服务类
  *
@@ -43,4 +45,5 @@ public interface CostProjectApprovalManager extends BaseManager<CostProjectAppro
 
     IPage<CostProjectApproval> pageListForAuditTask(CostAuditTaskPageReq req);
 
+    List<CostProjectApproval> getList();
 }

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectApprovalManagerImpl.java

@@ -36,9 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -194,6 +192,7 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
     @Autowired
     UserManager userService;
 
+
     @Override
     public CostProjectApprovalDetailResp getDetail(String id) {
         CostProjectApproval costProjectApproval = this.get(id);
@@ -655,4 +654,34 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
         return result;
     }
 
+    @Override
+    public List<CostProjectApproval> getList() {
+        User currentUser = ContextUtil.getCurrentUser();
+        String userId = currentUser.getId();
+        User user = userService.getById(userId);
+        Integer dataScope = user.getDataScope();
+
+        QueryWrapper<CostProjectApproval> queryWrapper = new QueryWrapper<>();
+        // 只能查自己和自己下属的
+        if(dataScope != null && dataScope != 0){
+            Set<String> areaSet = new HashSet<>();
+            if(dataScope == 1){
+                String cityCode = user.getCityCode();
+                String codeSub = cityCode.substring(0, 4);
+                QueryWrapper<CostDistrict> districtQueryWrapper = new QueryWrapper<>();
+                districtQueryWrapper.like("code", codeSub);
+                List<CostDistrict> costDistricts = costDistrictManager.list(districtQueryWrapper);
+                for (CostDistrict costDistrict1 : costDistricts) {
+                    areaSet.add(costDistrict1.getCode());
+                }
+            }
+            if(dataScope == 2){
+                String code = user.getCountyCode();
+                areaSet.add(code);
+            }
+            queryWrapper.in("area_code", areaSet);
+        }
+        return this.list(queryWrapper);
+    }
+
 }