diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java index 2a821178..4bd511c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java @@ -15,6 +15,7 @@ import javax.annotation.Resource; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.Objects; /** * ClassName: ApplyInfoListManager @@ -43,6 +44,11 @@ public class ApplyInfoListManager { } + public List selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO) { + return applyInfoListService.selectTdAuditInfoListList(applyInfoListDTO); + } + + @Transactional(rollbackFor = Exception.class) public boolean saveOrUpdate(TdApplyInfoListDTO applyInfoListDTO) { TdApplyInfoList applyInfoList = Convert.convert(TdApplyInfoList.class, applyInfoListDTO); @@ -83,6 +89,17 @@ public class ApplyInfoListManager { + @Transactional(rollbackFor = Exception.class) + public boolean submitAudit(String applyId,Integer applyStatus,String applyMsg) { + return applyInfoListService.lambdaUpdate() + .eq(TdApplyInfoList::getApplyId,applyId) + .set(TdApplyInfoList::getApplyStatus,applyStatus) + .set(Objects.nonNull(applyMsg), TdApplyInfoList::getApplyMsg, applyMsg) + .set(TdApplyInfoList::getAuthTime,new Date()).update(); + } + + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/AuditInfoListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/AuditInfoListController.java new file mode 100644 index 00000000..e758cedb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/AuditInfoListController.java @@ -0,0 +1,85 @@ +package com.ruoyi.web.controller.system.apply; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.apply.TdApplyInfoList; +import com.ruoyi.system.domain.apply.dto.TdApplyInfoListDTO; +import com.ruoyi.web.controller.manager.ApplyInfoListManager; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * ClassName: ApplyInfoListController + * Package: com.ruoyi.web.controller.system.apply + * Description: + * + * @Author wangxy + * @Create 2025/5/14 11:32 + * @Version 1.0 + */ +@Controller +@RequestMapping("/system/auditList") +public class AuditInfoListController extends BaseController { + + + private String prefix = "system/newdev/audit"; + + + @Resource + private ApplyInfoListManager applyInfoListManager; + + @RequiresPermissions("system:audit:view") + @GetMapping() + public String auditListInfo() { + return prefix + "/auditList"; + } + /** + * 人员列表 + */ + @RequiresPermissions("system:audit:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TdApplyInfoListDTO applyInfoListDTO) { + startPage(); + List tdApplyInfoLists = applyInfoListManager.selectTdAuditInfoListList(applyInfoListDTO); + return getDataTable(tdApplyInfoLists); + } + + /** + * 审核 + */ + @RequiresPermissions("system:audit:editAudit") + @GetMapping("/editAudit/{applyId}") + public String editAudit(@PathVariable("applyId") String applyId, ModelMap mmap) { + TdApplyInfoListDTO applyInfoList = applyInfoListManager.getTdApplyInfoList(applyId); + mmap.put("applyInfoList", applyInfoList); + return prefix + "/editAudit"; + } + + /** + * 审核通过、不通过 + */ + @PostMapping("/submitAudit") + @ResponseBody + public AjaxResult submitAudit(@RequestParam String applyId, + @RequestParam Integer auditStatus, + @RequestParam(required = false) String applyMsg) { + return toAjax(applyInfoListManager.submitAudit(applyId,auditStatus,applyMsg)); + } + + + + + + + + +} diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/audit/auditList.html b/ruoyi-admin/src/main/resources/templates/system/newdev/audit/auditList.html new file mode 100644 index 00000000..088db73c --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/audit/auditList.html @@ -0,0 +1,113 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • +  搜索 +  重置 +
  • +
+
+
+
+ +
+
+
+
+
+
+
+ + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java index 5dc851c1..ad3a2939 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java @@ -18,6 +18,10 @@ public interface TdApplyInfoListMapper extends BaseMapper { public List selectTdApplyInfoListList(TdApplyInfoListDTO applyInfoListDTO); + public List selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO); + + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java index aac58e18..e377cba1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java @@ -17,4 +17,8 @@ public interface TdApplyInfoListService extends IService { public List selectTdApplyInfoListList(TdApplyInfoListDTO applyInfoListDTO); + public List selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO); + + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java index 74cfdcda..5d3ef27d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java @@ -9,6 +9,7 @@ import com.ruoyi.system.service.apply.TdApplyInfoListService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Collections; import java.util.List; /** @@ -28,6 +29,12 @@ public class TdApplyInfoListServiceImpl extends ServiceImpl selectTdApplyInfoListList(TdApplyInfoListDTO applyInfoListDTO) { return applyInfoListMapper.selectTdApplyInfoListList(applyInfoListDTO); } + + @DataScope(deptAlias = "d") + @Override + public List selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO) { + return applyInfoListMapper.selectTdAuditInfoListList(applyInfoListDTO); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml index ec468807..472a0678 100644 --- a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml @@ -69,12 +69,40 @@ AND sm_post = #{smPost} - AND apply_status = '0' + AND apply_status in (0,3) ${params.dataScope} ORDER BY create_time DESC +