From ac8b410f33ceb790c1effd0bb611ee6e852f5e00 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 21 Nov 2024 15:29:12 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E8=B5=84=E8=B4=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E8=AF=A2bug=20=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E4=BE=9B=E5=BA=94=E5=95=86=E8=B5=84?= =?UTF-8?q?=E8=B4=A8=E5=AF=BC=E5=87=BA=E5=8A=A0=E4=B8=8A=E5=AD=97=E5=85=B8?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=90=8E=E7=AB=AF?= =?UTF-8?q?bug=E9=97=AE=E9=A2=98=20=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E5=8A=A0?= =?UTF-8?q?=E4=B8=8AtaskStatus=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E6=96=B0=E7=9A=84=E7=8A=B6=E6=80=81=20=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E9=80=9A=E8=BF=87=E5=92=8C=E5=AE=A1=E6=A0=B8=E6=8B=92?= =?UTF-8?q?=E7=BB=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysSupplierController.java | 27 +------ .../com/ruoyi/system/domain/SysSupplier.java | 17 +++-- .../ruoyi/system/domain/Vo/SysSupplierVo.java | 14 ++++ .../service/impl/SysSupplierServiceImpl.java | 8 ++ .../mapper/system/SysSupplierMapper.xml | 13 +--- .../templates/system/supplier/supplier.html | 75 +++++++++++-------- 6 files changed, 77 insertions(+), 77 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierController.java index 878ae357..1c75a6c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierController.java @@ -95,35 +95,10 @@ public class SysSupplierController extends BaseController @ResponseBody public TableDataInfo list(SysSupplier sysSupplier) { - try { + startPage(); List list = sysSupplierService.selectSysSupplierList(sysSupplier); - SysUser curUser = ShiroUtils.getSysUser(); - String loginName = ShiroUtils.getLoginName(); - Long userId = curUser.getUserId(); - Set roleKeys = roleService.selectRoleKeys(userId); -// List sysUserlist = sysUserService.selectRoleToUserList("cgyRole"); -// sysUserlist.add(curUser); - //如果主管审批，查看当前自己部门的审核 - //如果经理审计需要查询自己部门下所有业务员的提交的订单，以及自身的提交的订单 -// if (roleKeys.contains("cgjlRole")) { -// List findUser = sysUserlist.stream().filter(item -> (item.getDeptId().equals(curUser.getDeptId()))).collect(Collectors.toList()); -// Set user = findUser.stream().map(SysUser::getLoginName).collect(Collectors.toSet()); -// startPage(); -// List list2 = list.stream().filter(item -> user.contains(item.getCreateBy())).collect(Collectors.toList()); -// return getDataTable(list2); -// } - // 业务员角色只能看到自己创建的数据 - if (roleKeys.contains("cgyRole")) { - sysSupplier.setCreateBy(curUser.getLoginName()); - startPage(); - List list2 = sysSupplierService.selectSysSupplierList(sysSupplier); - return getDataTable(list2); - } return getDataTable(list); - }catch(NullPointerException e){ - throw new NullPointerException("当前用户没有申请客户资料"); - } } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplier.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplier.java index d8801454..6dbf900b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplier.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplier.java @@ -24,11 +24,6 @@ public class SysSupplier extends BaseEntity /*使用状态*/ private String useStatus; - /** 供应商类型 （0采购供应商、1委外供应商）*/ - private String supplierType; - - /** 供应商资质（1合格、2不合格、3特殊供应商）*/ - private String supplierQualification; /*采购员*/ private String purchaseBuyer; /** 供应商编号 */ @@ -39,6 +34,16 @@ public class SysSupplier extends BaseEntity @Excel(name = "供应商名称") private String supplierName; + + /** 供应商类型 （0采购供应商、1委外供应商）*/ + @Excel( name = "供应商类型",dictType = "sys_supplier_type") + private String supplierType; + + /** 供应商资质（1合格、2不合格、3特殊供应商）*/ + @Excel( name = "供应商资质",dictType = "sys_supplier_qualification") + private String supplierQualification; + + /** 内外销 */ @Excel(name = "内外销") private String exportSales; @@ -154,7 +159,7 @@ public class SysSupplier extends BaseEntity private String financialContact; /** 是否含税 */ - @Excel(name = "是否含税") + @Excel(name = "是否含税", dictType = "sys_confirm_tax") private String confirmTax; /** 税率 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/SysSupplierVo.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/SysSupplierVo.java index 4ae7b39f..4011c33a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/SysSupplierVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/SysSupplierVo.java @@ -18,6 +18,11 @@ public class SysSupplierVo extends SysSupplier { private String taskId; /** 任务名称 */ private String taskName; + + // 当前状态 + private String taskStatus; + + /** 办理时间 */ private Date doneTime; /** 创建人 */ @@ -95,12 +100,21 @@ public class SysSupplierVo extends SysSupplier { } + public String getTaskStatus() { + return taskStatus; + } + + public void setTaskStatus(String taskStatus) { + this.taskStatus = taskStatus; + } + @Override public String toString() { return "SysSupplierVo{" + "applyUserName='" + applyUserName + '\'' + ", taskId='" + taskId + '\'' + ", taskName='" + taskName + '\'' + + ", taskStatus='" + taskStatus + '\'' + ", doneTime=" + doneTime + ", createUserName='" + createUserName + '\'' + ", suspendState='" + suspendState + '\'' + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java index 566adc44..2bd093d1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java @@ -146,6 +146,14 @@ public class SysSupplierServiceImpl implements ISysSupplierService{ } else { sysSupplierVo.setTaskName("未启动"); } + + sysSupplierVo.setTaskStatus(sysSupplierVo.getTaskName()); + if(sysSupplierVo.getAuditStatus()!=null && sysSupplierVo.getAuditStatus().equals("1")){ + sysSupplierVo.setTaskStatus("审核通过"); + }else if(sysSupplierVo.getAuditStatus()!=null && sysSupplierVo.getAuditStatus().equals("2")){ + sysSupplierVo.setTaskStatus("审核拒绝"); + } + returnList.add(sysSupplierVo); } returnList.setTotal(CollectionUtils.isEmpty(list) ? 0 : list.getTotal()); diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml index fbd02f5e..57ed74b6 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml @@ -114,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sup.supplier_code like concat('%', #{supplierCode}, '%') and sup.supplier_name like concat('%', #{supplierName}, '%') and sup.supplier_type = #{supplierType} + and sup.supplier_qualification = #{supplierQualification} and sup.use_status = #{useStatus} and sup.audit_status = #{auditStatus} and sup.purchase_buyer = #{purchaseBuyer} @@ -129,18 +130,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" or sup.receive_address like concat('%',#{receiveAddress},'%') and sup.invoice_company_name like concat('%', #{invoiceCompanyName}, '%') and sup.company_tax_number like concat('%', #{companyTaxNumber}, '%') - - and sup.instance_id = #{instanceId} - and sup.instance_type = #{instanceType} - and sup.submit_instance_id = #{submitInstanceId} - and sup.cancel_instance_id = #{cancelInstanceId} - and sup.restore_instance_id = #{restoreInstanceId} - and sup.apply_title = #{applyTitle} - and sup.apply_user = #{applyUser} - and sup.apply_time = #{applyTime} - and sup.create_time between #{params.beginCreateTime} and #{params.endCreateTime} - - and ((sup.supplierCode like concat('%',#{keyword},'%') or sup.suppplierName like concat('%',#{keyword},'%')) order by sup.apply_time asc, sup.create_time desc diff --git a/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html b/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html index 131de1d2..44daa7ae 100644 --- a/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html +++ b/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html @@ -28,21 +28,24 @@
  • -
  • - -
  • - - + +
  •  搜索 @@ -92,50 +95,48 @@ removeUrl: prefix + "/remove", exportUrl: prefix + "/export", detailUrl: prefix + "/detail/{id}", - search: false, - showExport: true, - showSearch: false, - showRefresh: false, - showToggle: false, - showColumns: false, - showExport: false, - showExport: true, - showColumns: true, - showToggle: true, - clickToSelect: true, modalName: "供应商资料", fixedColumns:true, fixedRightNumber:1, columns: [{checkbox: true}, {title: '供应商id',field: 'supplierId',visible: false}, - {title: '审核状态',field: 'auditStatus',formatter: function(value, row, index) { - return $.table.selectDictLabel(auditStatusDatas, value); - }}, - {title: '使用状态',field: 'useStatus',formatter: function(value, row, index) { - return $.table.selectDictLabel(useStatusDatas, value); - }}, {title: '流程实例ID',field: 'instanceId',visible: false}, { title: '流程提交实例ID',field: 'submitInstanceId',visible: false}, { title:'流程作废实例ID',field: 'cancelInstanceId',visible: false}, {title: '流程恢复实例ID',field: 'restoreInstanceId', visible: false}, { title: '流程实例类型', field: 'instanceTypeName',visible: false}, {title: '申请人ID',field: 'applyUser', visible: false}, + {title: '审核状态',field: 'auditStatus',visible: false,formatter: function(value, row, index) { + return $.table.selectDictLabel(auditStatusDatas, value); + }}, { field: 'applyUserName', title: '申请人', + visible: false, formatter: function(value, row, index) { return '' + (value ? value : "-") + ''; } }, - {field: 'applyTime',title: '申请时间'}, {title: '当前任务ID',field: 'taskId',visible: false}, { title: '待办用户ID',field: 'todoUserId', visible: false}, - { title: '当前任务名称',field: 'taskName', + { title: '当前任务名称',field: 'taskName', visible: false, align: 'center', formatter: function(value, row, index) { return '' + value + ''; } }, + + {title: '当前状态',field: 'taskStatus', align: 'center', + formatter: function(value, row, index) { + if(row.auditStatus!="1"&&value != "未启动"){ + return '' + value + ''; + } + if(value === "未启动"){ + return '' + value + ''; + } + return '' + value + '';} + }, + { title: '供应商编号',field: 'supplierCode'}, {title: '供应商名称',field: 'supplierName'}, {title: '供应商类型',field: 'supplierType',formatter: function(value, row, index) { @@ -197,6 +198,13 @@ } } }, + {field: 'applyTime',title: '申请时间'}, + + {title: '使用状态',field: 'useStatus',formatter: function(value, row, index) { + return $.table.selectDictLabel(useStatusDatas, value); + }}, + + { field: 'updateInfoTime', title: '上次修改时间', @@ -216,17 +224,17 @@ var actions = []; if(row.auditStatus=="1" && row.useStatus=="1" && !row.cancelInstanceId) { // 作废 - actions.push(' 作废'); + actions.push(' 作废'); // 编辑 - actions.push(' 编辑 '); + actions.push(' 编辑 '); // 已作废 }else{ - actions.push(' 编辑 '); + actions.push(' 编辑 '); } // 有流程实例id if(row.useStatus=="2" && !row.restoreInstanceId){ // 恢复 - actions.push(' 恢复 '); + actions.push(' 恢复 '); } // 有流程实例id if (row.instanceId) { @@ -235,17 +243,18 @@ var todoUserIdList = row.todoUserId.split(","); if(todoUserIdList.includes(loginName)){ var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; - actions.push(' '+nodeName+' '); + actions.push(' '+nodeName+' '); } } // 审批历史 - actions.push(' 审批历史 '); + actions.push(' 审批历史 '); // 进度查看 - actions.push(' 进度查看 '); + actions.push(' 进度查看 '); } // 详情 - actions.push(' 详情 '); - return actions.join(''); + actions.push(' 详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } } ],