统计查询问题；

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

@@ -642,13 +642,12 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
 
         // 质量判定标志
         boolean executeJudgeFlag = false;
+        // 记录操作人
+        recordReportHandler(fromFlowStatus, account, entrustReport);
 
-        if (toFlowStatus == EntrustFlowEnum.REPORT_ALLOW) {
-            entrustReport.setReportChecker(account.getUserName()).setReportCheckerId(account.getUserId()).setReportCheckTime(new Date());
-        } else if (toFlowStatus == EntrustFlowEnum.REPORT_ISSUE || toFlowStatus == EntrustFlowEnum.REPORT_SEND || toFlowStatus == EntrustFlowEnum.QUALITY_INSPECT) {
+        if (toFlowStatus == EntrustFlowEnum.REPORT_ISSUE || toFlowStatus == EntrustFlowEnum.REPORT_SEND || toFlowStatus == EntrustFlowEnum.QUALITY_INSPECT) {
             entrust.setTestTimeE(new Date());
             entrustService.updateById(entrust);
-            entrustReport.setReportAllower(account.getUserName()).setReportAllowerId(account.getUserId()).setReportAllowTime(new Date());
             // 若从批准往后提交,则生成报告
             // 转化PDF
             executor1.execute(() -> changeExcelReportToPdf(ids));
@@ -656,8 +655,6 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
             if (toFlowStatus == EntrustFlowEnum.REPORT_SEND) {
                 generateNewReportFlow(entrust.getId());
             }
-            // 记录 签发人、发放人、质检审核人
-            recordReportHandler(fromFlowStatus, account, entrustReport);
 
         } else if (toFlowStatus == EntrustFlowEnum.QUALITY_JUDGE || toFlowStatus == EntrustFlowEnum.ARCHIVES) {
             // 归档前置条件为已判定
@@ -715,7 +712,21 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
      * @param entrustReport
      */
     private void recordReportHandler(EntrustFlowEnum fromFlowStatus, Account account, EntrustReport entrustReport) {
-        if (fromFlowStatus == EntrustFlowEnum.REPORT_ISSUE) {
+        // REPORT_MAKE(8, "报告编制"),
+        // REPORT_CHECK(9, "报告审核"),
+        // REPORT_ALLOW(10, "报告批准"),
+        // REPORT_ISSUE(11, "报告签发"),
+        // REPORT_SEND(12, "报告发放"),
+        // QUALITY_INSPECT(13, "质检审核"),
+        // QUALITY_JUDGE(14, "质量判定"),
+        // ARCHIVES(15, "电子档案");
+        if (fromFlowStatus == EntrustFlowEnum.REPORT_MAKE) {
+            entrustReport.setReportMaker(account.getUserName()).setReportMakerId(account.getUserId()).setReportMakeTime(new Date());
+        } else if (fromFlowStatus == EntrustFlowEnum.REPORT_CHECK) {
+            entrustReport.setReportChecker(account.getUserName()).setReportCheckerId(account.getUserId()).setReportCheckTime(new Date());
+        } else if (fromFlowStatus == EntrustFlowEnum.REPORT_ALLOW) {
+            entrustReport.setReportAllower(account.getUserName()).setReportAllowerId(account.getUserId()).setReportAllowTime(new Date());
+        } else if (fromFlowStatus == EntrustFlowEnum.REPORT_ISSUE) {
             entrustReport.setReportIssuer(account.getUserName()).setReportIssuerId(account.getUserId()).setReportIssueTime(new Date());
         } else if (fromFlowStatus == EntrustFlowEnum.REPORT_SEND) {
             entrustReport.setReportSender(account.getUserName()).setReportSenderId(account.getUserId()).setReportSendTime(new Date());

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

@@ -94,7 +94,9 @@
             s.id,
             s.NAME "sample_name",
             s.code "sample_code",
+            max(s.sample_from) "sample_from",
             max(s.sample_grading) "brand",
+            max(i.tester) "tester",
             to_char(max(i.test_time),'YYYY-MM-DD HH24:MI:SS') "test_time",
             max(r.report_checker) "report_checker",
             max(r.report_issuer) "report_issuer",

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

@@ -369,21 +369,21 @@
             SELECT
                 PI.*,
                 (CASE WHEN PI.C_VAL >= 2.50 AND PI.C_VAL <= 3.10 THEN 1 ELSE 0 END) "c_in_num",
-                (CASE WHEN PI.C_VAL >= 2.00 AND PI.C_VAL <= 3.00 THEN 1 ELSE 0 END) "si_in_num",
-                (CASE WHEN PI.C_VAL >= 0.60 AND PI.C_VAL <= 0.90 THEN 1 ELSE 0 END) "mn_in_num",
-                (CASE WHEN PI.C_VAL >= 0.80 AND PI.C_VAL <= 1.40 THEN 1 ELSE 0 END) "p_in_num",
-                (CASE WHEN PI.C_VAL > 0.15 THEN 1 ELSE 0 END) "s_in_num",
+                (CASE WHEN PI.SI_VAL >= 2.00 AND PI.SI_VAL <= 3.00 THEN 1 ELSE 0 END) "si_in_num",
+                (CASE WHEN PI.MN_VAL >= 0.60 AND PI.MN_VAL <= 0.90 THEN 1 ELSE 0 END) "mn_in_num",
+                (CASE WHEN PI.P_VAL >= 0.80 AND PI.P_VAL <= 1.40 THEN 1 ELSE 0 END) "p_in_num",
+                (CASE WHEN PI.S_VAL > 0.15 THEN 1 ELSE 0 END) "s_in_num",
 
                 (CASE WHEN PI.C_VAL < 2.50 THEN 1 ELSE 0 END) "c_lt_num",
-                (CASE WHEN PI.C_VAL < 2.00 THEN 1 ELSE 0 END) "si_lt_num",
-                (CASE WHEN PI.C_VAL < 0.60 THEN 1 ELSE 0 END) "mn_lt_num",
-                (CASE WHEN PI.C_VAL < 0.80 THEN 1 ELSE 0 END) "p_lt_num",
+                (CASE WHEN PI.SI_VAL < 2.00 THEN 1 ELSE 0 END) "si_lt_num",
+                (CASE WHEN PI.MN_VAL < 0.60 THEN 1 ELSE 0 END) "mn_lt_num",
+                (CASE WHEN PI.P_VAL < 0.80 THEN 1 ELSE 0 END) "p_lt_num",
 
                 (CASE WHEN PI.C_VAL > 3.10 THEN 1 ELSE 0 END) "c_gt_num",
-                (CASE WHEN PI.C_VAL > 3.00 THEN 1 ELSE 0 END) "si_gt_num",
-                (CASE WHEN PI.C_VAL > 0.90 THEN 1 ELSE 0 END) "mn_gt_num",
-                (CASE WHEN PI.C_VAL > 1.40 THEN 1 ELSE 0 END) "p_gt_num",
-                (CASE WHEN PI.C_VAL >= 0.15 THEN 1 ELSE 0 END) "s_gt_num"
+                (CASE WHEN PI.SI_VAL > 3.00 THEN 1 ELSE 0 END) "si_gt_num",
+                (CASE WHEN PI.MN_VAL > 0.90 THEN 1 ELSE 0 END) "mn_gt_num",
+                (CASE WHEN PI.P_VAL > 1.40 THEN 1 ELSE 0 END) "p_gt_num",
+                (CASE WHEN PI.S_VAL >= 0.15 THEN 1 ELSE 0 END) "s_gt_num"
              FROM (
                 SELECT
                     i.company_id,