From 1b02862f56fc90459088a7850b1cbc66686ea29e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 30 十月 2026 16:45:12 +0800
Subject: [PATCH] feat(order): 新增委托单级联删除服务 - 新增 InsOrderDeletionService,实现委托单及全部关联业务记录的级联删除 - 重构删除接口,增加权限校验和操作日志注解 - 委托单、报告、样品、样品接收、用章台账、过程报告等模块统一增加送样日期字段并按送样日期排序 - 委托单新增时校验送样日期不能为空 - 优化角色菜单权限,新增
---
cnas-process/src/main/resources/mapper/ProcessReportMapper.xml | 3
inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java | 2
inspect-server/src/main/resources/mapper/InsSampleReceiptMapper.xml | 4
inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java | 25 ++++
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 12 +-
inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleReceiptPageDto.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 19 ++-
inspect-server/src/main/java/com/ruoyi/inspect/pojo/SealUsageLedger.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderDeletionService.java | 130 ++++++++++++++++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java | 3
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 3
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 3
inspect-server/src/main/resources/mapper/SealUsageLedgerMapper.xml | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 8 -
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 3
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java | 4
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java | 9 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 21 ++++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 6 +
cnas-process/src/main/java/com/ruoyi/process/dto/ProcessReportDto.java | 2
22 files changed, 239 insertions(+), 33 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessReportDto.java b/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessReportDto.java
index fac8c1c..4cbe1a3 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessReportDto.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessReportDto.java
@@ -11,6 +11,8 @@
@Data
//瀵煎嚭
public class ProcessReportDto extends ProcessReport {
+ @Schema(description = "閫佹牱鏃ユ湡")
+ private java.time.LocalDate sampleDate;
private List<Integer> ids;
diff --git a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
index a9fd8c4..97a3e86 100644
--- a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
@@ -35,6 +35,7 @@
cpr.update_user,
cpr.update_time,
cpr.inspection_order_id,
+ io.sample_date,
cpr.receive_date,
cpr.receive_user,
u1.name sendUserName
@@ -47,7 +48,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
- order by A.send_time desc, A.id desc
+ order by (A.sample_date IS NULL) asc, A.sample_date desc, A.inspection_order_id desc, A.id desc
</select>
<select id="exportProcessReport" resultType="com.ruoyi.process.dto.ProcessReportDto">
select ROW_NUMBER() OVER (ORDER BY cpr.id) AS indexs,
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 52b75c7..086eed0 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -15,6 +15,9 @@
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.pojo.InsSample;
import com.ruoyi.inspect.service.InsOrderService;
+import com.ruoyi.inspect.service.InsOrderDeletionService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.inspect.service.InsOrderTemplateService;
import com.ruoyi.inspect.service.InsProductService;
import com.ruoyi.inspect.service.InsSampleService;
@@ -40,6 +43,8 @@
public class InsOrderController {
private InsOrderService insOrderService;
+
+ private InsOrderDeletionService insOrderDeletionService;
private InsSampleService insSampleService;
@@ -228,16 +233,12 @@
return Result.success(insOrderService.updateInsOrder(insOrderUpdateDto));
}
- @Operation(summary = "鍒犻櫎閫�鍥炶鍗�")
+ @Operation(summary = "鍒犻櫎濮旀墭鍗曞強鍏ㄩ儴鍏宠仈璁板綍")
+ @PreAuthorize("@ss.hasPermi('delete:insOrder')")
+ @Log(title = "濮旀墭鍗曞強鍏宠仈璁板綍", businessType = BusinessType.DELETE)
@DeleteMapping("/delInsOrder")
- public Result<?> delInsOrder(Integer insOrderId) {
- // 鏌ヨ璁㈠崟
- InsOrder order = insOrderService.getById(insOrderId);
- if (!(order.getState().equals(2) || order.getState().equals(3))) {
- throw new ErrorException("鍙湁閫�鍥炶鍗曟墠鑳藉垹闄�");
- }
-
- return Result.success(insOrderService.removeById(insOrderId));
+ public Result<?> delInsOrder(@RequestParam Integer insOrderId) {
+ return Result.success(insOrderDeletionService.deleteOrder(insOrderId));
}
@Operation(summary = "鎴愬搧鏍囩鎵撳嵃")
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java
index 7c79187..048a01b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java
@@ -8,6 +8,8 @@
@Data
public class ReportPageDto extends InsReport implements Serializable {
+ @Schema(description = "閫佹牱鏃ユ湡")
+ private java.time.LocalDate sampleDate;
@Schema(description = "濮旀墭缂栧彿")
private String entrustCode;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleReceiptPageDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleReceiptPageDto.java
index 1ddc52f..3d95324 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleReceiptPageDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleReceiptPageDto.java
@@ -10,6 +10,8 @@
@Data
@ExcelIgnoreUnannotated
public class SampleReceiptPageDto {
+ @Schema(description = "閫佹牱鏃ユ湡")
+ private java.time.LocalDate sampleDate;
@Schema(description = "鏍峰搧鎺ユ敹璁板綍ID")
private Integer receiptId;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/SealUsageLedger.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/SealUsageLedger.java
index de079f9..b69d785 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/SealUsageLedger.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/SealUsageLedger.java
@@ -30,6 +30,9 @@
private String sealIds;
private String sealNames;
private String projectName;
+ @TableField(exist = false)
+ @Schema(description = "閫佹牱鏃ユ湡")
+ private java.time.LocalDate sampleDate;
private Integer useUserId;
private String useUserName;
private Integer copies;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderDeletionService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderDeletionService.java
new file mode 100644
index 0000000..3b82bf9
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderDeletionService.java
@@ -0,0 +1,130 @@
+package com.ruoyi.inspect.service;
+
+import com.ruoyi.framework.exception.ErrorException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鍒犻櫎濮旀墭鎷ユ湁鐨勪笟鍔¤褰曪紱鏍囧噯銆佹ā鏉裤�佽澶囥�佺敤鎴风瓑鍏叡璧勬枡涓嶅睘浜庡鎵樸��
+ */
+@Service
+@RequiredArgsConstructor
+public class InsOrderDeletionService {
+
+ private final NamedParameterJdbcTemplate jdbc;
+
+ @Transactional(rollbackFor = Exception.class)
+ public int deleteOrder(Integer orderId) {
+ if (orderId == null || orderId <= 0) {
+ throw new ErrorException("璇烽�夋嫨瑕佸垹闄ょ殑濮旀墭鍗�");
+ }
+ List<Map<String, Object>> orders = jdbc.queryForList(
+ "SELECT type_source, ifs_inventory_id FROM ins_order WHERE id = :id FOR UPDATE",
+ Collections.singletonMap("id", orderId));
+ if (orders.isEmpty()) {
+ throw new ErrorException("濮旀墭鍗曚笉瀛樺湪鎴栧凡琚垹闄�");
+ }
+ Map<String, Object> order = orders.get(0);
+ Object source = order.get("type_source");
+ Object inventoryId = order.get("ifs_inventory_id");
+ if ((source instanceof Number && ((Number) source).intValue() == 1)
+ || (inventoryId != null && !inventoryId.toString().trim().isEmpty())) {
+ throw new ErrorException("姝ゅ叆鍙d粎鍏佽鍒犻櫎濮旀墭涓嬪崟涓殑濮旀墭鍗�");
+ }
+
+ List<Long> orderIds = Collections.singletonList(orderId.longValue());
+ List<Long> sampleIds = ids("ins_sample", "id", "ins_order_id", orderIds);
+ List<Long> productIds = ids("ins_product", "id", "ins_sample_id", sampleIds);
+ List<Long> reportIds = ids("ins_report", "id", "ins_order_id", orderIds);
+ List<Long> inspectionIds = ids("cnas_inspection_order", "inspection_order_id", "ins_order_id", orderIds);
+ List<Long> processSampleIds = ids("cnas_process_sample", "id", "inspection_order_id", inspectionIds);
+ List<Long> satisfactionIds = ids("cnas_client_satisfaction", "client_satisfaction_id", "order_id", orderIds);
+ List<Long> verifyIds = ids("ins_order_factory_verify", "factory_verify_id", "ins_order_id", orderIds);
+ List<Long> warningIds = ids("ins_product_deviation_warning", "deviation_warning_id", "ins_order_id", orderIds);
+ List<Long> evaluateIds = ids("cnas_quality_monitor_details_evaluate", "details_evaluate_id", "ins_order_id", orderIds);
+ List<Long> retestIds = ids("ins_unqualified_retest_product", "id", "ins_product_id", productIds);
+ List<Long> handlerIds = ids("ins_unqualified_handler", "id", "ins_order_id", orderIds);
+
+ // 鍏堝垹闄ゅ閮ㄤ笟鍔℃ā鍧椾腑鐢辨湰濮旀墭鐢熸垚鐨勮褰曪紝鍐嶅垹闄ゆ楠屼富浠庤〃銆�
+ delete("cnas_client_satisfaction_attachment", "client_satisfaction_id", satisfactionIds);
+ delete("cnas_client_satisfaction", "client_satisfaction_id", satisfactionIds);
+ delete("cnas_process_complain", "ins_report_id", reportIds);
+ delete("cnas_quality_monitor_details_evaluate_file", "details_evaluate_id", evaluateIds);
+ delete("cnas_quality_monitor_details_evaluate", "ins_order_id", orderIds);
+ delete("cnas_process_deal", "ins_sample_id", sampleIds);
+ delete("cnas_process_deal", "process_sample_id", processSampleIds);
+ // 鎶ュ憡鍙戦�佽褰曠殑鍘嗗彶瀛楁 inspection_order_id 瀹為檯瀛樺偍 ins_order.id銆�
+ delete("cnas_process_report", "inspection_order_id", orderIds);
+ delete("cnas_process_order_device", "inspection_order_id", inspectionIds);
+ delete("cnas_process_sample", "inspection_order_id", inspectionIds);
+ delete("cnas_inspection_order_detail", "inspection_order_id", inspectionIds);
+ delete("cnas_inspection_order", "inspection_order_id", inspectionIds);
+
+ delete("auxiliary_output_working_hours", "order_id", orderIds);
+ delete("auxiliary_output_working_hours_temporary", "order_id", orderIds);
+ delete("auxiliary_output_working_hours", "sample_id", sampleIds);
+ delete("auxiliary_output_working_hours_temporary", "sample_id", sampleIds);
+ delete("auxiliary_output_working_hours", "ins_product_id", productIds);
+ delete("auxiliary_output_working_hours_temporary", "ins_product_id", productIds);
+
+ delete("ins_report_edit_session", "report_id", reportIds);
+ delete("ins_report_return_record", "report_id", reportIds);
+ delete("ins_report_return_record", "ins_order_id", orderIds);
+ delete("seal_usage_ledger", "report_id", reportIds);
+ delete("seal_usage_ledger", "ins_order_id", orderIds);
+ delete("ins_report", "ins_order_id", orderIds);
+
+ delete("ins_product_deviation_warning_detail", "deviation_warning_id", warningIds);
+ delete("ins_product_deviation_warning_detail", "ins_order_id", orderIds);
+ delete("ins_product_deviation_warning_detail", "ins_product_id", productIds);
+ delete("ins_product_deviation_warning", "ins_order_id", orderIds);
+ delete("ins_product_deviation_warning", "ins_product_id", productIds);
+ delete("ins_order_rates", "ins_order_id", orderIds);
+ delete("ins_order_rates", "ins_product_id", productIds);
+ delete("ins_unqualified_retest_result", "retest_product_id", retestIds);
+ delete("ins_unqualified_retest_product", "ins_product_id", productIds);
+ delete("ins_unqualified_retest_product", "ins_sample_id", sampleIds);
+ delete("ins_unqualified_handler_file", "unqualified_id", handlerIds);
+ delete("ins_unqualified_handler", "ins_order_id", orderIds);
+ delete("ins_product_result", "ins_product_id", productIds);
+ delete("ins_product_user", "ins_product_id", productIds);
+ delete("ins_product", "ins_sample_id", sampleIds);
+ delete("warehouse_history", "ins_sample_id", sampleIds);
+ delete("ins_sample_receipt", "ins_order_id", orderIds);
+ // 鍘嗗彶瀛楁鍚嶄负 ins_sample_id锛屽疄闄呭瓨鍌� ins_order.id锛屼笉鑳芥寜鏍峰搧 ID 鍒犻櫎銆�
+ delete("ins_sample_user", "ins_sample_id", orderIds);
+ delete("ins_sample", "ins_order_id", orderIds);
+
+ delete("ins_order_factory_verify_item", "factory_verify_id", verifyIds);
+ delete("ins_order_factory_verify", "ins_order_id", orderIds);
+ delete("device_record", "ins_order_id", orderIds);
+ delete("ins_order_file", "ins_order_id", orderIds);
+ delete("ins_order_template_device", "ins_order_id", orderIds);
+ delete("ins_order_standard_template", "ins_order_id", orderIds);
+ delete("ins_order_state", "ins_order_id", orderIds);
+ return delete("ins_order", "id", orderIds);
+ }
+
+ // 琛ㄥ悕銆佸垪鍚嶄粎鏉ヨ嚜鏈被鍥哄畾鐨勫叧鑱旀竻鍗曪紱鎵�鏈変笟鍔� ID 鍧囦娇鐢ㄧ粦瀹氬弬鏁般��
+ private List<Long> ids(String table, String key, String foreignKey, List<Long> parentIds) {
+ if (parentIds.isEmpty()) {
+ return Collections.emptyList();
+ }
+ return jdbc.queryForList("SELECT " + key + " FROM " + table + " WHERE " + foreignKey + " IN (:ids)",
+ Collections.singletonMap("ids", parentIds), Long.class);
+ }
+
+ private int delete(String table, String foreignKey, List<Long> parentIds) {
+ if (parentIds.isEmpty()) {
+ return 0;
+ }
+ return jdbc.update("DELETE FROM " + table + " WHERE " + foreignKey + " IN (:ids)",
+ Collections.singletonMap("ids", parentIds));
+ }
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index 39843a4..db1a1d9 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -302,6 +302,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
+ if (insOrder == null || insOrder.getSampleDate() == null) {
+ throw new ErrorException("閫佹牱鏃ユ湡涓嶈兘涓虹┖");
+ }
// todo: 涓嬪崟鍒ゆ柇鎶芥牱璁″垝鐨勫敮涓�鎬�
if (insOrder.getQuarterItemId() != null) {
Long quarterItemCount = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
index c5f34c5..1110404 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
@@ -3,26 +3,43 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import java.time.LocalDate;
+
@Data
-public class InsOrderPlanVO{
+@Schema(description = "妫�楠屼换鍔″垪琛ㄤ俊鎭�")
+public class InsOrderPlanVO {
+ @Schema(description = "閫佹牱鏃ユ湡")
+ private LocalDate sampleDate;
-
+ @Schema(description = "濮旀墭鍗旾D")
private Integer id;
@Schema(description = "濮旀墭缂栧彿")
private String entrustCode;
+ @Schema(description = "浠诲姟鏉ユ簮")
private String taskSource;
+ @Schema(description = "璐ㄩ噺鐩戞帶璁″垝鏄庣粏ID")
private Integer qualityMonitorDetailsId;
+ @Schema(description = "鐩戞帶椤圭洰")
private String monitorProject;
+ @Schema(description = "璁″垝鏈熼檺")
private String dueDate;
+ @Schema(description = "鐩戞帶鐩殑")
private String monitorPurpose;
+ @Schema(description = "鐩戞帶鏂瑰紡")
private String monitorWay;
+ @Schema(description = "鏍峰搧瑙勬牸")
private String sampleSpec;
+ @Schema(description = "鏍囧噯缂栧彿")
private String standardCode;
+ @Schema(description = "璇勪环浜篒D")
private Integer evaluatorUserId;
+ @Schema(description = "鐩戞帶璁″垝鎵瑰噯浜篒D")
private Integer planRatifyUserId;
+ @Schema(description = "璐ㄩ噺鐩戞帶璇勪环鐘舵��")
private Integer evaluateStatus;
+ @Schema(description = "鎶�鏈爣鍑嗘枃鏈�")
private String technicalStandardText;
@Schema(description = "鏍峰搧鍚嶇О")
@@ -49,6 +66,7 @@
@Schema(description = "澶嶆牳浜�")
private String checkName;
+ @Schema(description = "鐢ㄦ埛ID")
private Integer userId;
@Schema(description = "妫�楠屽紑濮嬫椂闂�")
@@ -67,10 +85,13 @@
private String reportReturnSource;
+ @Schema(description = "瀛愬疄楠屽")
private String sonLaboratory;
+ @Schema(description = "涓嬪崟浜篒D")
private Integer orderUserId;
+ @Schema(description = "澶嶆牳浜篒D")
private Integer verifyUser;
@Schema(description = "涓嬪崟绫诲埆")
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index dfa7c0d..2014b1f 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -202,11 +202,12 @@
AND io.laboratory=#{laboratory}
</if>
GROUP BY io.id,type
- order by type desc,io.id desc
+ order by (io.sample_date is null) asc, io.sample_date desc, io.id desc
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+ ORDER BY (a.sample_date IS NULL) ASC, a.sample_date DESC, a.id DESC
</select>
<select id="selectInsOrderParameter" resultType="com.ruoyi.inspect.pojo.InsOrder">
diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index ffd96ba..21e35bb 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -10,6 +10,7 @@
select
ir.*,
io.entrust_code,
+ io.sample_date,
u.name write_user_name,
u1.name ratify_user,
u2.name examine_user,
@@ -59,7 +60,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
- ORDER BY a.create_time DESC
+ ORDER BY (a.sample_date IS NULL) ASC, a.sample_date DESC, a.ins_order_id DESC, a.id DESC
</select>
<select id="getLaboratoryByName" resultType="java.lang.String">
select s.address from seal s
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 7abb16d..796910d 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -210,6 +210,7 @@
io.entrust_code,
io.type,
io.appointed,
+ io.sample_date,
io.send_time,
io.order_type,
io.task_source,
@@ -322,7 +323,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
- ORDER BY send_time desc
+ ORDER BY (A.sample_date IS NULL) ASC, A.sample_date DESC, A.id DESC, A.son_laboratory ASC
</select>
diff --git a/inspect-server/src/main/resources/mapper/InsSampleReceiptMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleReceiptMapper.xml
index 8dbe4e5..cc57cca 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleReceiptMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleReceiptMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.inspect.mapper.InsSampleReceiptMapper">
<sql id="receiptColumns">
r.id receipt_id, r.ins_order_id order_id, r.ins_sample_id sample_id, r.status,
- COALESCE(NULLIF(io.sample_view, ''), isa.sample) AS sample_name, isa.sample_code, io.entrust_code,
+ COALESCE(NULLIF(io.sample_view, ''), isa.sample) AS sample_name, isa.sample_code, io.entrust_code, io.sample_date,
COALESCE(iost.method_standard, sm.code) method_standard,
ip.inspection_item, r.main_inspector_id, u.name main_inspector_name,
COALESCE(isa.remark, io.remark) remark, r.reject_remark, r.receive_time,
@@ -43,7 +43,7 @@
LIKE CONCAT('%', #{query.sampleName}, '%')
</if>
GROUP BY r.id
- ORDER BY r.create_time DESC
+ ORDER BY (io.sample_date IS NULL) ASC, io.sample_date DESC, io.id DESC, r.id DESC
</select>
<select id="selectDetail" resultType="com.ruoyi.inspect.dto.SampleReceiptPageDto">
SELECT <include refid="receiptColumns"/>
diff --git a/inspect-server/src/main/resources/mapper/SealUsageLedgerMapper.xml b/inspect-server/src/main/resources/mapper/SealUsageLedgerMapper.xml
index d27e385..9d22b7c 100644
--- a/inspect-server/src/main/resources/mapper/SealUsageLedgerMapper.xml
+++ b/inspect-server/src/main/resources/mapper/SealUsageLedgerMapper.xml
@@ -5,7 +5,7 @@
<sql id="LedgerColumns">
ledger.id, ledger.report_id, ledger.report_code, ledger.ins_order_id,
ledger.use_time, ledger.seal_ids, ledger.seal_names,
- COALESCE(io.sample_view, '') AS project_name,
+ COALESCE(io.sample_view, '') AS project_name, io.sample_date,
ledger.use_user_id, ledger.use_user_name, ledger.copies, ledger.version,
ledger.create_user, ledger.create_time, ledger.update_user, ledger.update_time
</sql>
@@ -39,7 +39,7 @@
LEFT JOIN ins_order io ON io.id = ledger.ins_order_id
WHERE 1 = 1
<include refid="LedgerFilters"/>
- ORDER BY ledger.use_time DESC, ledger.id DESC
+ ORDER BY (io.sample_date IS NULL) ASC, io.sample_date DESC, io.id DESC, ledger.id DESC
</select>
<select id="selectForExport" resultType="com.ruoyi.inspect.pojo.SealUsageLedger">
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index d4b905a..2eea30a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -77,11 +77,9 @@
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
Set<String> permissions = permissionService.getMenuPermission(user);
- if (!loginUser.getPermissions().equals(permissions))
- {
- loginUser.setPermissions(permissions);
- tokenService.refreshToken(loginUser);
- }
+ // 鍗充娇鏉冮檺瀛楃涓茬浉鍚岋紝瑙掕壊韬唤鍙婃暟鎹寖鍥翠篃鍙兘鍙樺寲锛岄渶瑕佷繚瀛樻渶鏂拌鑹插揩鐓с��
+ loginUser.setPermissions(permissions);
+ tokenService.refreshToken(loginUser);
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index 9d9fab6..0b1030f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -68,12 +68,14 @@
/**
* 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍�
*/
- @GetMapping(value = "/roleMenuTreeselect/{roleId}")
- public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+ @PreAuthorize("@ss.hasAnyPermi('system:role:add,system:role:edit')")
+ @GetMapping(value = {"/roleMenuTreeselect", "/roleMenuTreeselect/{roleId}"})
+ public AjaxResult roleMenuTreeselect(@PathVariable(value = "roleId", required = false) Long roleId)
{
- List<SysMenu> menus = menuService.selectMenuList(getUserId());
+ List<SysMenu> menus = menuService.selectRoleMenuList(getUserId());
AjaxResult ajax = AjaxResult.success();
- ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+ ajax.put("checkedKeys", roleId == null ? java.util.Collections.emptyList()
+ : menuService.selectMenuListByRoleId(roleId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
return ajax;
}
@@ -162,4 +164,4 @@
}
return toAjax(menuService.deleteMenuById(menuId));
}
-}
\ No newline at end of file
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
index 17960f6..ca8377f 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
@@ -65,7 +65,9 @@
}
else
{
- List<SysRole> roles = user.getRoles();
+ // 鐧诲綍鍚庣殑瑙掕壊鍒嗛厤鍙兘宸叉敼鍙橈紝涓嶈兘缁х画浣跨敤 token 涓殑瑙掕壊蹇収銆�
+ List<SysRole> roles = roleService.selectAssignedRolesByUserId(user.getUserId());
+ user.setRoles(roles);
if (!CollectionUtils.isEmpty(roles))
{
// 澶氳鑹茶缃畃ermissions灞炴�э紝浠ヤ究鏁版嵁鏉冮檺鍖归厤鏉冮檺
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
index ed7e574..8b08363 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
@@ -254,15 +254,18 @@
// 绠$悊鍛樻嫢鏈夋墍鏈夋潈闄愶紝璺宠繃
continue;
}
- // 鍒ゆ柇璇ョ敤鎴锋槸鍚︽嫢鏈夋瑙掕壊
+ boolean previouslyHadRole = loginUser.getUser().getRoles() != null
+ && loginUser.getUser().getRoles().stream().anyMatch(r -> roleId.equals(r.getRoleId()));
+ // 鏉冮檺璁$畻浼氬悓鏃惰鍙栧綋鍓嶈鑹插叧绯伙紝瑕嗙洊鏂板瑙掕壊鏈繘鍏ユ棫 token 鐨勬儏鍐点��
+ java.util.Set<String> permissions = permissionService.getMenuPermission(loginUser.getUser());
boolean hasRole = loginUser.getUser().getRoles() != null
&& loginUser.getUser().getRoles().stream().anyMatch(r -> roleId.equals(r.getRoleId()));
- if (!hasRole)
+ if (!previouslyHadRole && !hasRole)
{
continue;
}
// 鍒锋柊鏉冮檺缂撳瓨
- loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+ loginUser.setPermissions(permissions);
refreshToken(loginUser);
log.info("瑙掕壊[{}]鏉冮檺鍙樻洿锛屽凡鍒锋柊鍦ㄧ嚎鐢ㄦ埛[{}]鐨勬潈闄愮紦瀛�", roleId, loginUser.getUsername());
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
index aa3a564..46c7894 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
@@ -21,6 +21,9 @@
*/
public List<SysMenu> selectMenuList(Long userId);
+ /** 瑙掕壊鎺堟潈浣跨敤鐨勮彍鍗曞垪琛紝鍖呭惈濮旀墭涓嬪崟鍙垎閰嶇殑鍒犻櫎鏉冮檺銆� */
+ public List<SysMenu> selectRoleMenuList(Long userId);
+
/**
* 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
*
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
index 9185cce..50f75e3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
@@ -28,6 +28,9 @@
*/
public List<SysRole> selectRolesByUserId(Long userId);
+ /** 鏌ヨ鐢ㄦ埛褰撳墠瀹為檯鎷ユ湁鐨勮鑹诧紝涓嶅寘鍚鑹查�夋嫨妗嗕腑鐨勬湭閫夎鑹层�� */
+ public List<SysRole> selectAssignedRolesByUserId(Long userId);
+
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鏉冮檺
*
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index 131861a..ccc02b4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -64,6 +64,27 @@
return selectMenuList(new SysMenu(), userId);
}
+ @Override
+ public List<SysMenu> selectRoleMenuList(Long userId)
+ {
+ List<SysMenu> menus = new ArrayList<>(selectMenuList(userId));
+ Set<Long> visibleIds = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toSet());
+ // 瑙掕壊绠$悊鍛樺彲鍒嗛厤濮旀墭鍗曞垹闄ゆ潈闄愶紝鏃犻渶鍏堟嫢鏈夊垹闄や笟鍔℃暟鎹殑鏉冮檺銆�
+ // 浠呭湪宸叉湁濮旀墭涓嬪崟鐖惰彍鍗曚笅琛ュ厖璇ユ寜閽紝鍏朵粬鑿滃崟浠嶉伒寰師鏈夊彲瑙佽寖鍥淬��
+ for (SysMenu menu : menuMapper.selectMenuList(new SysMenu()))
+ {
+ if ("delete:insOrder".equals(menu.getPerms())
+ && "F".equals(menu.getMenuType())
+ && "0".equals(menu.getStatus())
+ && visibleIds.contains(menu.getParentId())
+ && visibleIds.add(menu.getMenuId()))
+ {
+ menus.add(menu);
+ }
+ }
+ return menus;
+ }
+
/**
* 鏌ヨ绯荤粺鑿滃崟鍒楄〃
*
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 7a1a277..e0276a0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -86,6 +86,12 @@
return roles;
}
+ @Override
+ public List<SysRole> selectAssignedRolesByUserId(Long userId)
+ {
+ return roleMapper.selectRolePermissionByUserId(userId);
+ }
+
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
*
--
Gitblit v1.9.3