修改委托报告查询问题；

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractSampleController.java

@@ -426,7 +426,7 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/page_storage_register")
     public RestResult<Page<ContractSampleVO>> getPageStorageRegister(ContractSampleVO contractSample) {
         contractSample.setStatus(ContractSampleStatusEnum.STORAGE_REGISTER);
-        contractSample.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(), HmConst.ACCEPTANCE_ROOM));
+        contractSample.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(), HmConst.STORAGE_BRANCH));
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
 

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustController.java

@@ -659,6 +659,7 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_report_check")
     public RestResult<Page<EntrustVO>> getPageReportCheck(EntrustVO entrust) {
         entrust.setReportStatus(EntrustReportStatusEnum.CHECK);
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByReport(getPage(), entrust));
     }
 
@@ -679,6 +680,7 @@ public class EntrustController extends ServiceController {
                 EntrustReportStatusEnum.REPORT_PRINT,
                 EntrustReportStatusEnum.END
         ));
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByReportHis(getPage(), entrust));
     }
 
@@ -693,6 +695,7 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_report_approve")
     public RestResult<Page<EntrustVO>> getPageReportApprove(EntrustVO entrust) {
         entrust.setReportStatus(EntrustReportStatusEnum.ALLOW);
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByReport(getPage(), entrust));
     }
 
@@ -712,6 +715,7 @@ public class EntrustController extends ServiceController {
                 EntrustReportStatusEnum.REPORT_PRINT,
                 EntrustReportStatusEnum.END
         ));
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByReportHis(getPage(), entrust));
     }
 
@@ -725,6 +729,7 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_report_grant")
     public RestResult<Page<EntrustVO>> getPageReportGrant(EntrustVO entrust) {
         entrust.setReportStatus(EntrustReportStatusEnum.SEND);
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByReport(getPage(), entrust));
     }
 
@@ -743,7 +748,7 @@ public class EntrustController extends ServiceController {
                 EntrustReportStatusEnum.REPORT_PRINT,
                 EntrustReportStatusEnum.END
         ));
-
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByReportHis(getPage(), entrust));
     }
 
@@ -758,6 +763,7 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_quality_inspection")
     public RestResult<Page<EntrustVO>> getPageQualityInspection(EntrustVO entrust) {
         entrust.setReportStatus(EntrustReportStatusEnum.INSPECT);
+        entrust.setPeriod(userInfoService.getUserPeriod(getAccount()));
         return success(entrustService.pageEntrustByReport(getPage(), entrust));
     }
 
@@ -775,6 +781,7 @@ public class EntrustController extends ServiceController {
                 EntrustReportStatusEnum.REPORT_PRINT,
                 EntrustReportStatusEnum.END
         ));
+        entrust.setPeriod(userInfoService.getUserPeriod(getAccount()));
         return success(entrustService.pageEntrustByReportHis(getPage(), entrust));
     }
 
@@ -791,6 +798,7 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_report_issue")
     public RestResult<Page<EntrustVO>> getPageReportIssue(EntrustVO entrust) {
         entrust.setReportStatus(EntrustReportStatusEnum.ISSUE);
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByReport(getPage(), entrust));
     }
 
@@ -808,6 +816,7 @@ public class EntrustController extends ServiceController {
                 EntrustReportStatusEnum.REPORT_PRINT,
                 EntrustReportStatusEnum.END
         ));
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByReportHis(getPage(), entrust));
     }
 

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java

@@ -768,8 +768,6 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         if (null == entrust.getReportStatus()) {
             return page;
         }
-        // 此方法过滤检测单位
-        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return page.setRecords(baseMapper.selectVOList(page, entrust));
     }
 
@@ -785,8 +783,6 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         if (CollectionUtils.isEmpty(entrust.getReportStatusList())) {
             return page;
         }
-        // 历史同样过滤检测单位
-        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return page.setRecords(baseMapper.selectVOList(page, entrust));
     }
 

src/main/resources/mapper/hmhj/EntrustMapper.xml

@@ -28,6 +28,9 @@
         <if test="null!=vo.assignor">
             AND e.assignor like concat('%',#{vo.assignor},'%')
         </if>
+        <if test="null!=vo.period">
+            AND (e.period is null or e.period = #{vo.period} )
+        </if>
         <if test="null != vo.isSelf and true == vo.isSelf">
             AND (
                 e.uid = #{vo.uid} or