isoftstone/lc_backend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

外协人员页面 部门筛选排序

Browse Source
This commit is contained in:
李奋勇
2025-12-12 16:15:07 +08:00
parent 3bea2358fd
commit 0a260ee757
4 changed files with 946 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/controller/OutSidePersonController.java
View File

@@ -129,7 +129,11 @@ public class OutSidePersonController extends BaseController {
Map<String, Object> person = (Map<String, Object>) dataDetail.getRecords().get(0);
Object approveStatus = person.get("approveStatus");
if (approveStatus != null && !"0".equals(String.valueOf(approveStatus))) {
// 审批中和已审批 状态的单据为审批异常状态
if (approveStatus != null &&
("1".equals(String.valueOf(approveStatus))||
"2".equals(String.valueOf(approveStatus)))
) {
invalidNames.add(String.valueOf(person.get("personName")));
continue;
}

2
jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/service/impl/DrillPlanServiceImpl.java
View File

@@ -39,7 +39,7 @@ public class DrillPlanServiceImpl implements IDrillPlanService {
private static final String WORK_NODE_NAME = "下发演练计划";
private static final String WORK_FLOW_NAME = "演练计划信息";
// TODO 待办跳转链接,这个以后需要优化，通过配置去取这个链接，不能写死在这里
private static final String RISK_PC_URL = "/yljg/table/view/1966394259751907330";
private static final String RISK_PC_URL = "/yayl/table/view/1966394259751907330";
private static final String WORK_STATUS_TODO = "0";
private static final String WORK_STATUS_DONE = "2";
private static final String WORK_STATUS_COMPLETE = "4";