web-工作任务[驿站站长]数据范围调整

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobUserServiceImpl.java

@@ -18,8 +18,6 @@ import org.springframework.stereotype.Service;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Service("JobUserService")
@@ -566,17 +564,14 @@ public class JobUserServiceImpl implements JobUserService {
 
     //验证手机号是否合法
     private boolean userMobileIsValid(String mobile) {
-        // 中国手机号码长度为11位，且符合以下格式：13x, 14x, 15x, 17x, 18x
-//        String mobile_Regex = "^(13[0-9]|14[57]|15[0-35-9]|17[0-9]|18[0-9])\\d{8}$";
-        String mobile_Regex = "0?(13|14|15|16|18|17|19)[0-9]{9}";
+        //String mobile_Regex = "0?(13|14|15|16|18|17|19)[0-9]{9}";
+        String mobile_Regex = "^1[3|4|5|6|7|8|9]\\d{9}$";
         return mobile.matches(mobile_Regex);
     }
 
     private boolean userEmailIsValid(String email){
-        String email_Regex =  "^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)*@[A-Za-z0-9]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
-        Pattern pattern = Pattern.compile(email_Regex);
-        Matcher matcher = pattern.matcher(email);
-        return matcher.matches();
+        String email_Regex = "^[a-z0-9]+([._\\\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$";
+        return email.matches(email_Regex);
     }
 
     @Override

src/main/java/com/hz/employmentsite/services/impl/taskAndLog/DoTaskImpl.java

@@ -129,6 +129,12 @@ public class DoTaskImpl implements DoTaskService {
         PcDotaskUserExample.Criteria cro = exp.createCriteria();
         cro.andDotaskIDEqualTo(data.getDoTaskID());
         PcDotaskUser taskUser = doTaskUserMapper.selectByExample(exp).stream().findFirst().orElse(null);
+        PcSiteUserExample siteUserExp = new PcSiteUserExample();
+        siteUserExp.or().andUserIDEqualTo(userId);
+        var curSiteInfo = pcSiteUserMapper.selectByExample(siteUserExp).stream().findFirst().orElse(null);
+        if( curSiteInfo != null){
+            data.setSiteID(curSiteInfo.getSiteID());
+        }
         if (dbData == null) {
             dbData = new PcDotask();
             dbData.setDotaskID(data.getDoTaskID());

src/main/java/com/hz/employmentsite/vo/taskAndLog/DoTaskVo.java

@@ -2,6 +2,7 @@ package com.hz.employmentsite.vo.taskAndLog;
 
 import com.hz.employmentsite.util.datarange.annotations.DoTaskID;
 import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.SiteID;
 import com.hz.employmentsite.util.datarange.annotations.UserID;
 import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import lombok.Data;
@@ -41,6 +42,7 @@ public class DoTaskVo {
 
     public String streetCode;
 
+    @SiteID
     public String siteID;
 
     public List<SiteUserVo> doTaskUser;

src/main/resources/mapping/cquery/DoTaskCQuery.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.hz.employmentsite.mapper.cquery.DoTaskCQuery">
     <select id="getList" resultType="com.hz.employmentsite.vo.taskAndLog.DoTaskVo">
-        select task.dotaskID,task.workTypeID,task.content,task.dotaskName,task.CreateUserID as createUserID, u.`Name` as
+        select task.dotaskID,task.workTypeID,task.siteID,task.content,task.dotaskName,task.CreateUserID as createUserID, u.`Name` as
         createName,task.finishTime,task.createTime,task.modifyTime,
         task.taskStatus,dic_taskStatus.Name as taskStatusName,
         (select count(*) from pc_dotask_user du where du.DotaskID = task.DotaskID group by task.DotaskID)as userCount,

vue/src/views/jobUserManager/jobuser/edit.vue

@@ -652,7 +652,7 @@ export default defineComponent(
 
       const inputDataValidate = () =>{
         isAllowCommit.value = true;
-        const identReg = /^^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9Xx])$/;
+        const identReg = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9Xx])$/;
         if(!formState.dataModel.identityNumber.match(identReg)){
           message.error("输入的身份证号码有误!");
           isAllowCommit.value = false;