From bf812851cdecb1e2ba65b8225cb1833226213f4d Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Thu, 27 Jun 2024 17:58:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E5=BA=9F=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E7=BB=B4=E4=BF=AE=E9=A1=B5=E9=9D=A2=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/app/BackReceiveMapper.xml | 2 +- .../material/service/impl/RepairAuditDetailsServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index a2e778f1..bdcccede 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -531,7 +531,7 @@ company_id, - audit_remark, + remark, scrap_type, diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index 8761c399..893996a8 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -293,7 +293,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); scrapApplyDetails.setCreateTime(new Date()); scrapApplyDetails.setCompanyId((long) companyId); - scrapApplyDetails.setAuditRemark(bean.getScrapReason()); + scrapApplyDetails.setRemark(bean.getScrapReason()); //根据fileIds获取所有的图片地址 if (StringUtils.isNotEmpty(bean.getFileIds())){ String[] fileIsList = bean.getFileIds().split(","); From e852e14a3101370ce0dffe41d52fb6a41a335d8a Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 28 Jun 2024 09:55:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/base/controller/MaTypeController.java | 3 ++- .../src/main/resources/mapper/base/MaMachineTypeMapper.xml | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java index 5b906686..2798cc72 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java @@ -194,8 +194,9 @@ public class MaTypeController extends BaseController { @GetMapping("/getListByMaType") public AjaxResult getListByMaType(@RequestParam(required = false) Long typeId, @RequestParam(required = false) String typeName) { + startPage(); List listByMaType = iTypeService.getListByParentId(typeId, typeName); - return success(listByMaType); + return success(getDataTable(listByMaType)); } /** diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml index 89204539..2888fb1d 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml @@ -347,7 +347,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join (select * from ma_type_file where file_type = '2') mtf2 on m.type_id = mtf2.type_id left join ma_type_keeper mtk on m.type_id = mtk.type_id left join sys_user su on mtk.user_id = su.user_id - where m.parent_id = #{typeId} and m.status = '0' and m.del_flag = '0' + where m.status = '0' and m.del_flag = '0' + + AND m.parent_id = #{typeId} + AND type_name like concat('%',#{typeName},'%') From 4dece6271b0c01f0d367191454a84c345eb77224 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Fri, 28 Jun 2024 15:21:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=8A=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/components/Editor/index.vue | 4 ++-- sgzb-ui/src/views/system/user/index.vue | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sgzb-ui/src/components/Editor/index.vue b/sgzb-ui/src/components/Editor/index.vue index 44c545c2..722093cd 100644 --- a/sgzb-ui/src/components/Editor/index.vue +++ b/sgzb-ui/src/components/Editor/index.vue @@ -81,8 +81,8 @@ export default { [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题 [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 [{ align: [] }], // 对齐方式 - ["clean"], // 清除文本格式 - ["link", "image", "video"] // 链接、图片、视频 + ["clean"] // 清除文本格式 + // ["link", "image", "video"] // 链接、图片、视频 ], }, placeholder: "请输入内容", diff --git a/sgzb-ui/src/views/system/user/index.vue b/sgzb-ui/src/views/system/user/index.vue index 8ed460f3..f7fcafb6 100644 --- a/sgzb-ui/src/views/system/user/index.vue +++ b/sgzb-ui/src/views/system/user/index.vue @@ -135,17 +135,17 @@ >删除 - - 导入 - + + + + + + + + + + +