添加审签逻辑，移动flow通用代码，添加根据角色查询用户，新增时间工具类，修改指派设备bug

lyh

2025-03-31 bc263d8bed5d1405f275bb8638a9bec9eaf06585

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PermissionStreamNewMapper.xml

@@ -2,15 +2,46 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.jeecg.modules.dnc.mapper.PermissionStreamNewMapper">
    <select id="loadProductMix" resultType="org.jeecg.modules.dnc.entity.ProductMix">
        SELECT
            mix.*
        SELECT DISTINCT
            mix.id,
            mix.tree_code 'code',
                mix.tree_name 'name',
            mix.parent_id,
            mix.tree_type AS 'type',
                mix.extend,
                mix.create_time
        FROM
            nc_product_mix mix
                LEFT JOIN nc_permission_stream_new nps ON mix.id = nps.business_id
                AND nps.user_id = #{userId}
                AND nps.delete_flag = '0'
            nc_product_mix mix -- 连接权限表，筛选部门相关记录
                LEFT JOIN nc_permission_stream_new nps_depart ON mix.id = nps_depart.business_id
                AND nps_depart.delete_flag = '0'
                        <if test="productIdList != null and productIdList.size() > 0">
                            AND nps_depart.depart_id IN
                            <foreach collection="productIdList" item="productId" index="index" open="(" close=")" separator=",">
                                #{productId}
                            </foreach>
                        </if>
                AND nps_depart.user_id IS NULL -- 连接权限表，筛选用户相关记录
                LEFT JOIN nc_permission_stream_new nps_user ON mix.id = nps_user.business_id
                AND nps_user.user_id = #{userId}
                AND nps_user.delete_flag = '0'
        WHERE
            nps.business_id IS NOT NULL
           OR nps.business_id IS NULL
            nps_depart.business_id IS NOT NULL
          AND nps_user.business_id IS NOT NULL
        order by mix.tree_type, mix.create_time asc
    </select>
    <select id="loadProductMixAll" resultType="org.jeecg.modules.dnc.entity.ProductMix">
        SELECT DISTINCT mix.id,
                        mix.tree_code    'code',
                        mix.tree_name    'name',
                        mix.parent_id,
                        mix.tree_type AS 'type',
                        mix.extend,
                        mix.create_time
        FROM nc_product_mix mix -- 连接权限表，筛选部门相关记录
                 LEFT JOIN nc_permission_stream_new nps_user ON mix.id = nps_user.business_id
            AND nps_user.user_id = #{userId}
            AND nps_user.delete_flag = '0'
        WHERE nps_user.business_id IS NOT NULL
        order by mix.tree_type, mix.create_time asc
    </select>
</mapper>