Merge remote-tracking branch 'origin/master'

src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java

@@ -73,19 +73,6 @@ public class EntrustMaterialCheckoutResultController {
         return R.ok(voiPage);
     }
 
-    @ApiOperation("导出检材检出结果的excel表格")
-    @PostMapping("/exportExcel")
-    public void exportExcel(@RequestBody List<String> entrustIds, HttpServletResponse response) {
-        if (CollUtil.isEmpty(entrustIds)) {
-            throw new CheckedException("请选择要导出的委托检出结果信息！");
-        }
-        try {
-            entrustMaterialCheckoutResultService.exportExcel(entrustIds, response);
-        } catch (IOException e) {
-            throw new CheckedException("导出excel失败！");
-        }
-    }
-
     @ApiOperation("查询所有检出检材的毒品种类清单，并按名称进行排序")
     @GetMapping("/getResultType")
     public R getResultType(Integer year, String orgId) {

src/main/java/digital/laboratory/platform/entrustment/misc/ProcessFlowMapper.java

@@ -7,7 +7,7 @@ import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;
  * 流程映射定义
  */
 public class ProcessFlowMapper {
-	public static int getNextStatus(int currentStatus, int opCode) {
+	public static int  getNextStatus(int currentStatus, int opCode) {
 		int processFlowMapper[][] = {
 				{EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus()},
 

src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java

@@ -645,7 +645,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
 
             // 时间过滤条件
             if (startTime != null && endTime != null) {
-                qw.ge(Entrustment::getAcceptTime, startTime).le(Entrustment::getCreateTime, endTime);
+                qw.ge(Entrustment::getAcceptTime, startTime).le(Entrustment::getAcceptTime, endTime);
             } else {
                 qw.ge(Entrustment::getAcceptTime, this.getStartTime(null));
             }