From a6a2b9a9d0397ff05b74699fba16f16d15c4497d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BC=82=E6=B3=8A?= <1913856125@qq.com>
Date: Thu, 1 Jan 2026 21:54:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=8D=95=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/zhyc/module/base/1        |  1 -
 .../controller/SwMedicineController.java        | 14 +++++++-------
 .../com/zhyc/module/work/domain/WorkOrder.java  |  7 +++++++
 .../resources/mapper/work/WorkOrderMapper.xml   | 17 ++++++++++++-----
 4 files changed, 26 insertions(+), 13 deletions(-)
 delete mode 100644 zhyc-module/src/main/java/com/zhyc/module/base/1

diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/1 b/zhyc-module/src/main/java/com/zhyc/module/base/1
deleted file mode 100644
index 8b13789..0000000
--- a/zhyc-module/src/main/java/com/zhyc/module/base/1
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineController.java
index c6cbc0f..5340a4f 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineController.java
@@ -29,7 +29,7 @@ import com.zhyc.common.core.page.TableDataInfo;
  * @date 2025-07-11
  */
 @RestController
-@RequestMapping("/system/medicine")
+@RequestMapping("/biosafety/medicine")
 public class SwMedicineController extends BaseController
 {
     @Autowired
@@ -38,7 +38,7 @@ public class SwMedicineController extends BaseController
     /**
      * 查询药品列表
      */
-    @PreAuthorize("@ss.hasPermi('system:medicine:list')")
+    @PreAuthorize("@ss.hasPermi('biosafety:medicine:list')")
     @GetMapping("/list")
     public TableDataInfo list(SwMedicine swMedicine)
     {
@@ -50,7 +50,7 @@ public class SwMedicineController extends BaseController
     /**
      * 导出药品列表
      */
-    @PreAuthorize("@ss.hasPermi('system:medicine:export')")
+    @PreAuthorize("@ss.hasPermi('biosafety:medicine:export')")
     @Log(title = "药品", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SwMedicine swMedicine)
@@ -63,7 +63,7 @@ public class SwMedicineController extends BaseController
     /**
      * 获取药品详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:medicine:query')")
+    @PreAuthorize("@ss.hasPermi('biosafety:medicine:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +73,7 @@ public class SwMedicineController extends BaseController
     /**
      * 新增药品
      */
-    @PreAuthorize("@ss.hasPermi('system:medicine:add')")
+    @PreAuthorize("@ss.hasPermi('biosafety:medicine:add')")
     @Log(title = "药品", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SwMedicine swMedicine)
@@ -84,7 +84,7 @@ public class SwMedicineController extends BaseController
     /**
      * 修改药品
      */
-    @PreAuthorize("@ss.hasPermi('system:medicine:edit')")
+    @PreAuthorize("@ss.hasPermi('biosafety:medicine:edit')")
     @Log(title = "药品", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SwMedicine swMedicine)
@@ -95,7 +95,7 @@ public class SwMedicineController extends BaseController
     /**
      * 删除药品
      */
-    @PreAuthorize("@ss.hasPermi('system:medicine:remove')")
+    @PreAuthorize("@ss.hasPermi('biosafety:medicine:remove')")
     @Log(title = "药品", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/zhyc-module/src/main/java/com/zhyc/module/work/domain/WorkOrder.java b/zhyc-module/src/main/java/com/zhyc/module/work/domain/WorkOrder.java
index a9c1aa9..c4d9f34 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/work/domain/WorkOrder.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/work/domain/WorkOrder.java
@@ -68,6 +68,13 @@ public class WorkOrder extends BaseEntity
     @Excel(name = "计划执行日期，必填", width = 30, dateFormat = "yyyy-MM-dd")
     private Date executeDate;
 
+//    查询计划日期
+    private Date beginPlanDate;
+    private Date endPlanDate;
+//    查询结束日期
+    private Date beginFinishDate;
+    private Date endFinishDate;
+
     /** 计划执行时段，可空 */
     @Excel(name = "计划执行时段，可空")
     private String executeTime;
diff --git a/zhyc-module/src/main/resources/mapper/work/WorkOrderMapper.xml b/zhyc-module/src/main/resources/mapper/work/WorkOrderMapper.xml
index 1472f35..5d426ae 100644
--- a/zhyc-module/src/main/resources/mapper/work/WorkOrderMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/work/WorkOrderMapper.xml
@@ -42,15 +42,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectWorkOrderList" parameterType="WorkOrder" resultMap="WorkOrderResult">
         <include refid="selectWorkOrderVo"/>
-        <where>  
+        <where>
             <if test="orderNo != null  and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
             <if test="planId != null "> and plan_id = #{planId}</if>
             <if test="bizType != null "> and biz_type = #{bizType}</if>
-            <if test="title != null  and title != ''"> and title like coucat('%', #{title},'%')</if>
+            <if test="title != null  and title != ''"> and title like concat('%', #{title},'%')</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="department != null  and department != ''"> and department = #{department}</if>
-            <if test="executor != null  and executor != ''"> and executor like coucat('%',#{executor},'%') </if>
-            <if test="params.beginPlanDate != null and params.beginPlanDate != '' and params.endPlanDat != null and params.endPlanDate != ''"> and execute_date between #{params.beginPlanDate} and #{params.endPlanDate}</if>
+            <if test="executor != null  and executor != ''"> and executor like concat('%',#{executor},'%') </if>
+            <if test="beginPlanDate != null  and endPlanDate != null ">
+             and execute_date between #{beginPlanDate} and #{endPlanDate}
+             </if>
             <if test="executeTime != null  and executeTime != ''"> and execute_time = #{executeTime}</if>
             <if test="sheepScope != null  and sheepScope != ''"> and sheep_scope = #{sheepScope}</if>
             <if test="location != null  and location != ''"> and location = #{location}</if>
@@ -62,10 +64,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="issueTime != null "> and issue_time = #{issueTime}</if>
             <if test="receiverId != null "> and receiver_id = #{receiverId}</if>
             <if test="receiveTime != null "> and receive_time = #{receiveTime}</if>
-            <if test="params.beginDatetime != null and params.beginDatetime != '' and params.endFinishDate != null and params.endFinishDate != ''"> and finish_time between #{params.beginFinishDate} and #{params.endFinishDate}</if>
+            <if test="beginFinishDate != null and endFinishDate != null ">
+                and finish_time between #{beginFinishDate} and #{endFinishDate}
+            </if>
+
             <if test="result != null  and result != ''"> and result = #{result}</if>
         </where>
+        order by execute_date desc
     </select>
+
     
     <select id="selectWorkOrderById" parameterType="Long" resultMap="WorkOrderResult">
         <include refid="selectWorkOrderVo"/>