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 a2afcb92..28241553 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 @@ -51,20 +51,43 @@ public class ApplyInfoListManager { return applyInfoListService.selectTdAuditInfoListList(applyInfoListDTO); } + /** + * 承诺书 + * @param applyInfoListDTO + * @return + */ public List selectPromiseInfoListList(TdApplyInfoListDTO applyInfoListDTO) { return applyInfoListService.selectPromiseInfoListList(applyInfoListDTO); } - + /** + * 涉密人员 + * @param applyInfoListDTO + * @return + */ public List selectPersonList(TdApplyInfoListDTO applyInfoListDTO) { return applyInfoListService.selectPersonList(applyInfoListDTO); } + /** + * 在岗 + * @param applyInfoListDTO + * @return + */ public List selectOndutyInfoListList(TdApplyInfoListDTO applyInfoListDTO) { return applyInfoListService.selectOndutyInfoListList(applyInfoListDTO); } + /** + * 人员出国 + * @param applyInfoListDTO + * @return + */ + public List selectAbroadInfoListList(TdApplyInfoListDTO applyInfoListDTO) { + return applyInfoListService.selectAbroadInfoListList(applyInfoListDTO); + } + @Transactional(rollbackFor = Exception.class) public boolean saveOrUpdate(TdApplyInfoListDTO applyInfoListDTO) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/abroad/AbroadInfoListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/abroad/AbroadInfoListController.java new file mode 100644 index 00000000..673b976e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/abroad/AbroadInfoListController.java @@ -0,0 +1,72 @@ +package com.ruoyi.web.controller.system.abroad; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.page.TableDataInfo; +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/abroadList") +public class AbroadInfoListController extends BaseController { + + + private String prefix = "system/newdev/abroad"; + + + @Resource + private ApplyInfoListManager applyInfoListManager; + + @RequiresPermissions("system:abroad:view") + @GetMapping() + public String abroadList() { + return prefix + "/abroadList"; + } + /** + * 人员出国列表 + */ + @RequiresPermissions("system:abroad:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TdApplyInfoListDTO applyInfoListDTO) { + startPage(); + List tdApplyInfoLists = applyInfoListManager.selectAbroadInfoListList(applyInfoListDTO); + return getDataTable(tdApplyInfoLists); + } + + /** + * 出国 + */ + @RequiresPermissions("system:abroad:editAbroad") + @GetMapping("/editAbroad/{applyId}") + public String editAbroad(@PathVariable("applyId") String applyId, ModelMap mmap) { + TdApplyInfoListDTO applyInfoList = applyInfoListManager.getTdApplyInfoList(applyId); + mmap.put("applyInfoList", applyInfoList); + return prefix + "/editAbroad"; + } + + + + + + + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/onduty/OnDutyInfoListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/onduty/OnDutyInfoListController.java index cc933997..828753c3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/onduty/OnDutyInfoListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/onduty/OnDutyInfoListController.java @@ -39,7 +39,7 @@ public class OnDutyInfoListController extends BaseController { return prefix + "/ondutyList"; } /** - * 人员列表 + * 人员在岗列表 */ @RequiresPermissions("system:onduty:list") @PostMapping("/list") diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/abroad/abroadList.html b/ruoyi-admin/src/main/resources/templates/system/newdev/abroad/abroadList.html new file mode 100644 index 00000000..cbfc7b9b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/abroad/abroadList.html @@ -0,0 +1,114 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • +  搜索 +  重置 +
  • +
+
+
+
+ +
+
+
+
+
+
+
+ + + + 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 127b2480..dc0227d3 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 @@ -32,6 +32,9 @@ public interface TdApplyInfoListMapper extends BaseMapper { public List selectOndutyInfoListList(TdApplyInfoListDTO applyInfoListDTO); + public List selectAbroadInfoListList(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 814154ea..cae924f5 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 @@ -31,6 +31,10 @@ public interface TdApplyInfoListService extends IService { public List selectOndutyInfoListList(TdApplyInfoListDTO applyInfoListDTO); + public List selectAbroadInfoListList(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 cc4031fb..48726d6b 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 @@ -60,6 +60,12 @@ public class TdApplyInfoListServiceImpl extends ServiceImpl selectOndutyInfoListList(TdApplyInfoListDTO applyInfoListDTO) { return applyInfoListMapper.selectOndutyInfoListList(applyInfoListDTO); } + + @DataScope(deptAlias = "d") + @Override + public List selectAbroadInfoListList(TdApplyInfoListDTO applyInfoListDTO) { + return applyInfoListMapper.selectAbroadInfoListList(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 9465b2a8..bd0796c4 100644 --- a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml @@ -214,6 +214,33 @@ ORDER BY create_time DESC +