修改员工属性

db/module.sql

@@ -202,7 +202,7 @@ CREATE TABLE mortals_xhx_staff(
     `gender` tinyint(2)    DEFAULT '1'  COMMENT '性别(1.男,2.女)',
     `birthday` datetime      COMMENT '出生日期',
     `photoPath` varchar(255)      COMMENT '照片',
-    `Email` varchar(128)      COMMENT '邮件地址',
+    `email` varchar(128)      COMMENT '邮件地址',
     `phoneNumber` varchar(128) NOT NULL     COMMENT '联系电话',
     `idCard` varchar(128)      COMMENT '身份证号码',
     `workNum` varchar(128)      COMMENT '工号',

enterprise-manager-ui/admin/src/views/staff/drawershow.vue

@@ -13,7 +13,7 @@
               <Field :span="20" label="职位" prop="positionId" v-model="form.positionId" type="select" :enum-data="dict.positionId" placeholder="请输入职位ID"/>
               <Field :span="20" label="联系电话" prop="phoneNumber" v-model="form.phoneNumber" placeholder="请输入联系电话"/>
               <Field :span="20" label="头像" prop="photoPath"  placeholder="请输入照片"><imageUpload v-model="form.photoPath" prePath="/file/preview"/> </Field>
-              <Field :span="20" label="邮件地址" prop="Email" v-model="form.Email" placeholder="请输入邮件地址"/>
+              <Field :span="20" label="邮件地址" prop="email" v-model="form.email" placeholder="请输入邮件地址"/>
 
                             <Field :span="20" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
 
@@ -37,7 +37,33 @@
             this.changePath("staff")
         },
         data() {
+          var checkEmail = (rule, value, callback) => {
+            let mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/;
+            if (!value) {	//如果输入为空直接返回
+              callback();
+            } else {
+              //如果字符串 string 中含有与 RegExpObject 匹配的文本，则返回 true，否则返回 false。
+              if (mailReg.test(value)) {	//匹配成功返回
+                callback();
+              } else {	//匹配不成功返回错误显示
+                callback(new Error("邮箱格式:xx@xx.xx，只含数字、大小写字母、下划线、横杠"));
+              }
+            }
+          };
+          var checkPhone = (rule,value,callback) =>{
+            let phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
+            if(!value){
+              callback()
+            }else{
+              if(phoneReg.test(value)){
+                callback()
+              }else{
+                callback(new Error("电话格式:13、14、15、17、18开头+9位阿拉伯数字"))
+              }
+            }
+          }
             return {
+
                 // 遮罩层
                 loading: true,
                 // 弹出层标题
@@ -66,16 +92,20 @@
                         {required: true,message: "请输入员工姓名", trigger: "blur" },
                         {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
                     ],
-                    phoneNumber: [
-                        {required: true,message: "请输入联系电话", trigger: "blur" },
-                        {max: 128,message: "最多只能录入128个字符",trigger: "blur",},
+                  positionId: [
+                    {required: true,message: "请选择职位", trigger: "blur" }
                   ],
                   companyIds: [
-                        {required: true,message: "请输入所属公司", trigger: "blur" },
-                        {max: 128,message: "最多只能录入128个字符",trigger: "blur",},
+                    {required: true,message: "请选择所属企业", trigger: "blur" }
+                  ],
+                    phoneNumber: [
+                        {required: true,message: "请输入联系电话", trigger: "blur" },
+                        { validator: checkPhone,trigger: "blur" },
+                        {max: 11,message: "最多只能录入11个字符",trigger: "blur",},
                     ],
-                    createTime: [
-                        {required: true,message: "请选择创建时间" },
+                  email: [
+
+                    { validator: checkEmail,trigger: "blur" }
                   ],
                 }
             };

enterprise-manager-ui/admin/src/views/staff/list.vue

@@ -76,12 +76,12 @@
 
                       {label: "联系电话", prop: "phoneNumber"},
 
-                      {label: "邮件地址", prop: "Email"},
+                      {label: "邮件地址", prop: "email"},
 
-                        {label: "所属公司", prop: "companyId",formatter: this.formatters},
+                        {label: "所属公司", prop: "companyIds",formatter: this.formatters},
 
 
-                        {label: "职位", prop: "positionName"},
+                        {label: "职位", prop: "positionId",formatter:this.formatter},
                         {label: "发送名片次数", prop: "sendBusinessCardTimes"},
                         {label: "累计查看次数", prop: "sumViews"},
 

enterprise-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java

@@ -11,11 +11,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.staff.model.vo.StaffVo;
 import lombok.Data;
 /**
-* 员工基本信息实体对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 员工基本信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-09-28
+ */
 @Data
 public class StaffEntity extends StaffVo {
     private static final long serialVersionUID = 1L;
@@ -37,10 +37,6 @@ public class StaffEntity extends StaffVo {
      */
     private String photoPath;
     /**
-    * 邮件地址
-    */
-    private String Email;
-    /**
      * 联系电话
      */
     private String phoneNumber;
@@ -112,6 +108,10 @@ public class StaffEntity extends StaffVo {
      * 发送名片次数
      */
     private Integer sendBusinessCardTimes;
+    /**
+     * 邮件地址
+     */
+    private String email;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -133,7 +133,6 @@ public class StaffEntity extends StaffVo {
         this.gender = 1;
         this.birthday = new Date();
         this.photoPath = "";
-            this.Email = "";
         this.phoneNumber = "";
         this.idCard = "";
         this.workNum = "";
@@ -152,5 +151,6 @@ public class StaffEntity extends StaffVo {
         this.sumViews = 0;
         this.viewsByDay = 0;
         this.sendBusinessCardTimes = 0;
+        this.email = "";
     }
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffQuery.java

@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 /**
-* 员工基本信息查询对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 员工基本信息查询对象
+ *
+ * @author zxfei
+ * @date 2023-09-28
+ */
 public class StaffQuery extends StaffEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -56,11 +56,6 @@ public class StaffQuery extends StaffEntity {
 
     /** 照片排除列表 */
     private List <String> photoPathNotList;
-    /** 邮件地址 */
-    private List<String> EmailList;
-
-    /** 邮件地址排除列表 */
-    private List <String> EmailNotList;
     /** 联系电话 */
     private List<String> phoneNumberList;
 
@@ -266,6 +261,11 @@ public class StaffQuery extends StaffEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 邮件地址 */
+    private List<String> emailList;
+
+    /** 邮件地址排除列表 */
+    private List <String> emailNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<StaffQuery> orConditionList;
 
@@ -532,38 +532,6 @@ public class StaffQuery extends StaffEntity {
         this.photoPathNotList = photoPathNotList;
     }
 
-    /**
-    * 获取 邮件地址
-    * @return EmailList
-    */
-    public List<String> getEmailList(){
-        return this.EmailList;
-    }
-
-    /**
-    * 设置 邮件地址
-    * @param EmailList
-    */
-    public void setEmailList(List<String> EmailList){
-        this.EmailList = EmailList;
-    }
-
-    /**
-    * 获取 邮件地址
-    * @return EmailNotList
-    */
-    public List<String> getEmailNotList(){
-        return this.EmailNotList;
-    }
-
-    /**
-    * 设置 邮件地址
-    * @param EmailNotList
-    */
-    public void setEmailNotList(List<String> EmailNotList){
-        this.EmailNotList = EmailNotList;
-    }
-
     /**
      * 获取 联系电话
      * @return phoneNumberList
@@ -1709,6 +1677,38 @@ public class StaffQuery extends StaffEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 邮件地址
+     * @return emailList
+     */
+    public List<String> getEmailList(){
+        return this.emailList;
+    }
+
+    /**
+     * 设置 邮件地址
+     * @param emailList
+     */
+    public void setEmailList(List<String> emailList){
+        this.emailList = emailList;
+    }
+
+    /**
+     * 获取 邮件地址
+     * @return emailNotList
+     */
+    public List<String> getEmailNotList(){
+        return this.emailNotList;
+    }
+
+    /**
+     * 设置 邮件地址
+     * @param emailNotList
+     */
+    public void setEmailNotList(List<String> emailNotList){
+        this.emailNotList = emailNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1857,25 +1857,6 @@ public class StaffQuery extends StaffEntity {
     }
 
 
-	/**
-    * 设置 邮件地址
-    * @param Email
-    */
-    public StaffQuery Email(String Email){
-        setEmail(Email);
-		return this;
-    }
-
-    /**
-    * 设置 邮件地址
-    * @param EmailList
-    */
-    public StaffQuery EmailList(List<String> EmailList){
-        this.EmailList = EmailList;
-		return this;
-    }
-
-
     /**
      * 设置 联系电话
      * @param phoneNumber
@@ -2518,6 +2499,25 @@ public class StaffQuery extends StaffEntity {
     }
 
 
+
+    /**
+     * 设置 邮件地址
+     * @param email
+     */
+    public StaffQuery email(String email){
+        setEmail(email);
+        return this;
+    }
+
+    /**
+     * 设置 邮件地址
+     * @param emailList
+     */
+    public StaffQuery emailList(List<String> emailList){
+        this.emailList = emailList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

enterprise-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java

@@ -93,7 +93,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
         }
         if(!ObjectUtils.isEmpty(entity.getPositionId())){
             PositionEntity positionEntity = positionService.get(entity.getPositionId(), getContext());
-            entity.setCompanyName(positionEntity.getPositionName());
+            entity.setPositionName(positionEntity.getPositionName());
         }
     }
 }
\ No newline at end of file