Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java

@@ -19,12 +19,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.grid.service.IGridService;
@@ -34,6 +33,7 @@
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.task.dto.TaskLabelReportingEventDTO;
import org.springblade.modules.task.entity.TaskLabelReportingEventEntity;
import org.springblade.modules.task.excel.TaskLabelReportingEventExcel;
import org.springblade.modules.task.mapper.TaskLabelReportingEventMapper;
import org.springblade.modules.task.service.ITaskLabelReportingEventService;
import org.springblade.modules.task.service.ITaskService;
@@ -65,31 +65,10 @@

   @Override
   public IPage<TaskLabelReportingEventVO> selectTaskLabelReportingEventPage(IPage<TaskLabelReportingEventVO> page, TaskLabelReportingEventVO taskLabelReportingEvent) {
      String roleName = SpringUtils.getRequestParam("roleName");
      String communityCode = SpringUtils.getRequestParam("communityCode");
      if (!Strings.isBlank(communityCode)) {
         // 校验社区编号是否合规
         if (null != SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
            taskLabelReportingEvent.setCommunityCode(communityCode);
         }
      }
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      // 网格编号集合
      List<String> gridCodeList = new ArrayList<>();
      // 民警角色
      if (!Strings.isBlank(roleName)) {
         taskLabelReportingEvent.setRoleName(roleName);
         if (roleName.equals("mj")) {
            regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class).getCommunityCodeListByUserId(AuthUtil.getUserId());
         }
         if (roleName.equals("wgy")) {
            gridCodeList = SpringUtil.getBean(IGridService.class).getGridListByUserId(AuthUtil.getUserId());
         }
      }
      if (AuthUtil.getUserAccount().equals("18879306957")) {
         taskLabelReportingEvent.setCommunityCode("361102003027");
      }
      CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskLabelReportingEventVO.class,taskLabelReportingEvent);
      List<String> regionChildCodesList = commonParamSet.getRegionChildCodesList();
      Integer isAdministrator = commonParamSet.getIsAdministrator();
      List<String> gridCodeList = commonParamSet.getGridCodeList();
      return page.setRecords(baseMapper.selectTaskLabelReportingEventPage(page, taskLabelReportingEvent,regionChildCodesList,isAdministrator,gridCodeList));
   }

@@ -157,4 +136,18 @@
      return this.baseMapper.selectTaskLabelReportingEventList(taskLabelReportingEventDTO);
   }

   /**
    * 导出二手交易信息
    * @param taskLabelReportingEvent
    */
   @Override
   public List<TaskLabelReportingEventExcel> exportTaskLabelReportingEvent(TaskLabelReportingEventVO taskLabelReportingEvent) {
      // 公共参数设置
      CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskLabelReportingEventVO.class,taskLabelReportingEvent);
      return baseMapper.exportTaskLabelReportingEventList(taskLabelReportingEvent,
         commonParamSet.getRegionChildCodesList(),
         commonParamSet.getIsAdministrator(),
         commonParamSet.getGridCodeList());
   }

}