三色任务和自查任务

linwe

2024-08-07 06df33f156924c564c17b11fdb96c5bb298a810d

 src/main/java/org/springblade/modules/grid/service/impl/GridWorkLogServiceImpl.java

@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.entity.GridWorkLogEntity;
@@ -48,12 +49,15 @@

   @Override
   public IPage<GridWorkLogVO> selectGridWorkLogPage(IPage<GridWorkLogVO> page, GridWorkLogVO gridWorkLog) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
      if (!Strings.isBlank(gridWorkLog.getRoleName()) && gridWorkLog.getRoleName().equals("网格员")){
      CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(GridWorkLogVO.class,gridWorkLog);
      if (!Strings.isBlank(gridWorkLog.getRoleName()) && gridWorkLog.getRoleName().equals("wgy")){
         gridWorkLog.setGridId(getGridId());
      }
      return page.setRecords(baseMapper.selectGridWorkLogPage(page, gridWorkLog,regionChildCodesList,isAdministrator));
      return page.setRecords(baseMapper.selectGridWorkLogPage(page,
         gridWorkLog,
         commonParamSet.getRegionChildCodesList(),
         commonParamSet.getGridCodeList(),
         commonParamSet.getIsAdministrator()));
   }
   /**
    * 获取网格员id
@@ -71,12 +75,17 @@

   /**
    * 走访日志数量统计
    * @param gridId 网格id
    * @param gridCode 网格编号
    * @param status 状态
    * @return
    */
   @Override
   public Integer getGridWorkCountHandleCount(Integer gridId, Integer status) {
      return baseMapper.getGridWorkCountHandleCount(gridId,status);
   public Integer getGridWorkCountHandleCount(String gridCode, Integer status) {
      return baseMapper.getGridWorkCountHandleCount(gridCode,status);
   }

   @Override
   public GridWorkLogVO getDetail(GridWorkLogEntity gridWorkLog) {
      return baseMapper.getDetail(gridWorkLog);
   }
}