人员检验节点绑定

op-modules/op-quality/src/main/java/com/op/quality/controller/QcUserMaterialController.java

@@ -3,6 +3,7 @@ package com.op.quality.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.op.quality.domain.QcMarketFeedback;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -125,4 +126,40 @@ public class QcUserMaterialController extends BaseController {
         List<QcUserMaterial> list = qcUserMaterialService.getRightList(qcUserMaterial);
         return getDataTable(list);
     }
+    /**
+     * 查询人员绑定信息
+     * @param qcUserMaterial
+     * @return
+     */
+    @GetMapping(value = "/getSelectedUsers")
+    public TableDataInfo getSelectedUsers(QcUserMaterial qcUserMaterial) {
+        startPage();
+        List<QcUserMaterial> list = qcUserMaterialService.getSelectedUsers(qcUserMaterial);
+        return  getDataTable(list);
+    }
+
+    /**
+     * 添加人员绑定信息
+     * @param qcUserMaterial
+     * @return
+     */
+    @PostMapping("/addUserBind")
+    public AjaxResult addUserBind(@RequestBody QcUserMaterial qcUserMaterial) {
+        return toAjax(qcUserMaterialService.addUserBind(qcUserMaterial));
+    }
+
+    /**
+     * 删除人员绑定信息
+     * @param qcUserMaterial
+     * @return
+     */
+    @DeleteMapping("/deleteByMaterialCode")
+    public AjaxResult deleteByMaterialCode(@RequestBody QcUserMaterial qcUserMaterial) {
+        int i = qcUserMaterialService.deleteByMaterialCode(qcUserMaterial);
+        return toAjax(i);
+    }
+
+
+
+
 }

op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java

@@ -32,6 +32,7 @@ public class QcUserMaterial extends BaseEntity {
      */
     @Excel(name = "员工名称")
     private String userName;
+    private String deptName;
 
     /**
      * 物料编码
@@ -280,6 +281,14 @@ public class QcUserMaterial extends BaseEntity {
         this.userNames = userNames;
     }
 
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java

@@ -78,4 +78,8 @@ public interface QcUserMaterialMapper {
     public List<QcUserMaterial> getUserMaterialListUndo(QcUserMaterial qcUserMaterial);
 
     public List<QcUserMaterial> getUserMaterialListDo(QcUserMaterial qcUserMaterial);
+
+    public List<QcUserMaterial> getSelectedUsers(QcUserMaterial qcUserMaterial);
+
+    public int deleteByMaterialCode(QcUserMaterial qcUserMaterial);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcUserMaterialService.java

@@ -77,5 +77,12 @@ public interface IQcUserMaterialService {
      */
     public int deleteQcUserMaterialByUserCode(QcUserMaterial qcUserMaterial);
 
+    public int deleteByMaterialCode(QcUserMaterial qcUserMaterial);
+
     public List<QcUserMaterial> getRightList(QcUserMaterial qcUserMaterial);
+
+    public List<QcUserMaterial> getSelectedUsers(QcUserMaterial qcUserMaterial);
+
+    public int addUserBind(QcUserMaterial qcUserMaterial);
+
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java

@@ -150,6 +150,12 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService {
         return qcUserMaterialMapper.deleteQcUserMaterialByUserCode(qcUserMaterial);
     }
 
+    @Override
+    @DS("#header.poolName")
+    public int deleteByMaterialCode(QcUserMaterial qcUserMaterial) {
+        return qcUserMaterialMapper.deleteByMaterialCode(qcUserMaterial);
+    }
+
     @Override
     @DS("#header.poolName")
     public List<QcUserMaterial> getList(QcUserMaterial qcUserMaterial) {
@@ -174,4 +180,44 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService {
         });
         return selected;
     }
+
+    @Override
+    @DS("#header.poolName")
+    public List<QcUserMaterial> getSelectedUsers(QcUserMaterial qcUserMaterial) {
+        return qcUserMaterialMapper.getSelectedUsers(qcUserMaterial);
+    }
+
+    @Override
+    @DS("#header.poolName")
+    public int addUserBind(QcUserMaterial qcUserMaterial) {
+        int count = 0;
+        if (qcUserMaterial.getMaterialCode() != null) {
+            QcUserMaterial qcUserMaterialDto = null;
+            Date now = DateUtils.getNowDate();
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String key = "#header.poolName";
+            String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
+            String[] userCodes = qcUserMaterial.getUserCodes();
+            String[] userNames = qcUserMaterial.getUserNames();
+            String materialCode = qcUserMaterial.getMaterialCode();
+            String materialName = qcUserMaterial.getMaterialName();
+            String user = SecurityUtils.getUsername();
+            //插入数据
+            for (int i = 0; i < userCodes.length; i++) {
+                qcUserMaterialDto = new QcUserMaterial();
+                qcUserMaterialDto.setId(IdUtils.fastSimpleUUID());
+                qcUserMaterialDto.setCreateTime(now);
+                qcUserMaterialDto.setCreateBy(user);
+                qcUserMaterialDto.setUserCode(userCodes[i]);
+                qcUserMaterialDto.setUserName(userNames[i]);
+                qcUserMaterialDto.setMaterialCode(materialCode);
+                qcUserMaterialDto.setMaterialName(materialName);
+                qcUserMaterialDto.setFactoryCode(factoryCode);
+                count += qcUserMaterialMapper.insertQcUserMaterial(qcUserMaterialDto);
+            }
+
+        }
+        return count;
+
+    }
 }

op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml

@@ -30,17 +30,21 @@
 
     <select id="selectUserList" parameterType="QcUserMaterial" resultType="com.op.quality.domain.QcUserMaterial">
         SELECT
-        user_id as userId,
+        su.user_id as userId,
-        user_name as userCode,
+        su.user_name as userCode,
-        nick_name as userName,
+        su.nick_name as userName,
-        phonenumber,
+        sd.dept_id as deptId,
-        email,
+        sd.dept_name as deptName,
-        status,
+        su.phonenumber,
-        create_time
+        su.email,
-        FROM sys_user
+        su.status,
-        WHERE del_flag = '0'
+        su.create_time
-        <if test="userName != null  and userName != ''">and nick_name like concat('%', #{userName}, '%')</if>
+        FROM sys_user su
-        <if test="phonenumber != null  and phonenumber != ''">and phonenumber like concat('%', #{phonenumber}, '%')</if>
+        LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id and sd.del_flag = '0'
+        WHERE su.del_flag = '0'
+        <if test="userName != null  and userName != ''">and su.nick_name like concat('%', #{userName}, '%')</if>
+        <if test="deptId != null">and sd.dept_id = #{deptId}</if>
+        <if test="phonenumber != null  and phonenumber != ''">and su.phonenumber like concat('%', #{phonenumber}, '%')</if>
     </select>
 
     <select id="selectQcUserMaterialList" parameterType="QcUserMaterial" resultMap="QcUserMaterialResult">
@@ -107,7 +111,11 @@
             '%')
         </if>
     </select>
-
+    <select id="getSelectedUsers" resultMap="QcUserMaterialResult">
+        select qum.user_code, qum.user_name
+        from qc_user_material qum
+        where qum.material_code = #{materialCode}
+    </select>
     <insert id="insertQcUserMaterial" parameterType="QcUserMaterial">
         insert into qc_user_material
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -177,4 +185,9 @@
             #{userCode}
         </foreach>
     </delete>
+
+    <delete id="deleteByMaterialCode" parameterType="QcUserMaterial">
+        delete from qc_user_material where user_code = #{userCode} and material_code = #{materialCode}
+    </delete>
+
 </mapper>