From 4201951630cfae2abfbde79292592e636f15af15 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Mon, 3 Jun 2024 18:45:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=81=E5=A4=8F=E8=AF=95=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/controller/TmTaskController.java | 2 +- .../bonus/sgzb/app/mapper/TmTaskMapper.java | 2 + .../app/service/impl/TmTaskServiceImpl.java | 8 +++- .../resources/mapper/app/TmTaskMapper.xml | 46 ++++++++++++++++++ .../mapper/base/WarehouseKeeperMapper.xml | 2 +- .../sgzb/material/domain/LeaseRecord.java | 12 +++++ .../service/impl/ApplyInfoServiceImpl.java | 6 +-- .../mapper/material/LeaseRecordMapper.xml | 47 ++++++++++--------- .../system/controller/SysUserController.java | 3 +- .../resources/mapper/system/SysUserMapper.xml | 38 ++++++++++----- 10 files changed, 126 insertions(+), 40 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 960a1b52..5103ac09 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -457,7 +457,7 @@ public class TmTaskController extends BaseController { return AjaxResult.error("参数错误"); } if (SecurityUtils.getLoginUser() != null) { - Long userid = SecurityUtils.getLoginUser().getUserid(); + Long userid = SecurityUtils.getLoginUser().getSysUser().getUserId(); task.setUserId(String.valueOf(userid)); } if (task.getFlag() == 1) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 90018955..907b925c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -144,4 +144,6 @@ public interface TmTaskMapper { int updateLeaseApplyInfoAuditInfoCq(@Param("record") LeaseApplyInfo leaseApplyInfo); int getDeptId(String createBy); + + List getLeaseOutListByjjbz(TmTask task); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 8315dc3a..88fac6e6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -559,7 +559,13 @@ public class TmTaskServiceImpl implements TmTaskService { @Override public List getLeaseOutListByUser(TmTask task) { - return tmTaskMapper.getLeaseOutListByUser(task); + Set roles = SecurityUtils.getLoginUser().getRoles(); + if (roles.contains("jjbz") || roles.contains("fbz")) { + //机具班长和副班长可以出库机具设备 + return tmTaskMapper.getLeaseOutListByjjbz(task); + }else { + return tmTaskMapper.getLeaseOutListByUser(task); + } } @Override diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index dd7cb7a1..af5e2891 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -1155,4 +1155,50 @@ + diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml index 6a7ea8c7..ad253c72 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT mt2.type_name as typeName, - mt.type_name as typeModelName, - bai.agreement_code as agreementCode, - mm.ma_code as maCode, - mt.unit_name as unit, - lod.out_num as preNum, - su.nick_name as leasePerson, - lod.create_time as createTime, - bpl.lot_name as proName, - bui.unit_name as unitName - FROM lease_out_details lod - LEFT JOIN lease_apply_info lai on lai.id = lod.parent_id - LEFT JOIN tm_task_agreement tta on tta.task_id = lai.task_id - LEFT JOIN bm_agreement_info bai on bai.agreement_id = tta.agreement_id - LEFT JOIN bm_project_lot bpl on bpl.lot_id = bai.project_id - LEFT JOIN bm_unit_info bui on bui.unit_id = bai.unit_id - LEFT JOIN ma_type mt on mt.type_id = lod.type_id - LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id - LEFT JOIN ma_machine mm on mm.ma_id = lod.ma_id - LEFT JOIN sys_user su on su.user_id = lai.lease_person - where 1 = 1 + SELECT + mt2.type_name AS typeName, + mt.type_name AS typeModelName, + bai.agreement_code AS agreementCode, + mm.ma_code AS maCode, + mt.unit_name AS unit, + lod.out_num AS preNum, + lai.`code` AS code, + su.nick_name AS leasePerson, + lod.create_time AS createTime, + bpl.lot_name AS proName, + lod.car_code AS carCode, + bui.unit_name AS unitName + FROM + lease_out_details lod + LEFT JOIN lease_apply_info lai ON lai.id = lod.parent_id + LEFT JOIN tm_task_agreement tta ON tta.task_id = lai.task_id + LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id + LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id + LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id + LEFT JOIN ma_type mt ON mt.type_id = lod.type_id + LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id + LEFT JOIN ma_machine mm ON mm.ma_id = lod.ma_id + LEFT JOIN sys_user su ON su.user_id = lai.lease_person + WHERE + 1 = 1 and (bai.agreement_code like concat('%',#{keyWord},'%') or mm.ma_code like concat('%',#{keyWord},'%') or diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java index 3a0accbd..952639cd 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java @@ -374,7 +374,8 @@ public class SysUserController extends BaseController { */ @GetMapping("/getUserByRoleList") public AjaxResult getUserByRoleList(SysUser sysUser) { - return success(userService.getUserByRoleList(sysUser)); + List userByRoleList = userService.getUserByRoleList(sysUser); + return success(userByRoleList); } /** diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml index 3cc848ab..6f919743 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -144,7 +144,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + insert into sys_user( user_id, @@ -224,15 +248,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + \ No newline at end of file From 9fa92a9b22338346c946b338b7b1a2ad0c0297fd Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Tue, 4 Jun 2024 09:45:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=B9=E6=A1=86title=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=94=B9=E4=B8=BA:=E8=AE=BE=E5=A4=87=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue | 6 +++--- sgzb-ui/vue.config.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue index a9452aeb..18319932 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue @@ -540,7 +540,7 @@ export default { // 表格数据 leaseList: [], // 弹出层标题 - title: '', + title: '设备出库', // 单位数据 unitList: [], proList: [], //工程集合 @@ -707,7 +707,7 @@ export default { //编码出库 codeOut(row) { - this.title = '编码出库' + // this.title = '编码出库' this.openCode = true this.outNum = row.outNum this.outQuery.typeId = row.typeId @@ -717,7 +717,7 @@ export default { //数量出库 numOut(row) { console.log(row, '数量出库当前行数据--') - this.title = '数量出库' + // this.title = '数量出库' this.openNum = true this.resetForm('numOutForm') // console.log(row) diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index ba85fcdb..687b3899 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -43,10 +43,10 @@ module.exports = { // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://z.csgmall.com.cn`, - // target: `http://10.40.92.8:8080`, //超 + target: `http://10.40.92.50:28080`, //超 // target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.74:8080`,//旭/ - target: `http://10.40.92.148:28080`, //帅 + // target: `http://10.40.92.148:28080`, //帅 // target: `http://10.40.92.5:28080`, //福 //******** 注意事项 ********* */