From be9ca92347b9400a48c177ca2b472314b4811694 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 24 Apr 2024 15:53:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/HumanServiceImpl.java | 4 +-
.../service/impl/TeamServiceImpl.java | 4 +-
.../main/resources/mapper/DeviceBdMapper.xml | 43 +++---------------
.../resources/mapper/HumanManageMapper.xml | 17 ++-----
.../src/main/resources/mapper/ProMapper.xml | 36 ++++-----------
.../main/resources/mapper/SignProMapper.xml | 45 ++++---------------
.../resources/mapper/TeamManageMapper.xml | 12 +----
7 files changed, 32 insertions(+), 129 deletions(-)
diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java
index 7ec29af..815c8e8 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java
@@ -61,9 +61,9 @@ public class HumanServiceImpl implements HumanService {
String data = mapper.getUserAccessStatus(vo.getUserId(), Constant.ACCESS_TYPE, 1);
if (StringUtils.isNotEmpty(data)) {
String value = mapper.getUserAccessStatus(data, Constant.ACCESS_TYPE, 2);
- vo.setStatus(StringUtils.isEmpty(value) ? "离场" : value);
+ vo.setStatus(StringUtils.isEmpty(value) ? "出" : value);
}else{
- vo.setStatus("离场");
+ vo.setStatus("出");
}
}
} catch (Exception e) {
diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java
index 0bc884e..5616531 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java
@@ -156,9 +156,9 @@ public class TeamServiceImpl implements TeamService {
String data = humanManageMapper.getUserAccessStatus(vo.getUserId(), Constant.ACCESS_TYPE, 1);
if (StringUtils.isNotEmpty(data)) {
String value = humanManageMapper.getUserAccessStatus(data, Constant.ACCESS_TYPE, 2);
- vo.setStatus(StringUtils.isEmpty(value) ? "离场" : value);
+ vo.setStatus(StringUtils.isEmpty(value) ? "出" : value);
} else {
- vo.setStatus("离场");
+ vo.setStatus("出");
}
String decryptIdNumber = AesCbcUtils.decrypt(vo.getIdNumber());
if (decryptIdNumber != null) {
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
index 5d52063..d47c7da 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
@@ -35,18 +35,8 @@
- UPDATE tb_pro_bd
-
- bd_name = #{bdName},
- bd_code = #{bdCode},
- bd_ip = #{bdIp},
- bd_type = #{bdType},
- type_code = #{typeCode},
- gt_id = #{gtId},
- bid_code = #{bidCode},
- bind_time = #{bindTime},
-
- WHERE id = #{id}
+ UPDATE tb_pro_bd SET bd_name = #{bdName},bd_code = #{bdCode},bd_ip = #{bdIp},bd_type = #{bdType},
+ type_code = #{typeCode},gt_id = #{gtId},bid_code = #{bidCode},bind_time = #{bindTime} WHERE id = #{id}
@@ -85,20 +75,9 @@
- UPDATE tb_bd_device
-
- device_code = #{deviceCode},
- devic_type = #{deviceType},
- status = #{status},
- bd_code = #{bdCode},
- device_name = #{deviceName},
- update_time = #{updateTime},
- device_model = #{deviceModel},
- bd_id = #{bdId},
- area_id = #{areaId},
- gt_id = #{gtId},
-
- WHERE device_id = #{deviceId}
+ UPDATE tb_bd_device SET device_code = #{deviceCode},devic_type = #{deviceType},status = #{status},bd_code = #{bdCode},
+ device_name = #{deviceName},update_time = #{updateTime},device_model = #{deviceModel},bd_id = #{bdId},area_id = #{areaId},
+ gt_id = #{gtId} WHERE device_id = #{deviceId}
@@ -143,16 +122,8 @@
- UPDATE tb_device_detail
-
- device_id = #{deviceId},
- mode_name = #{modeName},
- max_value = #{maxValueData},
- min_valu = #{minValueData},
- data_type = #{dataType},
- device_code = #{deviceCode},
-
- WHERE id = #{id}
+ UPDATE tb_device_detail SET device_id = #{deviceId},mode_name = #{modeName},max_value = #{maxValueData},
+ min_valu = #{minValueData},data_type = #{dataType},device_code = #{deviceCode} WHERE id = #{id}
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml
index ef139ba..7a6ac16 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml
@@ -35,20 +35,9 @@
- UPDATE t_team_people
-
- team_id = #{teamId},
- user_name = #{userName},
- id_number = #{idNumber},
- phone = #{phone},
- user_type = #{userType},
- #{status},
- person_type = #{personType},
- project_dep_name = #{projectDepName},
- dept_name = #{deptName},
- sex = #{sex},
-
- WHERE user_id= #{userId}
+ UPDATE t_team_people SET team_id = #{teamId},user_name = #{userName},id_number = #{idNumber},phone = #{phone},
+ user_type = #{userType},person_type = #{personType},project_dep_name = #{projectDepName},dept_name = #{deptName},
+ sex = #{sex} WHERE user_id= #{userId}
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProMapper.xml
index e6ca370..a42389d 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProMapper.xml
@@ -63,33 +63,11 @@
- UPDATE tb_project
-
- user_id = #{userId},
- sign_code = #{signCode},
- bid_code = #{bidCode},
- pro_code = #{proCode},
- pro_name = #{proName},
- pro_cost = #{proCost},
- sg_unit = #{sgUnit},
- jl_unit = #{jlUnit},
- pro_type = #{proType},
- pro_scale = #{proScale},
- manager = #{manager},
- now_gx = #{nowGx},
- status = #{status},
- plan_start_time = #{planStartTime},
- plan_end_time = #{planEndTime},
- start_time = #{startTime},
- end_time = #{endTime},
- org = #{org},
- bid_type = #{bidType},
- sg_manage = #{sgManage},
- jl_manage = #{jlManage},
- sub_type = #{subType},
- tc_date = #{tcDate},
-
- WHERE pro_id = #{proId}
+ UPDATE tb_project SET sign_code = #{signCode},bid_code = #{bidCode},pro_code = #{proCode},
+ pro_name = #{proName},pro_cost = #{proCost},sg_unit = #{sgUnit},jl_unit = #{jlUnit},pro_type = #{proType},
+ pro_scale = #{proScale},manager = #{manager},now_gx = #{nowGx},status = #{status},plan_start_time = #{planStartTime},
+ plan_end_time = #{planEndTime},start_time = #{startTime},end_time = #{endTime},org = #{org},bid_type = #{bidType},
+ sg_manage = #{sgManage},jl_manage = #{jlManage},sub_type = #{subType},tc_date = #{tcDate} WHERE pro_id = #{proId}
@@ -207,7 +185,9 @@
sd.dict_name AS status,
tp.bid_code AS bidCode,
tp.sign_code AS signCode,
- tp.pro_code AS proCode
+ tp.pro_code AS proCode,
+ tp.sg_manage AS sgManage,
+ tp.jl_manage AS jlManage
FROM tb_project tp
LEFT JOIN sys_build sb ON tp.org = sb.org_id
LEFT JOIN sys_dict sd ON sd.dict_code = tp.status AND sd.del_flag = 0
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SignProMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SignProMapper.xml
index f32edbd..96fb5e0 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SignProMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SignProMapper.xml
@@ -43,24 +43,10 @@
- UPDATE tb_jj_project
-
- pro_name = #{proName},
- pro_no = #{proNo},
- org_id = #{orgId},
- vlotage = #{vlotage},
- pro_type = #{proType},
- construction_nature = #{constructionNature},
- plan_nature = #{planNature},
- line = #{line},
- power = #{power},
- plan_start_time = #{planStartTime},
- plan_end_time = #{planEndTime},
- start_time = #{startTime},
- end_time = #{endTime},
- tc_time = #{tcTime},
-
- WHERE id = #{id}
+ UPDATE tb_jj_project SET pro_name = #{proName},pro_no = #{proNo},org_id = #{orgId},vlotage = #{vlotage},
+ pro_type = #{proType},construction_nature = #{constructionNature},plan_nature = #{planNature},line = #{line},
+ power = #{power},plan_start_time = #{planStartTime},plan_end_time = #{planEndTime},start_time = #{startTime},
+ end_time = #{endTime},tc_time = #{tcTime} WHERE id = #{id}
@@ -107,25 +93,10 @@
- UPDATE tb_sign_project
-
- single_name = #{singleName},
- signle_no = #{signleNo},
- wbs_code = #{wbsCode},
- project_no = #{proNo},
- single_desc = #{singleDesc},
- vol_level = #{volLevel},
- line_length = #{lineLength},
- subs_cap = #{subsCap},
- pro_type = #{proType},
- subs_type = #{subsType},
- estimate_type = #{estimateType},
- org_id = #{orgId},
- start_date = #{startDate},
- end_date = #{endDate},
- complete_date = #{completeDate},
-
- WHERE id = #{id}
+ UPDATE tb_sign_project SET single_name = #{singleName},signle_no = #{signleNo},wbs_code = #{wbsCode},project_no = #{proNo},
+ single_desc = #{singleDesc},vol_level = #{volLevel},line_length = #{lineLength},subs_cap = #{subsCap},pro_type = #{proType},
+ subs_type = #{subsType},estimate_type = #{estimateType},org_id = #{orgId},start_date = #{startDate},end_date = #{endDate},
+ complete_date = #{completeDate} WHERE id = #{id}
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamManageMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamManageMapper.xml
index 2b39741..5d8bdc8 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamManageMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamManageMapper.xml
@@ -26,16 +26,8 @@
- UPDATE tb_work_team
-
- team_name = #{teamName},
- team_leader = #{teamLeader},
- bid_code = #{bidCode},
- team_leader_phone = #{teamLeaderPhone},
- id_number = #{idNumber},
- status = #{status},
-
- WHERE team_id = #{teamId}
+ UPDATE tb_work_team SET team_name = #{teamName},team_leader = #{teamLeader},bid_code = #{bidCode},team_leader_phone = #{teamLeaderPhone},
+ id_number = #{idNumber},status = #{status} WHERE team_id = #{teamId}