Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java
#	src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml

.gitignore

+.gradle
+.idea
+build
+gradle*
+Dockerfile
+Jenkinsfile-test
+libs
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import com.patzn.cloud.service.hmhj.dto.EntrustDTO;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
 import com.patzn.cloud.service.hmhj.enums.*;
 import com.patzn.cloud.service.hmhj.vo.EntrustVO;
+import com.patzn.cloud.service.lims.hmhj.service.impl.UserInfoServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,6 +36,9 @@ public class EntrustController extends ServiceController {
     @Autowired
     private IEntrustService entrustService;
 
+    @Autowired
+    private UserInfoServiceImpl userInfoService;
+
     @ApiOperation("委托登记分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -333,6 +337,8 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_sample_receive")
     public RestResult<Page<EntrustVO>> getPageEntrustSampleReceive(EntrustVO entrust) {
         entrust.setPrepareStatus(EntrustSamplePrepareStatusEnum.RECEIVE);
+        // 设置用户编组
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustSampleReceive(getPage(), entrust));
     }
 
@@ -348,6 +354,8 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_sample_receive_his")
     public RestResult<Page<EntrustVO>> getPageEntrustSampleReceiveHis(EntrustVO entrust) {
         entrust.setPrepareNotStatus(EntrustSamplePrepareStatusEnum.RECEIVE);
+        // 设置用户编组
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustSampleReceiveHis(getPage(), entrust));
     }
 
@@ -363,6 +371,8 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_allot")
     public RestResult<Page<EntrustVO>> getPageTaskAllot(EntrustVO entrust) {
         entrust.setItemStatus(EntrustSampleItemStatusEnum.ALLOT);
+        // 获取当前用户分组
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByItem(getPage(), entrust));
     }
 
@@ -383,6 +393,8 @@ public class EntrustController extends ServiceController {
                 EntrustSampleItemStatusEnum.AUDIT,
                 EntrustSampleItemStatusEnum.END
         ));
+        // 获取当前用户分组
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByItemHis(getPage(), entrust));
     }
 
@@ -397,6 +409,8 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_test")
     public RestResult<Page<EntrustVO>> getPageTaskTest(EntrustVO entrust) {
         entrust.setItemStatus(EntrustSampleItemStatusEnum.TEST);
+        // 获取当前用户分组
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByItem(getPage(), entrust));
     }
 
@@ -416,6 +430,8 @@ public class EntrustController extends ServiceController {
                 EntrustSampleItemStatusEnum.AUDIT,
                 EntrustSampleItemStatusEnum.END
         ));
+        // 获取当前用户分组
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByItemHis(getPage(), entrust));
     }
 
@@ -540,12 +556,79 @@ public class EntrustController extends ServiceController {
     public RestResult<Page<EntrustVO>> getPageReportCheckHis(EntrustVO entrust) {
         entrust.setReportStatusList(Lists.newArrayList(
                 EntrustReportStatusEnum.ISSUE,
+                EntrustReportStatusEnum.ALLOW,
+                EntrustReportStatusEnum.SEND,
+                EntrustReportStatusEnum.REPORT_PRINT,
+                EntrustReportStatusEnum.END
+        ));
+        return success(entrustService.pageEntrustByReportHis(getPage(), entrust));
+    }
+
+    /***********************************************************************************/
+    @ApiOperation(value = "报告批准委托分页列表",notes = "报告批准委托分页列表")
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_entrust_report_approve")
+    public RestResult<Page<EntrustVO>> getPageReportApprove(EntrustVO entrust) {
+        entrust.setReportStatus(EntrustReportStatusEnum.ALLOW);
+        return success(entrustService.pageEntrustByReport(getPage(), entrust));
+    }
+
+
+    @ApiOperation(value = "报告批准历史委托分页列表",notes = "报告批准历史委托分页列表")
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_entrust_report_approve_his")
+    public RestResult<Page<EntrustVO>> getPageReportApproveHis(EntrustVO entrust) {
+        entrust.setReportStatusList(Lists.newArrayList(
+                EntrustReportStatusEnum.ISSUE,
+                EntrustReportStatusEnum.SEND,
                 EntrustReportStatusEnum.REPORT_PRINT,
                 EntrustReportStatusEnum.END
         ));
         return success(entrustService.pageEntrustByReportHis(getPage(), entrust));
     }
 
+    @ApiOperation(value = "报告发放委托分页列表",notes = "报告发放委托分页列表")
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_entrust_report_grant")
+    public RestResult<Page<EntrustVO>> getPageReportGrant(EntrustVO entrust) {
+        entrust.setReportStatus(EntrustReportStatusEnum.SEND);
+        return success(entrustService.pageEntrustByReport(getPage(), entrust));
+    }
+
+
+    @ApiOperation(value = "报告发放历史分页列表",notes = "报告发放历史分页列表")
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_entrust_report_grant_his")
+    public RestResult<Page<EntrustVO>> getPageReportGrantHis(EntrustVO entrust) {
+        entrust.setReportStatusList(Lists.newArrayList(
+                EntrustReportStatusEnum.REPORT_PRINT,
+                EntrustReportStatusEnum.END
+        ));
+        return success(entrustService.pageEntrustByReportHis(getPage(), entrust));
+    }
+
+    /******************************************************************/
+
 
 
     @ApiOperation("报告签发委托分页列表")

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

@@ -62,6 +62,8 @@ public class EntrustReportController extends ServiceController {
         List<EntrustReportStatusEnum> reportStatusList = new ArrayList<>();
         reportStatusList.add(EntrustReportStatusEnum.CHECK);
         reportStatusList.add(EntrustReportStatusEnum.ISSUE);
+        reportStatusList.add(EntrustReportStatusEnum.ALLOW);
+        reportStatusList.add(EntrustReportStatusEnum.SEND);
         reportStatusList.add(EntrustReportStatusEnum.REPORT_PRINT);
         reportStatusList.add(EntrustReportStatusEnum.END);
         return success(entrustReportService.pageStatus(getPage(),reportStatusList, entrustReport));
@@ -89,6 +91,8 @@ public class EntrustReportController extends ServiceController {
     public RestResult<Page<EntrustReport>> getPageCheckHis(EntrustReport entrustReport) {
         List<EntrustReportStatusEnum> reportStatusList = new ArrayList<>();
         reportStatusList.add(EntrustReportStatusEnum.ISSUE);
+        reportStatusList.add(EntrustReportStatusEnum.ALLOW);
+        reportStatusList.add(EntrustReportStatusEnum.SEND);
         reportStatusList.add(EntrustReportStatusEnum.REPORT_PRINT);
         reportStatusList.add(EntrustReportStatusEnum.END);
         return success(entrustReportService.pageStatus(getPage(),reportStatusList, entrustReport));

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

@@ -86,7 +86,7 @@ public class EntrustReportTemplateController extends ServiceController {
 
     @ApiOperation(value = "附件上传", notes = "附件上传")
     @PostMapping("/upload_template/")
-    public RestResult<Boolean> uploadTemplate(@RequestParam("name") String  name,@RequestParam("remark") String  remark, MultipartFile file) {
-        return success(entrustReportTemplateService.uploadTemplate(file,name,remark));
+    public RestResult<Boolean> uploadTemplate(@RequestParam("name") String  name,@RequestParam("classType") String classType,@RequestParam("remark") String  remark, MultipartFile file) {
+        return success(entrustReportTemplateService.uploadTemplate(file,name,classType,remark));
     }
 }

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

@@ -50,6 +50,7 @@ public class EntrustSampleBackupController extends ServiceController {
     @PostMapping("/page")
 	public RestResult<Page<EntrustSampleBackupVO>> getPage(EntrustSampleBackupVO entrustSampleBackup) {
         entrustSampleBackup.setStatus(EntrustSampleBackupStatusEnum.BACKUP_ING);
+        entrustSampleBackup.setType("BY");
         return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
 	}
 
@@ -64,9 +65,40 @@ public class EntrustSampleBackupController extends ServiceController {
     @PostMapping("/page_back_up_his")
     public RestResult<Page<EntrustSampleBackupVO>> getPageBackupHis(EntrustSampleBackupVO entrustSampleBackup) {
         entrustSampleBackup.setNotStatus(EntrustSampleBackupStatusEnum.BACKUP_ING);
+        entrustSampleBackup.setType("BY");
         return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
     }
 
+    // ===========================样品管理============================== //
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_manage")
+    public RestResult<Page<EntrustSampleBackupVO>> getPageManage(EntrustSampleBackupVO entrustSampleBackup) {
+        entrustSampleBackup.setStatus(EntrustSampleBackupStatusEnum.MANAGE_ING);
+        entrustSampleBackup.setType("YP");
+        return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
+    }
+
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_manage_his")
+    public RestResult<Page<EntrustSampleBackupVO>> getPageManageHis(EntrustSampleBackupVO entrustSampleBackup) {
+        entrustSampleBackup.setNotStatus(EntrustSampleBackupStatusEnum.MANAGE_ING);
+        entrustSampleBackup.setType("YP");
+        return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
+    }
+    // =========================================
+
 
 
     @ApiOperation("样品处理分页列表")

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
 import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
+import com.patzn.cloud.service.hmhj.vo.OriginalRecordVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -48,6 +49,16 @@ public class OriginalRecordController extends ServiceController {
         return success(originalRecordService.page(getPage(), originalRecord));
     }
 
+    @ApiOperation(value = "分页列表查询", notes = "分页列表查询")
+    @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("/pageVO")
+    public RestResult<Page<OriginalRecordVO>> getPageVO(OriginalRecordVO originalRecordVO) {
+        return success(originalRecordService.pageVO(getPage(), originalRecordVO));
+    }
+
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),

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

@@ -80,9 +80,6 @@ public class OriginalTemplateController extends ServiceController implements Ori
         return success(originalTemplateService.removeByIds(ids));
 	}
 
-
-
-
     @ApiOperation(value = "附件上传", notes = "附件上传")
     @PostMapping("/upload_template/")
     public RestResult<Boolean> uploadTemplate(@RequestParam("classType") String  classType,@RequestParam("name") String  name,@RequestParam("remark") String  remark, MultipartFile file) {
@@ -112,4 +109,11 @@ public class OriginalTemplateController extends ServiceController implements Ori
     public RestResult<String> getKeyByBusinessId(String s) {
         return null;
     }
+
+    @Login(action = Action.Skip)
+    @ApiOperation(value = "编辑原始记录", notes = "编辑原始记录")
+    @PostMapping("/edit_original_record_{someParam}")
+    public RestResult<Boolean> editOriginalRecord(@PathVariable("someParam") String someParam, @RequestBody OssFileResult obsFileResult) {
+        return success(originalTemplateService.editOriginalRecord(someParam, obsFileResult));
+    }
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemMapper.java

@@ -34,4 +34,6 @@ public interface EntrustSampleItemMapper extends BatchMapper<EntrustSampleItem>
     List<EntrustSampleItemVO> selectByItemDeviate(RowBounds rowBounds, @Param("vo")EntrustSampleItemVO entrustSampleItem);
 
     List<EntrustSampleItemVO> selectListVOByIds(@Param("ids")List<Long> expIdsList);
+
+    List<EntrustSampleItemVO> selectByOriginalRecordId(@Param("originalRecordId") Long originalRecordId);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/OriginalRecordMapper.java

 package com.patzn.cloud.service.lims.hmhj.mapper;
 
-import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
 import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
+import com.patzn.cloud.service.hmhj.vo.OriginalRecordVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,5 @@ import com.patzn.cloud.commons.mapper.BatchMapper;
  */
 public interface OriginalRecordMapper extends BatchMapper<OriginalRecord> {
 
+    List<OriginalRecordVO> selectPageVO(RowBounds rowBounds, @Param("vo") OriginalRecordVO vo);
 }

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

@@ -19,5 +19,5 @@ public interface IEntrustReportTemplateService extends IBaseService<EntrustRepor
 
     boolean removeByIds(List<Long> ids);
 
-    boolean uploadTemplate(MultipartFile file, String name, String remark);
+    boolean uploadTemplate(MultipartFile file, String name,String classType, String remark);
 }

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

@@ -58,5 +58,7 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
 
     Page<EntrustSampleItemVO> pageItemDeviateCheckHis(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem);
 
+    List<EntrustSampleItemVO>  getItemByOriginalRecordId(Long originalRecordId);
+
     List<EntrustSampleItemVO> listVOByIds(List<Long> expIdsList);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalRecordService.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.OriginalRecord;
 import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
+import com.patzn.cloud.service.hmhj.vo.OriginalRecordVO;
 
 import java.io.File;
 import java.util.List;
@@ -23,4 +24,6 @@ public interface IOriginalRecordService extends IBaseService<OriginalRecord> {
     boolean removeByIds(List<Long> ids);
 
     OriginalRecord uploadExpGenerate(Long[] ids, OriginalTemplate template, Entrust entrust, Account account, String remark, File file);
+
+    Page<OriginalRecordVO> pageVO(Page<OriginalRecordVO> page, OriginalRecordVO originalRecord);
 }

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

@@ -22,5 +22,7 @@ public interface IOriginalTemplateService extends IBaseService<OriginalTemplate>
 
     boolean uploadTemplate(MultipartFile file, String classType, String name, String remark, int i);
 
+    boolean editOriginalRecord(String someParam, OssFileResult obsFileResult);
+
     boolean editOriginal(String someParam, OssFileResult obsFileResult);
 }

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

@@ -60,7 +60,7 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
     @Override
     public Page<ContractSample> page(Page<ContractSample> page, ContractSample contractSample) {
         Wrapper wrapper = new EntityWrapper<>(contractSample);
-
+        wrapper.orderBy("ctime",false);
         return this.page(page, wrapper);
     }
 

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

@@ -66,6 +66,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
 
     @Override
     public boolean removeByIds(List<Long> ids) {
+        entrustReportRelSampleService.remove(Condition.create().in("report_id",ids));
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 

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

@@ -42,8 +42,9 @@ public class EntrustReportTemplateServiceImpl extends BaseServiceImpl<EntrustRep
     }
 
     @Override
-    public boolean uploadTemplate(MultipartFile file, String name, String remark) {
+    public boolean uploadTemplate(MultipartFile file, String name,String classType, String remark) {
         RestAssert.fail(StringUtils.isBlank(name),"模板名称不能为空");
+        RestAssert.fail(StringUtils.isBlank(classType),"模板类别不能为空");
         RestAssert.fail(StringUtils.isBlank(remark),"模板名称说明不能为空");
         String fileName = file.getOriginalFilename();
         RestAssert.fail(StringUtils.isBlank(fileName), "请上传文件");
@@ -53,6 +54,7 @@ public class EntrustReportTemplateServiceImpl extends BaseServiceImpl<EntrustRep
             return false;
         }
         attachment.setName(name);
+        attachment.setClassType(classType);
         attachment.setRemark(remark);
         attachment.setBucketName(result.getBucketName());
         attachment.setName(result.getName());

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

@@ -174,9 +174,10 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的检测项目");
         List<EntrustSampleItem> list = super.list(Condition.create().in("id",ids).eq("status",EntrustSampleItemStatusEnum.TEST));
         RestAssert.fail(list.size()!=ids.length,"请选择待检测的检测项目");
-        for (EntrustSampleItem sampleItem:list) {
-            RestAssert.fail(StringUtils.isBlank(sampleItem.getTestValue()),"检测项目名称："+sampleItem.getName()+"未填写检测值，请确认！");
-        }
+        // 不再对检测值进行判断
+        // for (EntrustSampleItem sampleItem:list) {
+        //     RestAssert.fail(StringUtils.isBlank(sampleItem.getTestValue()),"检测项目名称："+sampleItem.getName()+"未填写检测值，请确认！");
+        // }
 
         EntrustSampleItem item = new EntrustSampleItem();
 
@@ -494,6 +495,14 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
     }
 
     @Override
+    public List<EntrustSampleItemVO> getItemByOriginalRecordId(Long originalRecordId) {
+        if(null == originalRecordId){
+            return null;
+        }
+        return baseMapper.selectByOriginalRecordId(originalRecordId);
+    }
+
+    @Override
     public List<EntrustSampleItemVO> listVOByIds(List<Long> expIdsList) {
         return baseMapper.selectListVOByIds(expIdsList);
     }

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

@@ -7,10 +7,12 @@ import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.service.hmhj.dto.SamplePrepareDTO;
 import com.patzn.cloud.service.hmhj.entity.*;
 import com.patzn.cloud.service.hmhj.enums.*;
+import com.patzn.cloud.service.hmhj.vo.EntrustSampleBackupVO;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
 import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSamplePrepareMapper;
 import com.patzn.cloud.service.lims.hmhj.service.*;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -104,7 +106,18 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
             backup.setStatus(EntrustSampleBackupStatusEnum.BACKUP_ING);
             backup.setProgress(EntrustSampleBackupStatusEnum.BACKUP_ING);
             backup.setReceiveTime(new Date());
+            // 添加类型，区分样品管理
+            // 类型：备样
+            backup.setType("BY");
             saveBackupList.add(backup);
+            // 添加样品管理数据
+            EntrustSampleBackup manage = new EntrustSampleBackup();
+            BeanUtils.copyProperties(backup,manage);
+            // 类型：样品
+            manage.setType("YP");
+            manage.setStatus(EntrustSampleBackupStatusEnum.MANAGE_ING);
+            manage.setProgress(EntrustSampleBackupStatusEnum.MANAGE_ING);
+            saveBackupList.add(manage);
         }
         if (CollectionUtils.isNotEmpty(saveBackupList)){
             entrustSampleBackupService.saveBatch(saveBackupList);
@@ -114,10 +127,8 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
         sample.setProgress(EntrustSampleStatusEnum.RECEIVE);
         entrustSampleService.update(sample,Condition.create().in("id",sampleIdsList));
 
-
         saveBatch(savePrepare);
 
-
         List<EntrustSample> checkMakeList = entrustSampleService.list(Condition.create().eq("entrust_id",entrust.getId()).eq("status",EntrustSampleStatusEnum.DRAFT));
         if (CollectionUtils.isEmpty(checkMakeList)){
             Entrust updateEntrust = new Entrust();

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

@@ -65,7 +65,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
     @Override
     public Page<Entrust> page(Page<Entrust> page, Entrust entrust) {
         Wrapper wrapper = new EntityWrapper<>(entrust);
-
+        wrapper.orderBy("entrust_time",false);
         return this.page(page, wrapper);
     }
 

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

@@ -7,6 +7,7 @@ import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.oss.starter.OssClient;
 import com.patzn.cloud.oss.starter.OssFileResult;
 import com.patzn.cloud.service.hmhj.entity.*;
+import com.patzn.cloud.service.hmhj.vo.OriginalRecordVO;
 import com.patzn.cloud.service.lims.hmhj.mapper.OriginalRecordMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemService;
 import com.patzn.cloud.service.lims.hmhj.service.IItemRelOriginalRecordService;
@@ -48,6 +49,11 @@ public class OriginalRecordServiceImpl extends BaseServiceImpl<OriginalRecordMap
     }
 
     @Override
+    public Page<OriginalRecordVO> pageVO(Page<OriginalRecordVO> page, OriginalRecordVO vo){
+        return page.setRecords(baseMapper.selectPageVO(page,vo));
+    }
+
+    @Override
     public boolean removeByIds(List<Long> ids) {
         itemRelOriginalRecordService.remove(Condition.create().in("record_id",ids));
         return baseMapper.deleteBatchIds(ids) > 0;

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

@@ -5,6 +5,7 @@ import com.patzn.cloud.service.hmhj.entity.Qualification;
 import com.patzn.cloud.service.lims.hmhj.mapper.QualificationMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IQualificationService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -23,8 +24,22 @@ public class QualificationServiceImpl extends BaseServiceImpl<QualificationMappe
 
     @Override
     public Page<Qualification> page(Page<Qualification> page, Qualification qualification) {
+        String name = qualification.getName();
+        String accordName = qualification.getAccordName();
+        String groupName = qualification.getGroupName();
+        qualification.setName(null);
+        qualification.setAccordName(null);
+        qualification.setGroupName(null);
         Wrapper wrapper = new EntityWrapper<>(qualification);
-
+        if (StringUtils.isNotBlank(name)) {
+            wrapper.like("name", name);
+        }
+        if (StringUtils.isNotBlank(groupName)) {
+            wrapper.like("group_name", groupName);
+        }
+        if (StringUtils.isNotBlank(accordName)) {
+            wrapper.like("accord_name", accordName);
+        }
         return this.page(page, wrapper);
     }
 

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

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.baomidou.mybatisplus.toolkit.CollectionUtils;
+import com.patzn.cloud.commons.controller.Account;
+import com.patzn.cloud.commons.controller.LoginHelper;
+import com.patzn.cloud.feign.base.client.SysUserClient;
+import com.patzn.cloud.feign.lims.base.client.LmsUserGroupClient;
+import com.patzn.cloud.service.base.entity.SysUser;
+import com.patzn.cloud.service.lims.base.entity.LmsUserGroup;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class UserInfoServiceImpl {
+
+    private static final List<LmsUserGroup> OTHER_GROUP_LIST = new ArrayList<>();
+    private static final List<String> OTHER_GROUP_NAME_LIST = new ArrayList<>();
+
+    static {
+        OTHER_GROUP_LIST.add(new LmsUserGroup().setName("OTHERS"));
+        OTHER_GROUP_NAME_LIST.add(OTHER_GROUP_LIST.get(0).getName());
+    }
+
+    @Autowired
+    private LmsUserGroupClient lmsUserGroupClient;
+
+    public List<LmsUserGroup> getGroupList(Long userId) {
+        if (null == userId) {
+            return OTHER_GROUP_LIST;
+        }
+        // 获取用户组
+        return lmsUserGroupClient.getByUserId(userId).getData();
+    }
+
+    public List<String> getGroupNameList(Long userId) {
+        List<LmsUserGroup> userGroups = getGroupList(userId);
+        if (CollectionUtils.isEmpty(userGroups)) {
+            return OTHER_GROUP_NAME_LIST;
+        }
+        return getGroupList(userId).stream().map(t -> t.getName()).filter(t -> StringUtils.isNotBlank(t)).collect(Collectors.toList());
+    }
+
+    public List<String> getCurGroupNameList() {
+        return getGroupNameList(LoginHelper.getAccount().getUserId());
+    }
+
+    public String getCurGroupNames() {
+        List<String> curGroupNameList = getCurGroupNameList();
+        if (CollectionUtils.isEmpty(curGroupNameList)) {
+            return OTHER_GROUP_NAME_LIST.get(0);
+        }
+        return StringUtils.join(curGroupNameList, "-");
+    }
+}

src/main/resources/application-local.yml

+# 霍煤鸿骏生产环境
+server:
+  exception:
+    to: 1327531085@qq.com;18463106881@163.com
+    form: ptlims_test@163.com
+    subject: 霍煤鸿骏 hmhj服务异常
+swagger:
+  enable: true
+service:
+  api-url: http://api.dev.patzn.com:7000
+  url: http://api.dev.patzn.com:7000
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    url: jdbc:postgresql://localhost:5432/dev_lims_hmhj
+    username: postgres
+    password: post123
+    dynamic:
+      enabled: false
+  # 注册中心配置
+  cloud:
+    consul:
+      host: 127.0.0.1
+  mail:
+    host: smtp.163.com
+    username: ptlims_test@163.com
+    password: QTXWOTEUSHARYDWT
+    port: 25
+    protocol: smtp
+    default-encoding: UTF-8
+  rabbitmq:
+    host: localhost
+    port: 5672
+    username: mqbase
+    password: mqb123#@$5
+    virtual-host: /
+    topic:
+      push-msg: pro.topic.push.msg
+      sys-log: pro.topic.sys.log
+      chemical-classify-warning: pro.topic.chemical.classify.warning
+      equip-check-msg: pro.topic.equip.check.msg
+      report-make-msg: pro.topic.report.make.msg
+      soil-work-msg: pro.topic.soil.work.msg
+      hmhj-work-msg: pro.topic.hmhj.work.msg
+  servlet:
+    multipart:
+      #设置 http 上传的临时目录
+      location: C:\patzn\upload_tmp
+  # Mongodb GridFS
+  data:
+    mongodb:
+      uri: mongodb://hmuser:hj564Aq@127.0.0.1:27017/lims
+      grid-fs-database: lims
+
+# Mongodb GridFS 存储
+oss:
+  grid-fs: true
+  bucket-name: base
+
+#libreOffice 安装信息
+libreOffice:
+  url: C:/Program Files/LibreOffice
+### jobs
+jobs:
+  admin-address: http://api.dev.patzn.com:7000/print
\ No newline at end of file

src/main/resources/application.yml

@@ -10,7 +10,7 @@ server:
 spring:
   # 环境 dev|test|pro
   profiles:
-    active: dev312
+    active: local
   application:
     name: hmhj
   # 模板引擎配置

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

@@ -38,6 +38,7 @@
     <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.ContractSampleVO">
         SELECT  s.* FROM contract_sample s WHERE s.deleted = 0
         <include refid="sqlWhere"/>
+        order by s.ctime desc
     </select>
     <select id="selectVOPublishList" resultType="com.patzn.cloud.service.hmhj.vo.ContractSampleVO">
         SELECT  s.*,
@@ -54,6 +55,7 @@
 
          WHERE s.deleted = 0 AND t.judge_status NOT IN (0,1)
         <include refid="sqlWhere"/>
+        order by s.ctime desc
     </select>
 
 

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

@@ -14,6 +14,13 @@
               #{id}
           </foreach>
       </if>
+      <if test="null!=vo.groupNameList">
+          AND test_side IN
+          <foreach collection="vo.groupNameList" index="index" item="groupName" open="(" separator="," close=")">
+              #{groupName}
+          </foreach>
+      </if>
+      order by entrust_time desc
   </select>
 
 
@@ -41,7 +48,14 @@
                 #{status}
             </foreach>
         </if>
-    </select>
 
+        <if test="null!=vo.groupNameList">
+            AND test_side IN
+            <foreach collection="vo.groupNameList" index="index" item="groupName" open="(" separator="," close=")">
+                #{groupName}
+            </foreach>
+        </if>
+        order by entrust_time desc
+    </select>
 
 </mapper>

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

@@ -3,8 +3,6 @@
 <mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleBackupMapper">
 
     <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleBackupVO">
-
-
         SELECT
             b.ID,
             b.receive_time,
@@ -14,16 +12,14 @@
             b.sample_id,
             b.handler,
             b.handle_time,
-
             s.NAME AS "sampleName",
             s.code AS "sampleCode" ,
             e.client ,
             e.code AS "entrustCode"
-FROM
+        FROM
         entrust_sample_backup b
         JOIN entrust_sample s ON b.sample_id = s.
         ID JOIN entrust e ON s.entrust_id = e.ID
-
         <where>
             AND b.deleted = 0 AND s.deleted = 0 AND e.deleted = 0
             <if test="null!=vo.sampleCode">
@@ -34,7 +30,6 @@ FROM
                 AND b.status =#{vo.status}
             </if>
 
-
             <if test="null!=vo.notStatus">
                 AND b.status !=#{vo.notStatus}
             </if>
@@ -49,8 +44,7 @@ FROM
             <if test="null!=vo.entrustCode">
                 AND e.code LIKE CONCAT('%',#{vo.entrustCode},'%')
             </if>
-
         </where>
-
+        order by b.ctime desc
     </select>
 </mapper>

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

@@ -4,12 +4,16 @@
 
     <select id="selectByItemLeftList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
         SELECT name FROM entrust_sample_item WHERE deleted = 0
-
-
-
         <if test="null!=vo.status">
             AND status = #{vo.status}
         </if>
+        <if test="null != vo.name">
+            AND name like CONCAT('%',#{vo.name},'%')
+        </if>
+
+        <if test="null != vo.sampleCode">
+            AND sample_code like CONCAT('%',#{vo.sampleCode},'%')
+        </if>
 
         <if test="null!=vo.statusList">
             AND status IN
@@ -18,14 +22,12 @@
             </foreach>
         </if>
 
-
         <if test="null!=vo.sampleIds">
             AND entrust_sample_id IN
             <foreach collection="vo.sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
                 #{sampleId}
             </foreach>
         </if>
-
         GROUP BY name
     </select>
 
@@ -78,9 +80,11 @@
 
         )
 
-            SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode",l.record_id,r.object_key AS "recordObjectKey" FROM i  JOIN entrust_sample s ON i.entrust_sample_id = s.id
+        SELECT i.*,s.name AS "sampleName",e.test_side "testSide",s.code AS "sampleCode",l.record_id,r.object_key AS "recordObjectKey" FROM i
+        JOIN entrust_sample s ON i.entrust_sample_id = s.id
         LEFT JOIN ( SELECT id,item_id,record_id FROM item_rel_original_record WHERE deleted = 0 ) l ON i.id = l.item_id
         LEFT JOIN ( SELECT id,object_key FROM original_record WHERE deleted = 0 ) r ON l.record_id = r.id
+        LEFT JOIN ( SELECT id,test_side FROM entrust e where e.deleted = 0 ) e on e.id = s.entrust_id
         <where>
             <if test="null!=vo.sampleCode">
                 AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
@@ -105,19 +109,21 @@
         WHERE
         deleted = 0
 
-        <if test="null!=vo.status">
+        <if test="null != vo.name">
+            AND name LIKE CONCAT('%',#{vo.name},'%')
+        </if>
+
+        <if test="null != vo.status">
             AND status = #{vo.status}
         </if>
 
-        <if test="null!=vo.statusList">
+        <if test="null != vo.statusList">
             AND status IN
             <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
                 #{status}
             </foreach>
         </if>
 
-
-
         <if test="null!=vo.sampleIds">
             AND entrust_sample_id IN
             <foreach collection="vo.sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
@@ -131,12 +137,14 @@
                 #{sampleId}
             </foreach>
         </if>
-
         )
 
-        SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode" FROM i  JOIN entrust_sample s ON i.entrust_sample_id = s.id
+        SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode",e.test_side "testSide"
+        FROM i
+        JOIN entrust_sample s ON i.entrust_sample_id = s.id
+        JOIN (select t.id,t.code,t.test_side from entrust t where t.deleted = 0 ) e on s.entrust_id = e.id
         <where>
-            <if test="null!=vo.sampleCode">
+            <if test="null != vo.sampleCode">
                 AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
             </if>
         </where>
@@ -144,7 +152,7 @@
 
 
     <select id="selectVOListBySampleIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
-      SELECT i.id,i.name,i.agreed_value,i.test_value,i.entrust_sample_id,i.standard,s.code AS "sampleCode"
+        SELECT i.id,i.name,i.agreed_value,i.test_value,i.standard,s.code AS "sampleCode"
         FROM
         entrust_sample_item i
         JOIN entrust_sample s ON i.entrust_sample_id = s.ID
@@ -165,7 +173,8 @@
 
         i.group_name,i.standard,s.name AS "sampleName",e.client,e.code AS "entrustCode",
 
-        d.method_code,d.reason,d.method_desc,d.applyer,d.apply_time , d.checker ,d.check_time,d.back_reason,r.object_key AS "recordObjectKey"
+        d.method_code,d.reason,d.method_desc,d.applyer,d.apply_time , d.checker ,d.check_time,d.back_reason,r.object_key
+        AS "recordObjectKey"
 
         FROM
         entrust_sample_item i
@@ -188,15 +197,13 @@
                 #{id}
             </foreach>
         </if>
-
-
         ORDER BY s.code , i.name
     </select>
 
 
-
     <select id="selectVOListByIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
-        SELECT i.id,i.name,i.entrust_sample_id,s.entrust_id,i.agreed_value,i.test_value,i.standard,s.code AS "sampleCode",s.name AS "sampleName",
+        SELECT i.id,i.name,i.entrust_sample_id,s.entrust_id,i.agreed_value,i.test_value,i.standard,s.code AS
+        "sampleCode",s.name AS "sampleName",
 
         s.sample_shape ,s.sample_quantity, s.standard, s.sample_from,s.product_code,s.name_code
         FROM
@@ -212,6 +219,17 @@
         ORDER BY s.code , i.name
     </select>
 
+    <select id="selectByOriginalRecordId" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
+        SELECT
+            i.id,i.name,i.entrust_sample_id,s.entrust_id,i.agreed_value,i.test_value,i.standard,s.code AS
+            "sampleCode",s.name AS "sampleName", s.sample_shape ,s.sample_quantity, s.standard, s.sample_from,
+            s.product_code,s.name_code
+        FROM
+            entrust_sample_item i
+        JOIN entrust_sample s ON i.entrust_sample_id = s.ID
+        JOIN item_rel_original_record rr on i.id = rr.item_id
+        WHERE i.deleted = 0 AND s.deleted = 0 and rr.deleted = 0 and rr.record_id = #{originalRecordId} limit 1
+    </select>
 
     <select id="selectListVOByIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
 

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

@@ -44,6 +44,10 @@
             AND  status = #{vo.status}
         </if>
 
+        <if test="null!=vo.code">
+            AND  code LIKE CONCAT('%',#{vo.code},'%')
+        </if>
+
         <if test="null!=vo.notStatus">
             AND  status != #{vo.notStatus}
         </if>

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

@@ -2,4 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.OriginalRecordMapper">
 
+    <select id="selectPageVO" resultType="com.patzn.cloud.service.hmhj.vo.OriginalRecordVO">
+        select r.*,e.code "entrustCode"
+        from original_record r
+        join entrust e on e.id = r.entrust_id
+        where r.deleted = 0 and e.deleted = 0
+        <if test="null != vo.title">
+            AND r.title LIKE CONCAT('%',#{vo.title},'%')
+        </if>
+        <if test="null != vo.entrustId">
+            AND r.entrust_id = #{vo.entrustId}
+        </if>
+        <if test="null != vo.entrustCode">
+            AND e.code LIKE CONCAT('%',#{vo.entrustCode},'%')
+        </if>
+        order by r.id desc
+    </select>
+
 </mapper>