diff --git a/mailbox-common/src/main/java/com/biutag/enums/DeptTypeEnum.java b/mailbox-common/src/main/java/com/biutag/enums/DeptTypeEnum.java index b59bd88..6ba9575 100644 --- a/mailbox-common/src/main/java/com/biutag/enums/DeptTypeEnum.java +++ b/mailbox-common/src/main/java/com/biutag/enums/DeptTypeEnum.java @@ -22,9 +22,9 @@ public enum DeptTypeEnum { // 三级机构领导 PCS_TYPE("5", "派出所"), // 二级机构领导 - DD_TYPE("6", "大队"); + DD_TYPE("6", "大队"), // 三级机构领导 - + OT_TYPE("7", "其他"); private String type; diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java b/mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java index 27ee0f5..6f95d8f 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java @@ -369,10 +369,9 @@ class DeptServiceImpl implements IDeptService { List dutySjList = null; List dutyPcsList = null; List dutyDdList = null; - + List dutyOtList = null; if (dept.getLevel()==2){ Duty duty = dutyMapper.selectOne(new QueryWrapper().eq("depart_id",deptId).last("limit 1")); - System.out.println("ddddddddddddddddd"+duty); if(duty==null){ } else if (duty.getDeptType().equals(DeptTypeEnum.FJ_TYPE.getType())){ dutyFjList = dataScreenMapper.getToFjDuty(DeptTypeEnum.FJ_TYPE.getType(), deptId); @@ -385,9 +384,11 @@ class DeptServiceImpl implements IDeptService { dutySjList = dataScreenMapper.getToDayDuty(DeptTypeEnum.SJ_TYPE.getType(), null); dutyPcsList = dataScreenMapper.getToDayDuty(DeptTypeEnum.PCS_TYPE.getType(), deptId); dutyDdList = dataScreenMapper.getToDayDuty(DeptTypeEnum.DD_TYPE.getType(), deptId); + dutyOtList = dataScreenMapper.getToDayDuty(DeptTypeEnum.OT_TYPE.getType(), deptId); map.put("dutySjList", dutySjList); map.put("dutyPcsList", dutyPcsList); map.put("dutyDdList", dutyDdList); + map.put("dutyOtList", dutyOtList); }else if (dept.getLevel()==3){ Duty duty = dutyMapper.selectOne(new QueryWrapper().eq("depart_id",dept.getPid()).last("limit 1")); @@ -409,6 +410,8 @@ class DeptServiceImpl implements IDeptService { dutyPcsList = dataScreenMapper.getToFjDuty(DeptTypeEnum.PCS_TYPE.getType(), deptId); }else if (dutyByDeptid.getDeptType().equals(DeptTypeEnum.DD_TYPE.getType())){ dutyPcsList = dataScreenMapper.getToFjDuty(DeptTypeEnum.DD_TYPE.getType(), deptId); + }else if (duty.getDeptType().equals(DeptTypeEnum.OT_TYPE.getType())){ + dutyPcsList = dataScreenMapper.getToFjDuty(DeptTypeEnum.OT_TYPE.getType(), deptId); } map.put("dutyPcsList", dutyPcsList); }