添加分厂报告接口；

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

@@ -54,10 +54,10 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page")
     public RestResult<Page<Entrust>> getPage(Entrust entrust) {
         entrust.setStatus(EntrustStatusEnum.DRAFT);
+        entrust.setUid(getAccount().getUserId());
         return success(entrustService.page(getPage(), entrust));
     }
 
-
     @ApiOperation("外委登记分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),

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

@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.hmhj.controller;
 
 import com.patzn.cloud.service.hmhj.entity.EntrustReport;
 import com.patzn.cloud.service.hmhj.enums.EntrustReportStatusEnum;
+import com.patzn.cloud.service.hmhj.vo.EntrustReportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -161,7 +162,15 @@ public class EntrustReportController extends ServiceController {
     }
 
 
-
+    @ApiOperation("分厂报告分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page_report_branch")
+    public RestResult<Page<EntrustReport>> getPageReportBranch(EntrustReportVO entrustReportVO) {
+        return success(entrustReportService.pageBranchReport(getPage(),entrustReportVO, getAccount()));
+    }
 
 
 

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustReportService.java

@@ -6,6 +6,7 @@ import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
 import com.patzn.cloud.service.hmhj.entity.EntrustReport;
 import com.patzn.cloud.service.hmhj.enums.EntrustReportStatusEnum;
+import com.patzn.cloud.service.hmhj.vo.EntrustReportVO;
 
 import java.io.File;
 import java.util.List;
@@ -47,4 +48,6 @@ public interface IEntrustReportService extends IBaseService<EntrustReport> {
     boolean backFromReportIssueToAllow(Long[] ids, String reason, Account account);
 
     Page<EntrustReport> pageStatus(Page<EntrustReport> page, List<EntrustReportStatusEnum> reportStatusList, EntrustReport entrustReport);
+
+    Page<EntrustReport> pageBranchReport(Page<EntrustReport> page, EntrustReportVO entrustReportVO, Account account);
 }

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

@@ -8,13 +8,18 @@ import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.controller.LoginHelper;
 import com.patzn.cloud.commons.toolkit.FileUtils;
+import com.patzn.cloud.feign.base.client.SysUserClient;
 import com.patzn.cloud.oss.starter.OssClient;
 import com.patzn.cloud.oss.starter.OssFileResult;
+import com.patzn.cloud.service.base.entity.SysOrg;
+import com.patzn.cloud.service.base.vo.SysOrgVO;
+import com.patzn.cloud.service.base.vo.SysUserOrgVO;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
 import com.patzn.cloud.service.hmhj.entity.EntrustReport;
 import com.patzn.cloud.service.hmhj.entity.EntrustReportRelSample;
 import com.patzn.cloud.service.hmhj.entity.EntrustSample;
 import com.patzn.cloud.service.hmhj.enums.*;
+import com.patzn.cloud.service.hmhj.vo.EntrustReportVO;
 import com.patzn.cloud.service.lims.hmhj.common.LabreOfficeUtil;
 import com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportMapper;
 import com.patzn.cloud.service.lims.hmhj.service.*;
@@ -56,6 +61,8 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     private IEntrustRecordService entrustRecordService;
     @Autowired
     private Executor executor1;
+    @Autowired
+    private SysUserClient sysUserClient;
 
     @Value("${libreOffice.url}")
     private String libreOfficeUrl;
@@ -77,6 +84,19 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     }
 
     @Override
+    public Page<EntrustReport> pageBranchReport(Page<EntrustReport> page, EntrustReportVO entrustReportVO, Account account) {
+
+        Wrapper wrapper = new EntityWrapper<>(entrustReportVO);
+
+        List<SysUserOrgVO> userOrgVOList = sysUserClient.getUserOrg(Arrays.asList(account.getUserId())).serviceData();
+        //  为空或者不包含质检中心的部门，需要根据当前用户查询对应的委托
+        if (CollectionUtils.isEmpty(userOrgVOList) || userOrgVOList.stream().filter(t -> t.getOrgName().contains("质检中心")).count() == 0) {
+            wrapper.exists("select 1 from entrust e where e.deleted = 0 and e.id = entrust_id and e.uid = " + account.getUserId());
+        }
+        return this.page(page, wrapper);
+    }
+
+    @Override
     public boolean removeByIds(List<Long> ids) {
         entrustReportRelSampleService.remove(Condition.create().in("report_id", ids));
         return baseMapper.deleteBatchIds(ids) > 0;
@@ -204,11 +224,11 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
         } else {
             String remark = (fromFlowStatus.getValue() < toFlowStatus.getValue() ? "提交至" : "驳回至") + toFlowStatus.getDisplay();
             // 若提交至 -> 质量判定,那么需要更改委托状态
-            if(toFlowStatus == EntrustFlowEnum.QUALITY_JUDGE){
+            if (toFlowStatus == EntrustFlowEnum.QUALITY_JUDGE) {
                 entrust.setStatus(EntrustStatusEnum.QUALITY_CHECK);
                 entrustService.updateById(entrust);
                 // 更改样品编码显示形式，由三级变为一级
-                entrustSampleService.updateSampleCodeByEntrustId(entrust.getId(),1);
+                entrustSampleService.updateSampleCodeByEntrustId(entrust.getId(), 1);
             }
 
             entrustRecordService.record(new Long[]{entrust.getId()}, fromFlowStatus.getDisplay(), toFlowStatus.getDisplay(), 0, account, remark);
@@ -402,7 +422,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
             if (isToStatusPath(t)) {
                 entrustService.rejectToPrevNode(t, reason, account);
             } else {
-                rejectByReportStatus(t, reportMap.get(t.getId()), reportStatusEnum,reason, account);
+                rejectByReportStatus(t, reportMap.get(t.getId()), reportStatusEnum, reason, account);
             }
         });
     }
@@ -414,7 +434,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
      * @param reportStatus
      * @param account
      */
-    private void rejectByReportStatus(Entrust entrust, EntrustReport entrustReport, EntrustReportStatusEnum reportStatus,String reason, Account account) {
+    private void rejectByReportStatus(Entrust entrust, EntrustReport entrustReport, EntrustReportStatusEnum reportStatus, String reason, Account account) {
         EntrustSample entrustSample = new EntrustSample();
         EntrustSampleStatusEnum sampleStatusEnum = null;
 
@@ -435,7 +455,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
             entrustSample.setProgress(sampleStatusEnum);
             entrustSampleService.update(entrustSample, Condition.create().eq("entrust_id", entrust.getId()));
             if (null != entrustReport) {
-                reason = String.format("因【%s】,退回至%s",reason,sampleStatusEnum.getDisplay());
+                reason = String.format("因【%s】,退回至%s", reason, sampleStatusEnum.getDisplay());
                 entrustRecordService.record(new Long[]{entrust.getId()}, entrustReport.getStatus().getDisplay(), sampleStatusEnum.getDisplay(), 2, account, reason);
             }
         }