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 ad2c50164..2097fc048 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 @@ -1,15 +1,14 @@ package com.ruoyi.web.controller.front; import java.util.List; + +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.utils.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.front.domain.ServiceOrganization; @@ -123,4 +122,29 @@ public class ServiceOrganizationController extends BaseController { return toAjax(serviceOrganizationService.deleteServiceOrganizationByIds(ids)); } + + /** + * 新增服务组织 + */ + @GetMapping("/audit") + public String audit(@RequestParam String ids, ModelMap mmap) + { + mmap.put("ids", ids); + return prefix + "/audit"; + } + + /** + * 审核服务组织 + */ + @PostMapping("/audit") + @ResponseBody + public AjaxResult audit(@RequestParam() String ids, @RequestParam String auditStatus, String remark) + { + // 未审核通过，则备注不能为空 + if (StringUtils.isEmpty(remark) && auditStatus.equals(Constants.NO_PASS_AUDIT)) { + return error("备注不能为空"); + } + + return toAjax(serviceOrganizationService.audit(ids, auditStatus, remark)); + } } 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 858e519e2..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 @@ -1227,7 +1227,20 @@ var table = { $.modal.alertError(result.msg); } $.modal.closeLoading(); - } + }, + + // 审核信息 + auditAll: function() { + table.set(); + let rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); + if (rows.length == 0) { + $.modal.alertWarning("请至少选择一条记录"); + return; + } + + let url = table.options.auditUrl.concat("?ids=" + rows.join()); + $.modal.open("审核" + table.options.modalName, url); + } }, // 校验封装处理 validate: { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index 51aeca4f3..e1b808973 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -106,4 +106,19 @@ public class Constants * 未删除 */ public static final String NO_DELETE = "0"; + + /** + * 待审核 + */ + public static final String WAIT_AUDIT = "0"; + + /** + * 审核不通过 + */ + public static final String NO_PASS_AUDIT = "1"; + + /** + * 审核通过 + */ + public static final String PASS_AUDIT = "2"; } diff --git a/ruoyi-front/pom.xml b/ruoyi-front/pom.xml index d2ae4aec9..126af5123 100644 --- a/ruoyi-front/pom.xml +++ b/ruoyi-front/pom.xml @@ -17,6 +17,10 @@ com.ruoyi ruoyi-common + + com.ruoyi + ruoyi-framework + 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 4abb918ee..58413598f 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 @@ -2,6 +2,7 @@ package com.ruoyi.front.mapper; import java.util.List; import com.ruoyi.front.domain.ServiceOrganization; +import org.apache.ibatis.annotations.Param; /** * 服务组织Mapper接口 @@ -58,4 +59,13 @@ public interface ServiceOrganizationMapper * @return 结果 */ public int deleteServiceOrganizationByIds(String[] ids); + + /** + * 审核组织 + * @param ids + * @param auditStatus + * @param remark + * @return + */ + public int auditServiceOrganization(@Param("ids") String[] ids, @Param("auditStatus")String auditStatus, @Param("remark")String remark, @Param("checkBy")String checkBy); } 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 660a815ae..04c83a311 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 @@ -58,4 +58,13 @@ public interface IServiceOrganizationService * @return 结果 */ public int deleteServiceOrganizationById(Long id); + + /** + * 审核服务组织对象 + * @param ids 服务组织IDs + * @param auditStatus 审核状态 + * @param remark 审核备注 + * @return + */ + public int audit(String ids, String auditStatus, String remark); } 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 ffb2a0004..b2de9e71e 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 @@ -2,6 +2,8 @@ package com.ruoyi.front.service.impl; import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.framework.util.ShiroUtils; +import com.ruoyi.system.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.front.mapper.ServiceOrganizationMapper; @@ -94,4 +96,18 @@ public class ServiceOrganizationServiceImpl implements IServiceOrganizationServi { return serviceOrganizationMapper.deleteServiceOrganizationById(id); } + + /** + * 审核服务组织对象 + * @param ids 服务组织IDs + * @param auditStatus 审核状态 + * @param remark 审核备注 + * @return + */ + @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()); + } } diff --git a/ruoyi-front/src/main/resources/mapper/front/ServiceOrganizationMapper.xml b/ruoyi-front/src/main/resources/mapper/front/ServiceOrganizationMapper.xml index a60d3d2e5..f42a30f32 100644 --- a/ruoyi-front/src/main/resources/mapper/front/ServiceOrganizationMapper.xml +++ b/ruoyi-front/src/main/resources/mapper/front/ServiceOrganizationMapper.xml @@ -138,4 +138,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + update service_organization + set check_by = #{checkBy}, + check_time = now(), + remark = #{remark}, + audit_status = #{auditStatus} + where id in + + #{id} + + \ No newline at end of file diff --git a/ruoyi-front/src/main/resources/templates/front/organization/audit.html b/ruoyi-front/src/main/resources/templates/front/organization/audit.html new file mode 100644 index 000000000..ac276621e --- /dev/null +++ b/ruoyi-front/src/main/resources/templates/front/organization/audit.html @@ -0,0 +1,51 @@ + + + + + + + + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+
+ + + + + + \ 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 7d9a8310a..a5e3bbea8 100644 --- a/ruoyi-front/src/main/resources/templates/front/organization/organization.html +++ b/ruoyi-front/src/main/resources/templates/front/organization/organization.html @@ -68,11 +68,8 @@