工人管理相关

naqwzsjtj/naqwzsjtj/src/api/repair.js

@@ -9,7 +9,7 @@ export default {
     return request.get('worker/queryByPage',data)
   },
   add(data){
-    return request.get('worker/add',data)
+    return request.post('worker/add',data)
   },
   canteenPage(data) {
     return request.get('canteen/page', data)

naqwzsjtj/naqwzsjtj/src/views/repair/RepairWorker.vue

@@ -23,10 +23,10 @@
           {{ (sorts.page - 1) * sorts.limit + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column prop="canteenName" label="姓名" :show-overflow-tooltip="true" min-width="160" />
-      <el-table-column prop="founder" :show-overflow-tooltip="true" label="负责区域" />
-      <el-table-column prop="principal" :show-overflow-tooltip="true" label="联系电话" />
-      <el-table-column prop="complaintPhone" :show-overflow-tooltip="true" label="当前状态" />
+      <el-table-column prop="name" label="姓名" :show-overflow-tooltip="true" min-width="160" />
+      <el-table-column prop="region" :show-overflow-tooltip="true" label="负责区域" />
+      <el-table-column prop="phoneNum" :show-overflow-tooltip="true" label="联系电话" />
+      <el-table-column prop="status" :show-overflow-tooltip="true" label="当前状态" :formatter = "statusFormat" />
       <el-table-column prop="createTime" :show-overflow-tooltip="true" label="创建时间" width="160" />
       <el-table-column prop="updateTime" :show-overflow-tooltip="true" label="更新时间" width="160" />
       <el-table-column label="操作" width="140">
@@ -142,6 +142,13 @@
        * 检索当前手机号是否存在微信用户
        */
       hasWxUser(){
+        if (
+          !this.postManagement.phoneNum ||
+          this.postManagement.phoneNum.length < 1
+        ) {
+          this.$message.error("请输入工人联系电话！");
+          return;
+        }
         let params = {
           phoneNum: this.postManagement.phoneNum
         };
@@ -150,9 +157,26 @@
             params
           },
         ).then(res => {
-          this.add = res.data
+          if (res.data){
+            this.add = res.data
+            this.$message.success('检索成功！用户存在。');
+          }else {
+            this.$message.error("检索失败，请使用该手机号登录微信小程序后重试！")
+          }
+
         });
       },
+      statusFormat(data){
+        console.log(data.status);
+        switch (data.status){
+          case 0:
+            return "在职"
+          case 1:
+            return "请假"
+          case -1:
+            return "离职"
+        }
+      },
 
       // 列表排序
       compare(property) {
@@ -195,40 +219,43 @@
         if (
           !this.postManagement.phoneNum ||
           this.postManagement.phoneNum.length < 1
+
         ) {
           this.$message.error("请输入工人联系电话！");
           return;
         }
         if (
-          !this.isMobile(this.postManagement.region) &&
-          !this.isTel(this.postManagement.region)
+          !this.postManagement.region ||
+          this.postManagement.region< 1
         ) {
           this.$message.error("请输入地区！");
           return;
         }
 
-
+        let params = new FormData()
+        params.append("name",this.postManagement.name)
+        params.append("phoneNum",this.postManagement.phoneNum)
+        params.append("region",this.postManagement.region)
         if (this.workTitle == "编辑工人") {
           params.append("id", this.postManagement.id);
-          api
-            .updateCanteen(params)
-            .then((r) => {
-              if (r.data.result) {
-                this.$message.success("编辑成功");
-                this.getData();
-                this.workDialog = false;
-              } else {
-                this.$message.error(r.data.msg);
-              }
-            })
-            .catch(() => {
-              // this.$message.error(r.data.msg);
-            });
+          // api
+          //   .updateCanteen(params)
+          //   .then((r) => {
+          //     if (r.data.result) {
+          //       this.$message.success("编辑成功");
+          //       this.getData();
+          //       this.workDialog = false;
+          //     } else {
+          //       this.$message.error(r.data.msg);
+          //     }
+          //   })
+          //   .catch(() => {
+          //     // this.$message.error(r.data.msg);
+          //   });
         } else {
           // 新增食堂
-          params.append("founder", sessionStorage.getItem("pid"));
-          api
-            .addCanteen(params)
+          Repair
+            .add(params)
             .then((r) => {
               if (r.data.result) {
                 this.$message.success("新增成功");
@@ -255,6 +282,27 @@
         this.sorts.page = currentPage;
         this.getData();
       },
+      isMobile(value) {
+        if (!value || value === "") {
+          return false;
+        }
+        const mobileReg =
+          /^(([1][3,4,5,7,8]\d{9})|([0]\d{10,11})|(\d{7,8})|(\d{4}|\d{3})-(\d{7,8}))$/;
+        if (!mobileReg.test(value)) {
+          return false;
+        }
+        return true;
+      },
+      isTel(value) {
+        if (!value || value === "") {
+          return false;
+        }
+        const phoneReg = /^\d{3}-\d{8}|\d{4}-\d{7}$/;
+        if (!phoneReg.test(value)) {
+          return false;
+        }
+        return true;
+      },
       //删除
       handleDelete(id, index) {
         this.$confirm("您确定要删除该数据吗?", "提示", {
@@ -292,7 +340,7 @@
       // 获取列表数据
       getData() {
         let params = {
-            page:this.sorts.page,
+            page:this.sorts.page-1,
             size:this.sorts.limit
         }
         Repair
@@ -301,6 +349,8 @@
           })
           .then((r) => {
             console.log(r);
+            this.total = r.data.totalElements
+            this.tableData = r.data.content
           });
       },
       // 搜索

nngkxxdp/src/main/java/com/example/nngkxxdp/program/controller/SWorkerController.java

@@ -1,16 +1,22 @@
 package com.example.nngkxxdp.program.controller;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.example.nngkxxdp.program.entity.SWorker;
 import com.example.nngkxxdp.program.entity.vo.WorkerPageVo;
 import com.example.nngkxxdp.program.service.SWorkerService;
+import com.example.nngkxxdp.util.ConstStr;
+import com.example.nngkxxdp.util.SendUtil;
 import lombok.AllArgsConstructor;
 import org.jsoup.internal.StringUtil;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 /**
  * (SWorker)表控制层
  *
@@ -28,7 +34,7 @@ public class SWorkerController {
     private final SWorkerService sWorkerService;
 
 
-    @GetMapping("/hasWxUser/?{phoneNum}")
+    @GetMapping("/hasWxUser")
     public ResponseEntity<Boolean> hasWxUser(String phoneNum){
         if (StringUtil.isBlank(phoneNum)){
             return ResponseEntity.ok(false);
@@ -65,8 +71,14 @@ public class SWorkerController {
      * @return 新增结果
      */
     @PostMapping("add")
-    public ResponseEntity<SWorker> add(SWorker sWorker) {
-        return ResponseEntity.ok(this.sWorkerService.insert(sWorker));
+    public Map<String,Object> add(SWorker sWorker) {
+        if (StrUtil.hasEmpty(sWorker.getName(),sWorker.getPhoneNum(),sWorker.getRegion())){
+            return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS);
+        }
+        if (!this.sWorkerService.findUser(sWorker.getPhoneNum())){
+            return SendUtil.send(false, ConstStr.NOT_ONE_USER);
+        }
+        return SendUtil.send(true,this.sWorkerService.insert(sWorker));
     }
 
     /**

nngkxxdp/src/main/java/com/example/nngkxxdp/program/dao/SWorkerDao.java

@@ -82,5 +82,6 @@ public interface SWorkerDao {
      */
     int deleteById(String id);
 
+    Integer findUser(String phoneNum);
 }
 

nngkxxdp/src/main/java/com/example/nngkxxdp/program/entity/SWorker.java

@@ -1,5 +1,7 @@
 package com.example.nngkxxdp.program.entity;
 
+import lombok.Data;
+
 import java.util.Date;
 import java.io.Serializable;
 
@@ -9,6 +11,7 @@ import java.io.Serializable;
  * @author elis
  * @since 2023-03-20 14:38:05
  */
+@Data
 public class SWorker implements Serializable {
     private static final long serialVersionUID = -16798472349266278L;
     
@@ -24,7 +27,7 @@ public class SWorker implements Serializable {
     /**
      * 联系电话
      */
-    private Integer phoneNum;
+    private String phoneNum;
     /**
      * 状态（在职 0，请假 1，离职 -1）
      */
@@ -43,69 +46,7 @@ public class SWorker implements Serializable {
     private Integer isDel;
 
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getRegion() {
-        return region;
-    }
-
-    public void setRegion(String region) {
-        this.region = region;
-    }
-
-    public Integer getPhoneNum() {
-        return phoneNum;
-    }
-
-    public void setPhoneNum(Integer phoneNum) {
-        this.phoneNum = phoneNum;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getIsDel() {
-        return isDel;
-    }
 
-    public void setIsDel(Integer isDel) {
-        this.isDel = isDel;
-    }
 
 }
 

nngkxxdp/src/main/java/com/example/nngkxxdp/program/service/Impl/SWorkerServiceImpl.java

@@ -102,5 +102,14 @@ public class SWorkerServiceImpl implements SWorkerService {
         return  count>0;
     }
 
+    @Override
+    public boolean findUser(String phoneNum) {
+        Integer user = sWorkerDao.findUser(phoneNum);
+        if (user>0){
+            return true;
+        }
+        return false;
+    }
+
 
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/program/service/SWorkerService.java

@@ -62,4 +62,5 @@ public interface SWorkerService {
 
     boolean hasWxUser(String phoneNum);
 
+    boolean findUser(String phoneNum);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/util/ConstStr.java

@@ -27,6 +27,8 @@ public class ConstStr {
 
     public static final String RESULT_FAILED = "FAILED";
 
+    public static final String NOT_ONE_USER = "手机号重复";
+
     /**
      * 已存在
      */

nngkxxdp/src/main/resources/mapper/SWorkerDao.xml

@@ -6,7 +6,7 @@
         <result property="id" column="id" jdbcType="VARCHAR"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="region" column="region" jdbcType="VARCHAR"/>
-        <result property="phoneNum" column="phone_num" jdbcType="INTEGER"/>
+        <result property="phoneNum" column="phone_num" jdbcType="VARCHAR"/>
         <result property="status" column="status" jdbcType="INTEGER"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
@@ -33,7 +33,7 @@
             <if test="sWorker.region != null and sWorker.region != ''">
                 and region = #{sWorker.region}
             </if>
-            <if test="sWorker.phoneNum != null">
+            <if test="sWorker.phoneNum != null and sWorker.phoneNum != ''">
                 and phone_num = #{sWorker.phoneNum}
             </if>
             <if test="sWorker.status != null">
@@ -41,8 +41,8 @@
             </if>
             and is_del = 0
         </where>
-        limit #{pageable.offset}, #{pageable.pageSize}
-        ORDER BY is_del ,create_time desc
+        ORDER BY is_del ASC ,create_time desc
+        LIMIT #{pageable.offset}, #{pageable.pageSize}
     </select>
 
     <!--统计总行数-->
@@ -68,8 +68,8 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into s_worker(name, region, phone_num, status, create_time, update_time, is_del)
-        values (#{name}, #{region}, #{phoneNum}, #{status}, Now(), Now(), 0)
+        insert into s_worker(id,name, region, phone_num, status, create_time, update_time, is_del)
+        values (#{id},#{name}, #{region}, #{phoneNum}, #{status}, Now(), Now(), 0)
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
@@ -129,6 +129,9 @@
     <delete id="deleteById">
         delete from s_worker where id = #{id}
     </delete>
+    <select id="findUser" resultType="int">
+        select count(*) from s_worker where phone_num = #{phoneNum}
+    </select>
 
 </mapper>