diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/TeamGroupBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/TeamGroupBean.java index 29bf39d..cdc3863 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/TeamGroupBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/TeamGroupBean.java @@ -42,6 +42,7 @@ public class TeamGroupBean { private String createTime; private String level; private String tableSource; + // 审核状态 0草稿 1事业部负责人审核中 2专责审核中 3汇总审核中 4已通过 5已驳回 private Integer auditStatus; private String auditStatusName; private Integer personNum; @@ -59,6 +60,7 @@ public class TeamGroupBean { private Integer teamId; private Integer userId; + // 组员信息 private List teamPersons; diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java index 17e7e2e..bb51bb2 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java @@ -319,7 +319,7 @@ public class OrganizationalController extends BaseController { } /** - * 班组注册 + * 班组注册新增或暂存 * * @param * @return @@ -328,13 +328,15 @@ public class OrganizationalController extends BaseController { @ResponseBody public AjaxRes registerTeamGroup(@RequestBody TeamGroupBean bean) { AjaxRes ar = getAjaxRes(); - if (!UserUtil.isPhone(bean.getPhone())) { - ar.setFailMsg("班长手机号格式错误"); - return ar; - } - if (!UserUtil.isIdCard(bean.getIdCard())) { - ar.setFailMsg("班长身份证号格式错误"); - return ar; + if (bean.getAuditStatus() != 0) { + if (!UserUtil.isPhone(bean.getPhone())) { + ar.setFailMsg("班长手机号格式错误"); + return ar; + } + if (!UserUtil.isIdCard(bean.getIdCard())) { + ar.setFailMsg("班长身份证号格式错误"); + return ar; + } } ar = service.registerTeamGroup(bean); return ar; @@ -342,6 +344,7 @@ public class OrganizationalController extends BaseController { /** * 班组注册-编辑查看 + * * @return */ @RequestMapping(value = "getRegisterTeamGroup", method = RequestMethod.GET) @@ -363,13 +366,15 @@ public class OrganizationalController extends BaseController { @ResponseBody public AjaxRes updateRegisterTeamGroup(@RequestBody TeamGroupBean bean) { AjaxRes ar = getAjaxRes(); - if (!UserUtil.isPhone(bean.getPhone())) { - ar.setFailMsg("班长手机号格式错误"); - return ar; - } - if (!UserUtil.isIdCard(bean.getIdCard())) { - ar.setFailMsg("班长身份证号格式错误"); - return ar; + if (bean.getAuditStatus() != 0) { + if (!UserUtil.isPhone(bean.getPhone())) { + ar.setFailMsg("班长手机号格式错误"); + return ar; + } + if (!UserUtil.isIdCard(bean.getIdCard())) { + ar.setFailMsg("班长身份证号格式错误"); + return ar; + } } ar = service.updateRegisterTeamGroup(bean); return ar; diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java index 3eef907..93aa2ec 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java @@ -414,19 +414,22 @@ public class OrganizationalServiceImpl implements OrganizationalService { AjaxRes ar = new AjaxRes(); try { OrganizationalBean o = new OrganizationalBean(); - o.setIdCard(bean.getIdCard()); - o.setUserPhone(bean.getPhone()); - if (mapper.getUser(o) > 0) { - ar.setFailMsg("该班长已在其他班组中"); - return ar; - } - for (teamGroupPersonBean teamPersonBean : bean.getTeamPersons()) { - o.setIdCard(teamPersonBean.getIdCard()); - o.setUserPhone(teamPersonBean.getPhone()); + // 暂存时无需校验 + if (bean.getAuditStatus() != 0) { + o.setIdCard(bean.getIdCard()); + o.setUserPhone(bean.getPhone()); if (mapper.getUser(o) > 0) { - ar.setFailMsg("组员" + teamPersonBean.getName() + "已在其他班组中"); + ar.setFailMsg("该班长已在其他班组中"); return ar; } + for (teamGroupPersonBean teamPersonBean : bean.getTeamPersons()) { + o.setIdCard(teamPersonBean.getIdCard()); + o.setUserPhone(teamPersonBean.getPhone()); + if (mapper.getUser(o) > 0) { + ar.setFailMsg("组员" + teamPersonBean.getName() + "已在其他班组中"); + return ar; + } + } } int num; @@ -461,24 +464,26 @@ public class OrganizationalServiceImpl implements OrganizationalService { AjaxRes ar = new AjaxRes(); try { OrganizationalBean o = new OrganizationalBean(); - o.setId(bean.getId()); - if (StringUtils.isNotBlank(bean.getIdCard()) || StringUtils.isNotBlank(bean.getPhone())) { - o.setIdCard(bean.getIdCard()); - o.setUserPhone(bean.getPhone()); - if (mapper.getUserById(o) > 0) { - ar.setFailMsg("该班长已在其他班组中"); - return ar; - } - } - for (teamGroupPersonBean teamPersonBean : bean.getTeamPersons()) { - if (StringUtils.isNotBlank(teamPersonBean.getIdCard()) || StringUtils.isNotBlank(teamPersonBean.getPhone())) { - o.setIdCard(teamPersonBean.getIdCard()); - o.setUserPhone(teamPersonBean.getPhone()); + if (bean.getAuditStatus() != 0) { + o.setId(bean.getId()); + if (StringUtils.isNotBlank(bean.getIdCard()) || StringUtils.isNotBlank(bean.getPhone())) { + o.setIdCard(bean.getIdCard()); + o.setUserPhone(bean.getPhone()); if (mapper.getUserById(o) > 0) { - ar.setFailMsg("组员" + teamPersonBean.getName() + "已在其他班组中"); + ar.setFailMsg("该班长已在其他班组中"); return ar; } } + for (teamGroupPersonBean teamPersonBean : bean.getTeamPersons()) { + if (StringUtils.isNotBlank(teamPersonBean.getIdCard()) || StringUtils.isNotBlank(teamPersonBean.getPhone())) { + o.setIdCard(teamPersonBean.getIdCard()); + o.setUserPhone(teamPersonBean.getPhone()); + if (mapper.getUserById(o) > 0) { + ar.setFailMsg("组员" + teamPersonBean.getName() + "已在其他班组中"); + return ar; + } + } + } } int num; diff --git a/src/main/resources/static/js/evaluate/teamGroup/registerEdit.js b/src/main/resources/static/js/evaluate/teamGroup/registerEdit.js index a470c2e..683fac5 100644 --- a/src/main/resources/static/js/evaluate/teamGroup/registerEdit.js +++ b/src/main/resources/static/js/evaluate/teamGroup/registerEdit.js @@ -33,7 +33,18 @@ function setParams(id,index){ form = layui.form; upload = layui.upload; table = layui.table; - + form.verify({ + idCard: function (value, item) { + if (!checkPsidno(value)) { + return '请输入正确的身份证号'; + } + }, + phone: function (value, item) { + if (!phone_reg(value)) { + return '请输入正确的手机号'; + } + }, + }) //查询数据 $.ajax({ @@ -523,7 +534,7 @@ function setParams(id,index){
-
@@ -536,7 +547,7 @@ function setParams(id,index){
-
diff --git a/src/main/resources/static/js/evaluate/teamGroup/registerForm.js b/src/main/resources/static/js/evaluate/teamGroup/registerForm.js index 2b3624a..ae767e3 100644 --- a/src/main/resources/static/js/evaluate/teamGroup/registerForm.js +++ b/src/main/resources/static/js/evaluate/teamGroup/registerForm.js @@ -32,6 +32,18 @@ layui.use(["table", "form", "upload", "tree"], function () { form = layui.form; upload = layui.upload; table = layui.table; + form.verify({ + idCard: function (value, item) { + if (!checkPsidno(value)) { + return '请输入正确的身份证号'; + } + }, + phone: function (value, item) { + if (!phone_reg(value)) { + return '请输入正确的手机号'; + } + }, + }) // 使用 layui 的 form.on 监听下拉框变化 form.on("select(subContractor)", function (obj) { const subContractorId = obj.value; // 获取选中的值 @@ -438,7 +450,7 @@ layui.use(["table", "form", "upload", "tree"], function () {
-
@@ -451,7 +463,7 @@ layui.use(["table", "form", "upload", "tree"], function () {
-
diff --git a/src/main/resources/static/pages/evaluate/teamGroup/registerEdit.html b/src/main/resources/static/pages/evaluate/teamGroup/registerEdit.html index 51e4638..792f146 100644 --- a/src/main/resources/static/pages/evaluate/teamGroup/registerEdit.html +++ b/src/main/resources/static/pages/evaluate/teamGroup/registerEdit.html @@ -172,7 +172,7 @@
-
@@ -184,7 +184,7 @@
-
@@ -257,10 +257,11 @@ + - \ No newline at end of file + diff --git a/src/main/resources/static/pages/evaluate/teamGroup/registerForm.html b/src/main/resources/static/pages/evaluate/teamGroup/registerForm.html index c6dc04d..b6ee75a 100644 --- a/src/main/resources/static/pages/evaluate/teamGroup/registerForm.html +++ b/src/main/resources/static/pages/evaluate/teamGroup/registerForm.html @@ -171,7 +171,7 @@
-
@@ -183,7 +183,7 @@
-
@@ -257,6 +257,7 @@ +