From a7ad8c17aa069e723aa0a813cf198d07e67b5fb5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 14 三月 2025 14:19:08 +0800
Subject: [PATCH] 新增刀具、设备类信息管理，新增结构树优化，优化权限分配，新增双控设备结构书 修改flow模块 删除部分废弃yml配置
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/HisWorkTaskMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/mapper/xml/HisWorkTaskMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/HisWorkTaskMapper.xml
similarity index 94%
rename from lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/mapper/xml/HisWorkTaskMapper.xml
rename to lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/HisWorkTaskMapper.xml
index 2ca746e..c164cb5 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/mapper/xml/HisWorkTaskMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/HisWorkTaskMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.flow.mapper.IHisWorkTaskMapper">
- <select id="queryHisTaskList" resultType="org.jeecg.modules.flow.entity.HisWorkTask">
+<mapper namespace="org.jeecg.modules.dncFlow.mapper.IHisWorkTaskMapper">
+ <select id="queryHisTaskList" resultType="org.jeecg.modules.dncFlow.entity.HisWorkTask">
SELECT
fb.id AS id,
aht.NAME_ AS name,
@@ -23,7 +23,7 @@
ORDER BY
aht.START_TIME_ ASC
</select>
- <select id="queryJjHisTaskByJjId" resultType="org.jeecg.modules.flow.entity.HisWorkTask">
+ <select id="queryJjHisTaskByJjId" resultType="org.jeecg.modules.dncFlow.entity.HisWorkTask">
select fb.id as id,
aht.NAME_ as name,
su.realname as assignee,
@@ -39,7 +39,7 @@
ORDER BY aht.START_TIME_ ASC
</select>
- <select id="queryJjGgHisTaskByJjId" resultType="org.jeecg.modules.flow.entity.HisWorkTask">
+ <select id="queryJjGgHisTaskByJjId" resultType="org.jeecg.modules.dncFlow.entity.HisWorkTask">
select fb.id as id,
aht.NAME_ as name,
su.realname as assignee,
@@ -55,7 +55,7 @@
ORDER BY aht.START_TIME_ ASC
</select>
- <select id="queryLsHisTaskByJjId" resultType="org.jeecg.modules.flow.entity.HisWorkTask">
+ <select id="queryLsHisTaskByJjId" resultType="org.jeecg.modules.dncFlow.entity.HisWorkTask">
select fb.id as id,
aht.NAME_ as name,
su.realname as assignee,
@@ -71,7 +71,7 @@
ORDER BY aht.START_TIME_ ASC
</select>
- <select id="queryFxHisTaskByJjId" resultType="org.jeecg.modules.flow.entity.HisWorkTask">
+ <select id="queryFxHisTaskByJjId" resultType="org.jeecg.modules.dncFlow.entity.HisWorkTask">
select fb.id as id,
aht.NAME_ as name,
su.realname as assignee,
--
Gitblit v1.9.3