diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java b/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java index 833365a..f078488 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java @@ -45,6 +45,7 @@ import com.chinaweal.aiccs.common.util.FlowUtil; import com.chinaweal.aiccs.common.util.HolidaysUtil; import com.chinaweal.aiccs.common.util.StringUtils; import com.chinaweal.aiccs.org.entity.OrgUnits; +import com.chinaweal.aiccs.org.service.AicorgService; import com.chinaweal.aiccs.org.service.TUsersService; import com.chinaweal.aiccs.outside.service.SMSServiceImpl; import com.chinaweal.aiccs.outside.service.TfRevokeServicelmpl; @@ -121,6 +122,8 @@ public class TaskController extends BaseController { private ITSUsualInspectService itsUsualInspectService; @Resource private ITSSueInspectService iTSSueInspectService; + @Autowired + private AicorgService aicorgService; /** * 代办分页 @@ -240,7 +243,7 @@ public class TaskController extends BaseController { if (customParamMap != null && customParamMap.get("type") != null && "repair".equals(customParamMap.get("type"))) { //处理年报申请过来的信用修复待办 AICUser aicUser = getLoginUser(request); - customParamMap.put("areaCode", aicUser.getRegionID()); + //倒计时工作日开关 boolean isGzrNum = customParamMap.containsKey("gzrNumSwitch") && (boolean)customParamMap.get("gzrNumSwitch"); if (isGzrNum) { int gzrNum = (int) customParamMap.get("gzrNum"); @@ -254,6 +257,31 @@ public class TaskController extends BaseController { customParamMap.put("gzrEndDate", gzrEndDate.format(formatter)); } } + //是否显示下级单位的待办 + boolean isChildUnit = customParamMap.containsKey("childUnitSwitch") && (boolean)customParamMap.get("childUnitSwitch"); + if (isChildUnit) { //查下级待办 + customParamMap.put("checkChildUnit","1"); + //这一步进行判断,且允许上级办理下级的信用修复 + Map map = new HashMap<>(); + map.put("orgNumber", aicUser.getRegionID()); + map.put("deleted", "0"); + map.put("unittype", "1"); + OrgUnits org = aicorgService.queryByOrgNumberMap(map); + Integer orgLevel = org.getOrgLevel(); + //根据机构等级判断 + if (orgLevel == 1) { //省局 + customParamMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 2)+"%"); + } else if (orgLevel == 2) { //市局 + customParamMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 4)+"%"); + } else if (orgLevel == 3) { //区局 + customParamMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 6)+"%"); + } else if (orgLevel >= 4) { //所 + customParamMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 6)+"%"); + } + } else { + customParamMap.put("checkChildUnit","0"); + customParamMap.put("areaCode", aicUser.getRegionID()); + } } // 获取待办分页 diff --git a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml index 783bf08..4d07a90 100644 --- a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml +++ b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml @@ -375,7 +375,19 @@ and ( m.SIGNUSERID = #{customParamMap.userId} - or (m.area_code = #{customParamMap.areaCode} AND m.currentNodeOrBizStatus = 'exptlistEnter' AND m.SIGNUSERID IS null) + or (m.currentNodeOrBizStatus = 'exptlistEnter' AND m.SIGNUSERID IS null + + + AND m.area_code = #{customParamMap.areaCode} + + + AND m.area_code like #{customParamMap.areaCode} + + + AND m.area_code = #{customParamMap.areaCode} + + + ) or exists (select 1 from tsrefgroupanduser tg where tg.GROUPID = m.ACCEPTGROUPID and tg.USERID = #{customParamMap.userId}))