提交

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<teamGroupPersonBean> teamPersons;
 

src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java

@@ -319,7 +319,7 @@ public class OrganizationalController extends BaseController<EvaluateBean> {
     }
 
     /**
-     * 班组注册
+     * 班组注册新增或暂存
      *
      * @param
      * @return
@@ -328,13 +328,15 @@ public class OrganizationalController extends BaseController<EvaluateBean> {
     @ResponseBody
     public AjaxRes registerTeamGroup(@RequestBody TeamGroupBean bean) {
         AjaxRes ar = getAjaxRes();
-        if (!UserUtil.isPhone(bean.getPhone())) {
+        if (bean.getAuditStatus() != 0) {
-            ar.setFailMsg("班长手机号格式错误");
+            if (!UserUtil.isPhone(bean.getPhone())) {
-            return ar;
+                ar.setFailMsg("班长手机号格式错误");
-        }
+                return ar;
-        if (!UserUtil.isIdCard(bean.getIdCard())) {
+            }
-            ar.setFailMsg("班长身份证号格式错误");
+            if (!UserUtil.isIdCard(bean.getIdCard())) {
-            return ar;
+                ar.setFailMsg("班长身份证号格式错误");
+                return ar;
+            }
         }
         ar = service.registerTeamGroup(bean);
         return ar;
@@ -342,6 +344,7 @@ public class OrganizationalController extends BaseController<EvaluateBean> {
 
     /**
      * 班组注册-编辑查看
+     *
      * @return
      */
     @RequestMapping(value = "getRegisterTeamGroup", method = RequestMethod.GET)
