luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目管理添加与机构关联逻辑，bug修复等

Browse Source
This commit is contained in:
mi9688
2024-10-18 18:18:58 +08:00
parent a5c5d88b46
commit a8faa7cdeb
16 changed files with 668 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fastbee-service/fastbee-project-service/src/main/resources/mapper/project/ProjectMapper.xml
View File

@ -27,10 +27,13 @@
<result property="tenantName" column="tenant_name" />
<result property="ownerId" column="owner_id" />
<result property="parentId" column="parent_id" />
<result property="deptId" column="dept_id" />
<result property="administrativeAreaCode" column="administrative_area_code" />
<result property="deptName" column="dept_name" />
</resultMap>
<sql id="selectProjectVo">
select project_id, project_name, sys_show_name, central_coordinates, scope, administrative_area, owner, logo, image, video_introduction, remark, p_params, introduce, del_flag, create_time, create_by, update_time, remarks, tenant_id, tenant_name, owner_id, parent_id from project
select project_id, project_name, sys_show_name, central_coordinates, scope, administrative_area, owner, logo, image, video_introduction, remark, p_params, introduce, del_flag, create_time, create_by, update_time, remarks, tenant_id, tenant_name, owner_id, parent_id, dept_id, administrative_area_code, dept_name from project
</sql>
<select id="selectProjectList" parameterType="Project" resultMap="ProjectResult">
@ -52,6 +55,9 @@
<if test="tenantName != null and tenantName != ''"> and tenant_name like concat('%', #{tenantName}, '%')</if>
<if test="ownerId != null "> and owner_id = #{ownerId}</if>
<if test="parentId != null "> and parent_id = #{parentId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="administrativeAreaCode != null and administrativeAreaCode != ''"> and administrative_area_code = #{administrativeAreaCode}</if>
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
</where>
</select>
@ -85,6 +91,9 @@
<if test="tenantName != null">tenant_name,</if>
<if test="ownerId != null">owner_id,</if>
<if test="parentId != null">parent_id,</if>
<if test="deptId != null">dept_id,</if>
<if test="administrativeAreaCode != null">administrative_area_code,</if>
<if test="deptName != null">dept_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectId != null">#{projectId},</if>
@ -109,6 +118,9 @@
<if test="tenantName != null">#{tenantName},</if>
<if test="ownerId != null">#{ownerId},</if>
<if test="parentId != null">#{parentId},</if>
<if test="deptId != null">#{deptId},</if>
<if test="administrativeAreaCode != null">#{administrativeAreaCode},</if>
<if test="deptName != null">#{deptName},</if>
</trim>
</insert>
@ -136,6 +148,9 @@
<if test="tenantName != null">tenant_name = #{tenantName},</if>
<if test="ownerId != null">owner_id = #{ownerId},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="administrativeAreaCode != null">administrative_area_code = #{administrativeAreaCode},</if>
<if test="deptName != null">dept_name = #{deptName},</if>
</trim>
where project_id = #{projectId}
</update>