From cd2ecf5505581e187acc203bf1888d6af1050cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=81=E7=91=9E=E8=B6=85?= <281809423@qq.com> Date: Thu, 5 Nov 2020 15:22:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=85=B1=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/ruoyi/js/ry-ui.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 8569f5b77..c27db04e7 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -1155,6 +1155,20 @@ var table = { }; $.ajax(config) }, + // 审核信息 + audit: function(id) { + table.set(); + $.modal.confirm("确定该条" + table.options.modalName + "信息吗？", function() { + var url = $.common.isEmpty(id) ? table.options.removeUrl : table.options.removeUrl.replace("{id}", id); + if(table.options.type == table_type.bootstrapTreeTable) { + $.operate.get(url); + } else { + var data = { "ids": id }; + $.operate.submit(url, "post", "json", data); + } + }); + + }, // 保存结果弹出msg刷新table表格 ajaxSuccess: function (result) { if (result.code == web_status.SUCCESS && table.options.type == table_type.bootstrapTable) { From 59397acce7ccc6743913eb72a7c163210f083e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=81=E7=91=9E=E8=B6=85?= <281809423@qq.com> Date: Thu, 5 Nov 2020 15:32:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=E5=A2=9E=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=85=B1=E7=94=A8=E6=96=B9=E6=B3=95"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit cd2ecf55 --- .../src/main/resources/static/ruoyi/js/ry-ui.js | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index c27db04e7..8569f5b77 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -1155,20 +1155,6 @@ var table = { }; $.ajax(config) }, - // 审核信息 - audit: function(id) { - table.set(); - $.modal.confirm("确定该条" + table.options.modalName + "信息吗？", function() { - var url = $.common.isEmpty(id) ? table.options.removeUrl : table.options.removeUrl.replace("{id}", id); - if(table.options.type == table_type.bootstrapTreeTable) { - $.operate.get(url); - } else { - var data = { "ids": id }; - $.operate.submit(url, "post", "json", data); - } - }); - - }, // 保存结果弹出msg刷新table表格 ajaxSuccess: function (result) { if (result.code == web_status.SUCCESS && table.options.type == table_type.bootstrapTable) { From 1397656937e2fc75c96c6e028863b734ee295060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=81=E7=91=9E=E8=B6=85?= <281809423@qq.com> Date: Thu, 5 Nov 2020 16:13:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=81=9C=E7=94=A8=EF=BC=8C=E6=89=B9=E9=87=8F=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../front/ServiceOrganizationController.java | 10 +++++ .../main/resources/static/ruoyi/js/ry-ui.js | 14 +++++++ .../mapper/ServiceOrganizationMapper.java | 8 ++++ .../service/IServiceOrganizationService.java | 8 ++++ .../impl/ServiceOrganizationServiceImpl.java | 15 +++++++ .../front/ServiceOrganizationMapper.xml | 41 ++++++++++++------- .../front/organization/organization.html | 33 +++++++++++---- 7 files changed, 106 insertions(+), 23 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ServiceOrganizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ServiceOrganizationController.java index 2097fc048..2f2837191 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ServiceOrganizationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ServiceOrganizationController.java @@ -147,4 +147,14 @@ public class ServiceOrganizationController extends BaseController return toAjax(serviceOrganizationService.audit(ids, auditStatus, remark)); } + + /** + * 停用或者启用 + */ + @PostMapping("/updateStatus") + @ResponseBody + public AjaxResult updateStatus(@RequestParam() String ids, @RequestParam String status) + { + return toAjax(serviceOrganizationService.updateStatus(ids, status)); + } } diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 8569f5b77..308a03791 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -1240,6 +1240,20 @@ var table = { let url = table.options.auditUrl.concat("?ids=" + rows.join()); $.modal.open("审核" + table.options.modalName, url); + }, + + //启用or停用 + updateStatusAll: function(status) { + table.set(); + let rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); + if (rows.length == 0) { + $.modal.alertWarning("请至少选择一条记录"); + return; + } + + var url = table.options.updateStatusUrl; + var data = { "ids": rows.join(), "status": status}; + $.operate.submit(url, "post", "json", data); } }, // 校验封装处理 diff --git a/ruoyi-front/src/main/java/com/ruoyi/front/mapper/ServiceOrganizationMapper.java b/ruoyi-front/src/main/java/com/ruoyi/front/mapper/ServiceOrganizationMapper.java index 58413598f..097870e56 100644 --- a/ruoyi-front/src/main/java/com/ruoyi/front/mapper/ServiceOrganizationMapper.java +++ b/ruoyi-front/src/main/java/com/ruoyi/front/mapper/ServiceOrganizationMapper.java @@ -68,4 +68,12 @@ public interface ServiceOrganizationMapper * @return */ public int auditServiceOrganization(@Param("ids") String[] ids, @Param("auditStatus")String auditStatus, @Param("remark")String remark, @Param("checkBy")String checkBy); + + /** + * 变更状态 + * @param ids 组织机构id + * @param status 状态 + * @return + */ + public int updateStatus(@Param("ids") String[] ids, @Param("status")String status, @Param("updateBy")String updateBy); } diff --git a/ruoyi-front/src/main/java/com/ruoyi/front/service/IServiceOrganizationService.java b/ruoyi-front/src/main/java/com/ruoyi/front/service/IServiceOrganizationService.java index 04c83a311..7d85a012b 100644 --- a/ruoyi-front/src/main/java/com/ruoyi/front/service/IServiceOrganizationService.java +++ b/ruoyi-front/src/main/java/com/ruoyi/front/service/IServiceOrganizationService.java @@ -67,4 +67,12 @@ public interface IServiceOrganizationService * @return */ public int audit(String ids, String auditStatus, String remark); + + /** + * 停用或者启用服务组织对象 + * @param ids 服务组织IDs + * @param status 状态 + * @return + */ + public int updateStatus(String ids, String status); } diff --git a/ruoyi-front/src/main/java/com/ruoyi/front/service/impl/ServiceOrganizationServiceImpl.java b/ruoyi-front/src/main/java/com/ruoyi/front/service/impl/ServiceOrganizationServiceImpl.java index b2de9e71e..eb228871a 100644 --- a/ruoyi-front/src/main/java/com/ruoyi/front/service/impl/ServiceOrganizationServiceImpl.java +++ b/ruoyi-front/src/main/java/com/ruoyi/front/service/impl/ServiceOrganizationServiceImpl.java @@ -10,6 +10,7 @@ import com.ruoyi.front.mapper.ServiceOrganizationMapper; import com.ruoyi.front.domain.ServiceOrganization; import com.ruoyi.front.service.IServiceOrganizationService; import com.ruoyi.common.core.text.Convert; +import org.springframework.transaction.annotation.Transactional; /** * 服务组织Service业务层处理 @@ -104,10 +105,24 @@ public class ServiceOrganizationServiceImpl implements IServiceOrganizationServi * @param remark 审核备注 * @return */ + @Transactional @Override public int audit(String ids, String auditStatus, String remark) { SysUser user = ShiroUtils.getSysUser(); return serviceOrganizationMapper.auditServiceOrganization(Convert.toStrArray(ids), auditStatus, remark, user.getUserId().toString()); } + + /** + * 停用或者启用服务组织对象 + * @param ids 服务组织IDs + * @param status 状态 + * @return + */ + @Transactional + @Override + public int updateStatus(String ids, String status) { + SysUser user = ShiroUtils.getSysUser(); + return serviceOrganizationMapper.updateStatus(Convert.toStrArray(ids), status, user.getUserId().toString()); + } } diff --git a/ruoyi-front/src/main/resources/mapper/front/ServiceOrganizationMapper.xml b/ruoyi-front/src/main/resources/mapper/front/ServiceOrganizationMapper.xml index f42a30f32..6d54c31ff 100644 --- a/ruoyi-front/src/main/resources/mapper/front/ServiceOrganizationMapper.xml +++ b/ruoyi-front/src/main/resources/mapper/front/ServiceOrganizationMapper.xml @@ -28,25 +28,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, name, contacts, phone, license_url, title, introduction, content, hits, audit_status, picture_url, status, del_flag, create_by, create_time, update_by, update_time, check_by, check_time, remark from service_organization + select so.id, so.name, so.contacts, so.phone, so.license_url, so.title, so.introduction, so.content, so.hits, so.audit_status, so.picture_url, so.status, + so.del_flag, so.create_by, so.create_time, so.update_by, so.update_time, su.user_name check_by, so.check_time, so.remark from service_organization so @@ -149,4 +151,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + + update service_organization + set update_by = #{updateBy}, + update_time = now(), + status = #{status} + where id in + + #{id} + + \ No newline at end of file diff --git a/ruoyi-front/src/main/resources/templates/front/organization/organization.html b/ruoyi-front/src/main/resources/templates/front/organization/organization.html index a5e3bbea8..3271fbf6f 100644 --- a/ruoyi-front/src/main/resources/templates/front/organization/organization.html +++ b/ruoyi-front/src/main/resources/templates/front/organization/organization.html @@ -68,12 +68,18 @@
- + 审核 - - 删除 + + 启用 + + 停用 + + @@ -87,6 +93,8 @@