添加按钮、菜单sql;

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

@@ -252,7 +252,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
         // 是否可以进入下一步流程,一旦为空,直接正常流程处理
         EntrustFlowEnum flowStatus = EntrustFlowUtils.getNextFlowStatus(entrust.getFlowStatus(), entrust.getStatusPath());
         // 报告的审核状态不再走submitToNextNode
-        if (null != flowStatus) {
+        if (null != flowStatus && flowStatus.getValue() > fromFlowStatus.getValue()) {
             toFlowStatus = flowStatus;
             if (flowStatus == EntrustFlowEnum.QUALITY_JUDGE) {
                 entrustService.submitToNextNode(entrust, account);

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

@@ -930,7 +930,12 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         // 是否特殊需求
         boolean isSpecAsk = null != entrust.getSpecialAsk() && ("是".equals(entrust.getSpecialAsk()));
         // 是否需要修改样品和检测项目(由于报告处只会修改部分样品)
-        boolean isUpdateSampleInfo = nextFlowValue < 9 || nextFlowValue > 12;
+        boolean isUpdateSampleInfo = nextFlowValue < 9 || nextFlowValue > 13;
+        // 处理样品以及检测项目的流程状态
+        if (!isUpdateSampleInfo) {
+            return true;
+        }
+
         // 若为特殊需求，必须要走评审
         String uri = "";
         List<Long> sendUidList = new ArrayList<>();
@@ -947,10 +952,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         } else if (nextStatus == EntrustStatusEnum.QUALITY_CHECK) {
             uri = "/hmhj/quality_manage/quality_decide";
         }
-        // 处理样品以及检测项目的流程状态
-        if (!isUpdateSampleInfo) {
-            return true;
-        }
+
         entrustSampleService.updateSampleNextFlowInfo(entrust, nextFlowStatus, account);
 
         entrust.setStatus(nextStatus);

src/test/java/resources/db_sql/base/v168/20210923__添加菜单、按钮.sql

+/** created by meazty on 2021/9/23 11:31 **/
+/** created by meazty on 2021/9/23 11:31 **/
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440616738717093890, 1356148880450674689, 1440613780998770690, '管理报告', 1, 'quality-check-GLBG', '/', NULL, NULL, 1, 1, '2021-09-22 17:59:30.536', NULL);
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440616708325167105, 1356148880450674689, 1440613780998770690, '附件', 1, 'quality-check-FJ', '/', NULL, NULL, 1, 1, '2021-09-22 17:59:23.297', NULL);
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440616674196115457, 1356148880450674689, 1440613780998770690, '操作日志', 1, 'quality-check-CZRZ', '/', NULL, NULL, 1, 1, '2021-09-22 17:59:15.153', NULL);
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440616635373637634, 1356148880450674689, 1440613780998770690, '历史-管理报告', 1, 'quality-check-his-GLBG', '/', NULL, NULL, 1, 1, '2021-09-22 17:59:05.905', NULL);
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440616588674256897, 1356148880450674689, 1440613780998770690, '历史-附件', 1, 'quality-check-his-FJ', '/', NULL, NULL, 1, 1, '2021-09-22 17:58:54.768', NULL);
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440616475415465985, 1356148880450674689, 1440613780998770690, '操作日志-历史', 1, 'quality-check-his-CZRZ', '/', NULL, NULL, 1, 1, '2021-09-22 17:58:27.763', NULL);
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440613780998770690, 1356148880450674689, 1365114902096551938, '质检审核', 0, 'quality_check', '/hmhj/report_manage/quality_check', 'pt-config', NULL, 1, 5, '2021-09-22 17:47:45.37', NULL);
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440574880200708098, 1356148880450674689, 1359066545217511426, '验收专家配置', 0, 'check_expert', '/hmhj/sys_config/check_expert', 'pt-config', NULL, 1, 1, '2021-09-22 15:13:10.699', NULL);