Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
RuoYi-Vue-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
融通安全管理系统
RuoYi-Vue-master
Commits
31017d39
Commit
31017d39
authored
Aug 11, 2023
by
陈晓晋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加入影响因素字段20230811
parent
bea3a6b4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanExistingList.java
.../censoft/censoftrongtong/domain/RiskPlanExistingList.java
+6
-0
censoft-rongtong/src/main/resources/mapper/system/RiskPlanExistingListMapper.xml
...in/resources/mapper/system/RiskPlanExistingListMapper.xml
+9
-3
No files found.
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanExistingList.java
View file @
31017d39
...
...
@@ -156,6 +156,12 @@ public class RiskPlanExistingList extends BaseEntity {
@TableField
(
"evaluation_item_ids"
)
private
String
evaluationItemIds
;
/**
* 影响因素
*/
@TableField
(
"factor_items"
)
private
String
factorItems
;
/**
* 楼栋ID
*/
...
...
censoft-rongtong/src/main/resources/mapper/system/RiskPlanExistingListMapper.xml
View file @
31017d39
...
...
@@ -33,10 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"remark"
column=
"remark"
/>
<result
property=
"evaluationItemIds"
column=
"evaluation_item_ids"
/>
<result
property=
"factorItems"
column=
"factor_items"
/>
</resultMap>
<sql
id=
"selectRiskPlanExistingListVo"
>
select id, user_id, inherent_id, plan_id, room_id, name, factor, type, level, presence_location, picture_file_ids, measures_project, measures_project_file_ids, measures_administration, measures_dept_name, measures_user_name, measures_user_phone, measures_administration_file_ids, measures_emergency, measures_emergency_file_ids, reference_basis, del_flag, create_by, create_time, update_by, update_time, remark,evaluationItemIds from risk_plan_existing_list
select id, user_id, inherent_id, plan_id, room_id, name, factor, type, level, presence_location, picture_file_ids, measures_project, measures_project_file_ids, measures_administration, measures_dept_name, measures_user_name, measures_user_phone, measures_administration_file_ids, measures_emergency, measures_emergency_file_ids, reference_basis, del_flag, create_by, create_time, update_by, update_time, remark,evaluationItemIds
,factor_items
from risk_plan_existing_list
</sql>
<select
id=
"selectRiskPlanExistingListList"
parameterType=
"com.censoft.censoftrongtong.domain.RiskPlanExistingList"
resultMap=
"RiskPlanExistingListResult"
>
...
...
@@ -74,7 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
rpil.update_by,
rpil.update_time,
rpil.remark,
rpil.evaluation_item_ids
rpil.evaluation_item_ids,
rpil.factor_items
FROM
risk_plan_existing_list rpil
LEFT JOIN ledger_room lr ON lr.id = rpil.room_id
...
...
@@ -142,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"updateTime != null"
>
update_time,
</if>
<if
test=
"remark != null"
>
remark,
</if>
<if
test=
"evaluationItemIds != null"
>
evaluation_item_ids,
</if>
<if
test=
"factorItems != null"
>
factor_items,
</if>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"userId != null"
>
#{userId},
</if>
...
...
@@ -171,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"updateTime != null"
>
#{updateTime},
</if>
<if
test=
"remark != null"
>
#{remark},
</if>
<if
test=
"evaluationItemIds != null"
>
#{evaluationItemIds},
</if>
<if
test=
"factorItems != null"
>
#{factorItems},
</if>
</trim>
</insert>
...
...
@@ -204,6 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"updateTime != null"
>
update_time = #{updateTime},
</if>
<if
test=
"remark != null"
>
remark = #{remark},
</if>
<if
test=
"evaluationItemIds != null"
>
evaluation_item_ids = #{evaluationItemIds},
</if>
<if
test=
"factorItems != null"
>
factor_items = #{factorItems},
</if>
</trim>
where id = #{id}
</update>
...
...
@@ -251,7 +256,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
rpil.measures_emergency_file_ids AS measuresEmergencyFileIds,
rpil.reference_basis AS referenceBasis,
rpil.create_time,
rpil.evaluation_item_ids
rpil.evaluation_item_ids,
rpil.factor_items
FROM
risk_plan_existing_list rpil
LEFT JOIN sys_user su ON su.user_id = rpil.user_id
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment