From f265bcbdd63eaa624f36afaf5b4e4cc03c8b4123 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 18 Apr 2024 09:48:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E3=80=81=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=AD=A3=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/securitycontrol/common/core/constant/Constant.java | 2 +- .../securitycontrol/entity/background/vo/HumanManageVo.java | 3 +++ .../securitycontrol/entity/background/vo/TeamManageVo.java | 3 +++ .../src/main/resources/mapper/SignProMapper.xml | 5 +++-- .../src/main/resources/mapper/TeamManageMapper.xml | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java index 63ad4b8..b74517b 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java @@ -40,7 +40,7 @@ public class Constant { public final static String XL = "线路"; public final static String BD = "变电"; - public final static String JX = "架线"; + public final static String JX = "503"; public final static String SG_SCREEN = "2"; public final static String SG_SCREEN_NAME = "施工大屏"; diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/HumanManageVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/HumanManageVo.java index 162cf01..7a8be73 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/HumanManageVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/HumanManageVo.java @@ -6,6 +6,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; import java.util.List; /** @@ -30,11 +31,13 @@ public class HumanManageVo { @ApiModelProperty(value = "身份证号码") @NotBlank(message = "身份证号码不能为空", groups = {Query.class}) @Length(max = 100, message = "身份证号码字符长度不能超过100", groups = {Query.class}) + @Pattern(regexp = "[1-9]\\d{5}(19|20)\\d{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2]\\d|3[0-1])|(04|06|09|11)(0[1-9]|[1-2]\\d|30)|02(0[1-9]|[1-2]\\d))\\d{3}[\\dXx]",message = "身份证号码格式不正确",groups = {Query.class}) private String idNumber; @ApiModelProperty(value = "手机号码") @NotBlank(message = "手机号码不能为空", groups = {Query.class}) @Length(max = 20, message = "手机号码字符长度不能超过100", groups = {Query.class}) + @Pattern(regexp = "(0|86|17951)?(13[0-9]|19[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}",message = "手机号格式不正确",groups = {Query.class}) private String phone; @ApiModelProperty(value = "工种") diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/TeamManageVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/TeamManageVo.java index 0519485..dc4117d 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/TeamManageVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/TeamManageVo.java @@ -6,6 +6,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; /** * @author 10488 @@ -30,11 +31,13 @@ public class TeamManageVo { @ApiModelProperty(value = "身份证编号") @NotBlank(message = "身份证号码不能为空", groups = {Query.class}) @Length(max = 30, message = "身份证号码字符长度不能超过30", groups = {Query.class}) + @Pattern(regexp = "[1-9]\\d{5}(19|20)\\d{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2]\\d|3[0-1])|(04|06|09|11)(0[1-9]|[1-2]\\d|30)|02(0[1-9]|[1-2]\\d))\\d{3}[\\dXx]",message = "身份证号码格式不正确",groups = {Query.class}) private String idNumber; @ApiModelProperty(value = "手机号码") @NotBlank(message = "手机号码不能为空", groups = {Query.class}) @Length(max = 20, message = "手机号码字符长度不能超过20", groups = {Query.class}) + @Pattern(regexp = "(0|86|17951)?(13[0-9]|19[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}",message = "手机号格式不正确",groups = {Query.class}) private String teamLeaderPhone; @ApiModelProperty(value = "班组状态") 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 a20feda..dd77896 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SignProMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SignProMapper.xml @@ -152,7 +152,7 @@ tjp.start_time AS startTime, tjp.end_time AS endTime, tjp.tc_time AS tcTime, - tjp.vlotage + sd.dict_name AS vlotage FROM tb_jj_project tjp LEFT JOIN sys_build sb ON tjp.org_id = sb.org_id LEFT JOIN sys_dict sd on tjp.vlotage = sd.dict_code AND sd.del_flag = 0 @@ -203,7 +203,7 @@ tjp.pro_name AS projectName, tsp.project_no AS proNo, tsp.single_desc AS singleDesc, - tsp.vol_level AS volLevel, + sd.dict_name AS volLevel, tsp.line_length AS lineLength, tsp.subs_cap AS subsCap, CASE tsp.pro_type WHEN '1' THEN '变电' WHEN '2' THEN '线路' END AS proType, @@ -217,6 +217,7 @@ FROM tb_sign_project tsp LEFT JOIN sys_build sb ON tsp.org_id = sb.org_id LEFT JOIN tb_jj_project tjp ON tsp.project_no = tjp.pro_no AND tjp.del_flag = 0 + LEFT JOIN sys_dict sd on tsp.vol_level = sd.dict_code AND sd.del_flag = 0 WHERE tsp.del_flag = 0 AND ( 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 d6ec43b..074a8ff 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamManageMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamManageMapper.xml @@ -65,7 +65,7 @@ twt.team_leader_phone as teamleaderphone, tp.pro_name AS proName, twt.team_num as teamNum, - twt.status, + CASE twt.status WHEN '1' THEN '施工' WHEN '2' THEN '暂停' WHEN '3' THEN '完工' ELSE '完工' END AS status, twt.bid_code AS bidCode FROM tb_work_team twt LEFT JOIN tb_project tp on twt.bid_code = tp.bid_code