From ee48170cc8c86a17bb90d5b7aa659de9d301980c Mon Sep 17 00:00:00 2001 From: shaoyong Date: Fri, 27 Oct 2023 11:33:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=89=A9=E6=96=99=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QcCheckTypeProjectController.java | 8 ++++ .../service/IQcCheckTypeProjectService.java | 4 ++ .../QcCheckTypeProjectServiceImpl.java | 8 ++++ .../QcUserMaterialServiceImpl.java | 1 - .../quality/QcCheckTypeProjectMapper.xml | 2 +- .../mapper/quality/QcUserMaterialMapper.xml | 37 +++++++------------ 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeProjectController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeProjectController.java index 22e59370..5d5bcf84 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeProjectController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeProjectController.java @@ -99,4 +99,12 @@ public class QcCheckTypeProjectController extends BaseController { public AjaxResult remove(@PathVariable String[] ids) { return toAjax(qcCheckTypeProjectService.deleteQcCheckTypeProjectByIds(ids)); } + /** + * 修改数据状态 + */ + @Log(title = "物料检验项目维护", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody QcCheckTypeProject qcCheckTypeProject) { + return toAjax(qcCheckTypeProjectService.changeStatus(qcCheckTypeProject)); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeProjectService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeProjectService.java index bef13f3b..f2f751eb 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeProjectService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeProjectService.java @@ -57,4 +57,8 @@ public interface IQcCheckTypeProjectService { * @return 结果 */ public int deleteQcCheckTypeProjectById(String id); + /** + * 状态修改 + */ + public int changeStatus(QcCheckTypeProject qcCheckTypeProject); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeProjectServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeProjectServiceImpl.java index c1eb83b3..adc747b7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeProjectServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeProjectServiceImpl.java @@ -106,4 +106,12 @@ public class QcCheckTypeProjectServiceImpl implements IQcCheckTypeProjectService public int deleteQcCheckTypeProjectById(String id) { return qcCheckTypeProjectMapper.deleteQcCheckTypeProjectById(id); } + + @Override + @DS("#header.poolName") + public int changeStatus(QcCheckTypeProject qcCheckTypeProject) { + qcCheckTypeProject.setUpdateBy(SecurityUtils.getUsername()); + qcCheckTypeProject.setUpdateTime(DateUtils.getNowDate()); + return qcCheckTypeProjectMapper.updateQcCheckTypeProject(qcCheckTypeProject); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java index e369e4d7..1e4a3379 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRequest; public class QcUserMaterialServiceImpl implements IQcUserMaterialService { @Autowired private QcUserMaterialMapper qcUserMaterialMapper; - @Override public List selectUserList(QcUserMaterial qcUserMaterial) { return qcUserMaterialMapper.selectUserList( qcUserMaterial); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml index 83514fe7..dc43d312 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml @@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ctp.del_flag = '0' and ctp.project_id = #{projectId} and ctp.type_id = #{typeId} - and ctp.standard_value = #{standardValue} + and ctp.standard_value like concat('%', #{standardValue}, '%') and ctp.upper_diff = #{upperDiff} and ctp.down_diff = #{downDiff} and ctp.sample = #{sample} 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 8c02c064..ab560425 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 @@ -28,26 +28,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by, create_time, update_by, update_time, factory_code, del_flag from qc_user_material - SELECT - t.user_id, - t.user_name as user_code, - t.nick_name as user_name, - t.phonenumber, - t.email, - STRING_AGG(bp.product_desc_zh, ',') materialNames, - t.status, - t.create_time - FROM - sys_user t - LEFT JOIN lanju_op_xiaolan_ds.dbo.qc_user_material um ON um.user_code = t.user_name - LEFT JOIN lanju_op_xiaolan_ds.dbo.base_product bp ON bp.product_code = um.material_code - WHERE t.del_flag = '0' - and t.nick_name like concat('%', #{userName}, '%') - and t.phonenumber like concat('%', #{phonenumber}, '%') - GROUP BY t.user_id,t.user_name,t.nick_name,t.phonenumber,t.email,t.status,t.create_time - - + user_id as userId, + user_name as userCode, + nick_name as userName, + phonenumber, + email, + status, + create_time + FROM sys_user + WHERE del_flag = '0' + and nick_name like concat('%', #{userName}, '%') + and phonenumber like concat('%', #{phonenumber}, '%')