@@ -363,13 +366,15 @@ public class OrganizationalController extends BaseController<EvaluateBean> {
     @ResponseBody
     public AjaxRes updateRegisterTeamGroup(@RequestBody TeamGroupBean bean) {
         AjaxRes ar = getAjaxRes();
-        if (!UserUtil.isPhone(bean.getPhone())) {
+        if (bean.getAuditStatus() != 0) {
-            ar.setFailMsg("班长手机号格式错误");
+            if (!UserUtil.isPhone(bean.getPhone())) {
-            return ar;
+                ar.setFailMsg("班长手机号格式错误");
-        }
+                return ar;
-        if (!UserUtil.isIdCard(bean.getIdCard())) {
+            }
-            ar.setFailMsg("班长身份证号格式错误");
+            if (!UserUtil.isIdCard(bean.getIdCard())) {
-            return ar;
+                ar.setFailMsg("班长身份证号格式错误");
+                return ar;
+            }
         }
         ar = service.updateRegisterTeamGroup(bean);
         return ar;

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 (bean.getAuditStatus() != 0) {
-            if (mapper.getUser(o) > 0) {
+                o.setIdCard(bean.getIdCard());
-                ar.setFailMsg("该班长已在其他班组中");
+                o.setUserPhone(bean.getPhone());
-                return ar;
-            }
-            for (teamGroupPersonBean teamPersonBean : bean.getTeamPersons()) {
-                o.setIdCard(teamPersonBean.getIdCard());
-                o.setUserPhone(teamPersonBean.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 (bean.getAuditStatus() != 0) {
-            if (StringUtils.isNotBlank(bean.getIdCard()) || StringUtils.isNotBlank(bean.getPhone())) {
+                o.setId(bean.getId());
-                o.setIdCard(bean.getIdCard());
+                if (StringUtils.isNotBlank(bean.getIdCard()) || StringUtils.isNotBlank(bean.getPhone())) {
-                o.setUserPhone(bean.getPhone());
+                    o.setIdCard(bean.getIdCard());
-                if (mapper.getUserById(o) > 0) {
+                    o.setUserPhone(bean.getPhone());
-                    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() + "已在其他班组中");
+                        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;

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){
                                 <div class="layui-form-item">
                                     <label class="layui-form-label"><span class="required_icon">*</span>联系方式</label>
                                     <div class="layui-input-block">
-                                        <input type="text" required lay-verify="required" id="phone-${index}" name="phone"
+                                        <input type="text" required lay-verify="required|phone" id="phone-${index}" name="phone"
                                             autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
@@ -536,7 +547,7 @@ function setParams(id,index){
                                     <label class="layui-form-label"><span
                                             class="required_icon">*</span>身份证号码</label>
                                     <div class="layui-input-block">
-                                        <input type="text" required lay-verify="required" id="idCard-${index}" name="idCard"
+                                        <input type="text" required lay-verify="required|idCard" id="idCard-${index}" name="idCard"
                                             autocomplete="off" class="layui-input">
                                     </div>
                                 </div>

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 () {
                                 <div class="layui-form-item">
                                     <label class="layui-form-label"><span class="required_icon">*</span>联系方式</label>
                                     <div class="layui-input-block">
-                                        <input type="text" required lay-verify="required" id="phone-${index}" name="phone"
+                                        <input type="text" required lay-verify="required|phone" id="phone-${index}" name="phone"
                                             autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
@@ -451,7 +463,7 @@ layui.use(["table", "form", "upload", "tree"], function () {
                                     <label class="layui-form-label"><span
                                             class="required_icon">*</span>身份证号码</label>
                                     <div class="layui-input-block">
-                                        <input type="text" required lay-verify="required" id="idCard-${index}" name="idCard"
+                                        <input type="text" required lay-verify="required|idCard" id="idCard-${index}" name="idCard"
                                             autocomplete="off" class="layui-input">
                                     </div>
                                 </div>

src/main/resources/static/pages/evaluate/teamGroup/registerEdit.html

@@ -172,7 +172,7 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label"><span class="required_icon">*</span>联系方式</label>
                                 <div class="layui-input-block">
-                                    <input type="text" required lay-verify="required" id="phone" name="phone"
+                                    <input type="text" required lay-verify="required|phone" id="phone" name="phone"
                                         autocomplete="off" class="layui-input">
                                 </div>
                             </div>
@@ -184,7 +184,7 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label"><span class="required_icon">*</span>身份证号</label>
                                 <div class="layui-input-block">
-                                    <input type="text" required lay-verify="required" id="idCard" name="idCard"
+                                    <input type="text" required lay-verify="required|idCard" id="idCard" name="idCard"
                                         autocomplete="off" class="layui-input">
                                 </div>
                             </div>
@@ -257,6 +257,7 @@
 </body>
 <script src="../../../js/publicJs.js"></script>
 <script type="text/javascript" src="../../../js/libs/jquery-2.1.1.min.js"></script>
+<script type="text/javascript" src="../../../js/common_methon.js"></script>
 <script type="text/javascript" src="../../../js/jq.js"></script>
 <script type="text/javascript" src="../../../js/my/permission.js"></script>
 <script src="../../../layui/layui.js"></script>

src/main/resources/static/pages/evaluate/teamGroup/registerForm.html

@@ -171,7 +171,7 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label"><span class="required_icon">*</span>联系方式</label>
                                 <div class="layui-input-block">
-                                    <input type="text" required lay-verify="required" id="phone" name="phone"
+                                    <input type="text" required lay-verify="required|phone" id="phone" name="phone"
                                         autocomplete="off" class="layui-input">
                                 </div>
                             </div>
@@ -183,7 +183,7 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label"><span class="required_icon">*</span>身份证号</label>
                                 <div class="layui-input-block">
-                                    <input type="text" required lay-verify="required" id="idCard" name="idCard"
+                                    <input type="text" required lay-verify="required|idCard" id="idCard" name="idCard"
                                         autocomplete="off" class="layui-input">
                                 </div>
                             </div>
@@ -257,6 +257,7 @@
 <script src="../../../js/publicJs.js"></script>
 <script type="text/javascript" src="../../../js/libs/jquery-2.1.1.min.js"></script>
 <script type="text/javascript" src="../../../js/jq.js"></script>
+<script type="text/javascript" src="../../../js/common_methon.js"></script>
 <script type="text/javascript" src="../../../js/my/permission.js"></script>
 <script src="../../../layui/layui.js"></script>
 <script src="../../../layui/layui_ext/dtree/dtree.js"></script>