1、executor微服务错误码整理；2、分堆打包mycat环境封包异常修复；3、订单包裹详情分页新结构适配；4、板材管理移除权限校验；

2026-08-14 05:42:06 +08:00 · 2026-04-28 10:43:48 +08:00
parent 8cebcf15fa
commit e11f8a40e0
90 changed files with 346 additions and 5108 deletions
@@ -1,26 +0,0 @@
-<?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="com.cf.imes.module.system.dal.mysql.process.ProcessGroupMapper">
-
-    <select id="selectOneById" resultType="com.cf.imes.module.system.dal.dataobject.process.ProcessGroupDO">
-        select
-            p.id,
-            p.organ_id,
-            p.name,
-            p.is_default,
-            p.sort,
-            p.items,
-            p.description,
-            p.creator,
-            p.create_time,
-            p.updater,
-            p.update_time,
-            p.deleted
-        from process_group p
-        where p.id = #{id} and p.organ_id = #{organId} and p.deleted = 0
-    </select>
-
-    <update id="updateIsDefault" >
-        UPDATE process_group SET is_default = 0 WHERE organ_id = #{organId} AND id != #{processGroupId}
-    </update>
-</mapper>
@@ -1,94 +0,0 @@
-<?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="com.cf.imes.module.system.dal.mysql.process.ProcessMapper">
-    <select id="selectProcessPage" resultType="com.cf.imes.module.system.dal.dataobject.process.ProcessDO">
-        select
-        p.id,
-        p.organ_id,
-        p.name,
-        p.piece_rate,
-        p.piece_type,
-        p.type,
-        p.is_custom,
-        p.is_dealer,
-        p.hour_capacity,
-        p.sort,
-        p.unit,
-        p.is_enabled,
-        p.prepare_time,
-        p.description,
-        p.creator,
-        p.create_time,
-        p.updater,
-        p.update_time,
-        p.deleted
-        from process p
-        <where>
-            p.deleted = 0 and p.organ_id = #{vo.organId}
-            <if test="vo.userId != null and vo.userId != '' ">
-                and p.id in (select process_id from process_user where user_id = #{vo.userId})
-            </if>
-            <if test="vo.name != null and vo.name != '' ">
-                and p.name like concat('%', #{vo.name}, '%')
-            </if>
-            <if test="vo.isEnabled != null">
-                and p.is_enabled = #{vo.isEnabled}
-            </if>
-            <if test="vo.type != null">
-                and p.type = #{vo.type}
-            </if>
-            <if test="vo.pieceType != null">
-                and p.piece_type = #{vo.pieceType}
-            </if>
-        </where>
-        order by sort,id desc
-    </select>
-
-    <select id="selectOneById" resultType="com.cf.imes.module.system.dal.dataobject.process.ProcessDO">
-        select
-            p.id,
-            p.organ_id,
-            p.name,
-            p.piece_rate,
-            p.piece_type,
-            p.type,
-            p.is_custom,
-            p.is_dealer,
-            p.hour_capacity,
-            p.sort,
-            p.unit,
-            p.is_enabled,
-            p.prepare_time,
-            p.description,
-            p.creator,
-            p.create_time,
-            p.updater,
-            p.update_time,
-            p.deleted
-        from process p
-        where p.id = #{id} and p.organ_id = #{organId} and p.deleted = 0
-    </select>
-
-
-    <delete id="deleteById" parameterType="java.lang.Long">
-        DELETE FROM process
-        WHERE id = #{id};
-    </delete>
-
-
-    <select id="selectUserProcess"
-            resultType="com.cf.imes.module.system.controller.admin.process.vo.processUser.ProcessAndUserRespVO">
-
-
-        select distinct p.name as processName,pu.user_id as userId
-        from process p
-                 join process_user pu on p.id = pu.process_id
-        where p.organ_id = #{organId} and p.deleted = false
-
-
-    </select>
-
-
-
-
-</mapper>
@@ -1,18 +0,0 @@
-<?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="com.cf.imes.module.system.dal.mysql.process.ProcessUserMapper">
-
-    <delete id="deleteUserByProcessId" parameterType="Long">
-        DELETE FROM process_user
-        WHERE process_id = #{processId};
-    </delete>
-
-    <select id="selectOneById" resultType="com.cf.imes.module.system.dal.dataobject.process.ProcessUserDO">
-        select
-            p.organ_id,
-            p.process_id,
-            p.user_id,
-        from process_user p
-        where p.organ_id = #{organId} and p.process_id = #{processId} and p.deleted = 0
-    </select>
-</mapper>