为普测查询添加权限

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java

@@ -128,4 +128,7 @@ public class RGeneralSurveyPlanPO {
     @TableField(value = "upload_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date uploadTime;
+    @TableField(value = "create_person")
+    private  String createPerson;
+
 }

pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java

@@ -158,7 +158,7 @@ public class RGeneralSurveyPlanController extends BaseController {
     public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlan(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){
         String methodDescribe = getMethodDescribe("queryPlan");
 
-        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("0","1","2","3").collect (Collectors.toList ()));
+        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("0","1","2","3").collect (Collectors.toList ()),"1");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
     }
 
@@ -169,7 +169,7 @@ public class RGeneralSurveyPlanController extends BaseController {
     public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlanAudit(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){
         String methodDescribe = getMethodDescribe("queryPlanAudit");
 
-        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("1","2").collect (Collectors.toList ()));
+        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("1","2").collect (Collectors.toList ()),"2");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
     }
 
@@ -191,7 +191,7 @@ public class RGeneralSurveyPlanController extends BaseController {
     public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlanResult(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){
         String methodDescribe = getMethodDescribe("queryPlanResult");
 
-        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("3","4").collect (Collectors.toList ()));
+        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("3","4").collect (Collectors.toList ()),"3");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
     }
 

pqs-process/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java

@@ -37,7 +37,7 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
         * @Author: clam
         * @Date: 2022/11/15
         */
-        IPage<RGeneralSurveyPlanVO> query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm,List<String> statusList);
+        IPage<RGeneralSurveyPlanVO> query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm,List<String> statusList,String type);
     /** 
     * @Description: surveyResultUpload 
     * @Param: [surveyResultUploadParam] 

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java

@@ -34,7 +34,9 @@ import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.po.Dept;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
+import com.njcn.web.utils.RequestUtil;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -113,6 +115,10 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
         RSurveyCyclePO rSurveyCyclePO = rSurveyCycleMapper.selectOne (rSurveyCyclePOQueryWrapper);
 
         rGeneralSurveyPlanPO.setCycleId (rSurveyCyclePO.getId ( ));
+        String deptIndex = RequestUtil.getDeptIndex ( );
+        Dept data = deptFeignClient.getDeptById (deptIndex).getData ( );
+        rGeneralSurveyPlanPO.setCheckPerson (data.getPid ());
+        rGeneralSurveyPlanPO.setCreatePerson (RequestUtil.getUserIndex ());
          boolean b = this.saveOrUpdateByMultiId (rGeneralSurveyPlanPO);
 
         QueryWrapper<RGeneralSurveyPlanDetail> queryWrapper = new QueryWrapper ( );
@@ -149,11 +155,18 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
      * @Date: 2022/11/15
      */
     @Override
-    public IPage<RGeneralSurveyPlanVO> query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm, List<String> statusList) {
+    public IPage<RGeneralSurveyPlanVO> query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm, List<String> statusList,String type) {
         IPage<RGeneralSurveyPlanPO> page = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage ( ), rGeneralSurveyPlanQueryParm.getPageSize ( ));
         IPage<RGeneralSurveyPlanVO> returnpage = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage ( ), rGeneralSurveyPlanQueryParm.getPageSize ( ));
 
         LambdaQueryWrapper<RGeneralSurveyPlanPO> queryWrapper = new LambdaQueryWrapper<> ( );
+        /*type=1：新建页面：查看自己负责的计划；type=2：审核页面：审核者==当前用户；结果页面：查看自己负责的计划*/
+        if(type=="1"||type=="3"){
+            queryWrapper.eq (RGeneralSurveyPlanPO::getCreatePerson,RequestUtil.getUserIndex ());
+        }
+        if(type=="2"){
+            queryWrapper.eq (RGeneralSurveyPlanPO::getCheckPerson,RequestUtil.getDeptIndex ());
+        }
         if (!StringUtils.isEmpty (rGeneralSurveyPlanQueryParm.getOrgNo ( ))) {
             List<String> data = deptFeignClient.getDepSonIdtByDeptId (rGeneralSurveyPlanQueryParm.getOrgNo ( )).getData ( );
 
@@ -382,7 +395,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
         UpdateWrapper<RGeneralSurveyPlanPO> updateWrapper = new UpdateWrapper ( );
         updateWrapper.eq ("plan_no", rGeneralSurveyPlanChcekParm.getPlanNo ( ));
         updateWrapper.set ("check_comment", rGeneralSurveyPlanChcekParm.getCheckComment ( ));
-        updateWrapper.set ("check_person", rGeneralSurveyPlanChcekParm.getCheckPerson ( ));
+//        updateWrapper.set ("check_person", rGeneralSurveyPlanChcekParm.getCheckPerson ( ));
         updateWrapper.set ("status", Objects.equals ("1", rGeneralSurveyPlanChcekParm.getCheckResult ( )) ? 3 : 2);
         result = this.update (updateWrapper);
         return result;