From 5856609c632c34408004feaa5c39c8807afdf7ff Mon Sep 17 00:00:00 2001 From: shaoyong Date: Mon, 25 Mar 2024 16:57:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=A3=80=E9=AA=8C=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QcUserMaterialController.java | 37 +++++++++++++++ .../com/op/quality/domain/QcUserMaterial.java | 9 ++++ .../quality/mapper/QcUserMaterialMapper.java | 4 ++ .../service/IQcUserMaterialService.java | 7 +++ .../impl/QcUserMaterialServiceImpl.java | 46 +++++++++++++++++++ .../mapper/quality/QcUserMaterialMapper.xml | 37 ++++++++++----- 6 files changed, 128 insertions(+), 12 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcUserMaterialController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcUserMaterialController.java index 398c3e8d..c0756d8e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcUserMaterialController.java +++ b/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 list = qcUserMaterialService.getRightList(qcUserMaterial); return getDataTable(list); } + /** + * 查询人员绑定信息 + * @param qcUserMaterial + * @return + */ + @GetMapping(value = "/getSelectedUsers") + public TableDataInfo getSelectedUsers(QcUserMaterial qcUserMaterial) { + startPage(); + List 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); + } + + + + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java index 77b4995c..22db4118 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java +++ b/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) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java index 0aa4fe48..9b1f8af8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java @@ -78,4 +78,8 @@ public interface QcUserMaterialMapper { public List getUserMaterialListUndo(QcUserMaterial qcUserMaterial); public List getUserMaterialListDo(QcUserMaterial qcUserMaterial); + + public List getSelectedUsers(QcUserMaterial qcUserMaterial); + + public int deleteByMaterialCode(QcUserMaterial qcUserMaterial); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcUserMaterialService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcUserMaterialService.java index d30424e6..f9895b2f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcUserMaterialService.java +++ b/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 getRightList(QcUserMaterial qcUserMaterial); + + public List getSelectedUsers(QcUserMaterial qcUserMaterial); + + public int addUserBind(QcUserMaterial qcUserMaterial); + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java index 6a57c31d..cd499ab8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java +++ b/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 getList(QcUserMaterial qcUserMaterial) { @@ -174,4 +180,44 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { }); return selected; } + + @Override + @DS("#header.poolName") + public List 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; + + } } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml index e549f9c2..194a2bbe 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml @@ -30,17 +30,21 @@ - + insert into qc_user_material @@ -177,4 +185,9 @@ #{userCode} + + + delete from qc_user_material where user_code = #{userCode} and material_code = #{materialCode} + +