From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对(未明确) 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检,抽检的话是抽多少百分比 6.供应商管理东西太少了,没有资质文件啊这些东西(是不是可以参考pro) 7.采购审批把人从李莹莹改成龙红星

---
 src/main/resources/mapper/projectManagement/PlanMapper.xml |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/projectManagement/PlanMapper.xml b/src/main/resources/mapper/projectManagement/PlanMapper.xml
index 3578358..de652e7 100644
--- a/src/main/resources/mapper/projectManagement/PlanMapper.xml
+++ b/src/main/resources/mapper/projectManagement/PlanMapper.xml
@@ -7,17 +7,17 @@
     <resultMap id="BaseResultMap" type="com.ruoyi.projectManagement.pojo.Plan">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="name" column="name" jdbcType="VARCHAR"/>
-            <result property="describe" column="describe" jdbcType="VARCHAR"/>
+            <result property="description" column="description" jdbcType="VARCHAR"/>
             <result property="attachment" column="attachment" jdbcType="VARCHAR"/>
-            <result property="is_delete" column="is_delete" jdbcType="INTEGER"/>
-            <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="update_time" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="create_user" column="create_user" jdbcType="VARCHAR"/>
-            <result property="update_user" column="update_user" jdbcType="VARCHAR"/>
+            <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,name,describe,
+        id,name,description,
         attachment,is_delete,create_time,
         update_time,create_user,update_user
     </sql>
@@ -25,6 +25,7 @@
     <select id="selectPlanPage" resultMap="BaseResultMap">
         select t1.*
         from project_management_plan as t1
+            where t1.is_delete = 0
         order by t1.create_time desc
     </select>
 </mapper>

--
Gitblit v1.9.3