隐患检查

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/controller/CheckRecordController.java

@@ -125,4 +125,13 @@ public class CheckRecordController extends BasicController {
     public ExecutedResult<PagerResult<CheckRecordVO>> search(@RequestBody SearchCheckRecord request) {
         return this.service.search(request);
     }
+
+    /**
+     * 我的隐患检查
+     * @author lin.liu
+     */
+    @PostMapping(value = "listMine")
+    public ExecutedResult<PagerResult<CheckRecordVO>> listMine(@RequestBody SearchCheckRecord request) {
+        return this.service.search(request);
+    }
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/search/SearchCheckRecord.java

@@ -27,7 +27,7 @@ public class SearchCheckRecord extends SearchBasicDTO {
 	/**
 	 * 所属部门
 	 */
-	private List<String> listDepartment;
+	private List<Long> listDepartment;
 	/**
 	 * 关区代码
 	 */

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/mapper/impl/CheckRecordMapperImpl.java

@@ -68,13 +68,7 @@ public class CheckRecordMapperImpl extends BasicMapper<CheckRecordPO> {
         queryWrapper.in(ListUtil.isNotNullOrEmpty(search.getListDangerCategory()), CheckRecordPO::getDangerCategory, search.getListDangerCategory());
         // 所属部门
         queryWrapper.in(ListUtil.isNotNullOrEmpty(search.getListDepartment()), CheckRecordPO::getDepartment, search.getListDepartment());
-        if (ListUtil.isNotNullOrEmpty(search.getListDepartment())) {
-            queryWrapper.and(q -> {
-                for (String dept : search.getListDepartment()) {
-                    q.or().like(CheckRecordPO::getDepartment, "#" + dept + "#");
-                }
-            });
-        }
+
         // 关区代码
         queryWrapper.like(StringUtil.isNotNullOrEmpty(search.getCustoms()), CheckRecordPO::getCustoms, search.getCustoms());
         // 检查时间-起始
@@ -84,7 +78,7 @@ public class CheckRecordMapperImpl extends BasicMapper<CheckRecordPO> {
         // 检查人员
         queryWrapper.like(StringUtil.isNotNullOrEmpty(search.getCheckPerson()), CheckRecordPO::getCheckPerson, search.getCheckPerson());
         // 是否有隐患
-        queryWrapper.eq(NumericUtil.tryParseInt(search.getHasDanger()).compareTo(0) > 0, CheckRecordPO::getHasDanger, search.getHasDanger());
+        queryWrapper.eq(NumericUtil.tryParseInt(search.getHasDanger()).compareTo(0) > -1, CheckRecordPO::getHasDanger, search.getHasDanger());
 
         // 排序处理
         if (ListUtil.isNotNullOrEmpty(search.getOrderBy())) {

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/mapper/impl/GridPersonMapperImpl.java

@@ -119,4 +119,10 @@ public class GridPersonMapperImpl extends BasicMapper<GridPersonPO> {
         where.eq(GridPersonPO::getUserGuid, userGuid);
         return mapper.selectMaps(where).stream().map(c -> NumericUtil.tryParseLong(c.get("GRID_ID"))).collect(Collectors.toList());
     }
+
+    public List<GridPersonPO> listGridInfo4User(String userGuid) {
+        LambdaQueryWrapper<GridPersonPO> where = super.getQuery();
+        where.eq(GridPersonPO::getUserGuid, userGuid);
+        return mapper.selectList(where);
+    }
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/service/CheckRecordService.java

@@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.customs.cq.datacenter.business.domain.CheckRecordPO;
 import com.customs.cq.datacenter.business.domain.DangerCheckFormPO;
 import com.customs.cq.datacenter.business.domain.GridInfoPO;
+import com.customs.cq.datacenter.business.domain.GridPersonPO;
 import com.customs.cq.datacenter.business.domain.vo.CheckRecordVO;
 import com.customs.cq.datacenter.business.entity.request.checkrecord.ReqCreateCheckRecord;
 import com.customs.cq.datacenter.business.entity.request.checkrecord.ReqModifyCheckRecord;
@@ -97,7 +98,7 @@ public class CheckRecordService extends BasicService {
         DangerCheckFormPO form = dangerCheckFormService.check4IdExc(request.getCheckFormId());
         // 数据字典 - 关区代码
         Map<String, String> mapDicData = dictDataMapper.map4Type("sys_customs_code");
-        if (mapDicData.containsKey(request.getCustoms())) {
+        if (!mapDicData.containsKey(request.getCustoms())) {
             return ExecutedResult.failed("关区代码不存在." + request.getCustoms());
         }
 
@@ -209,82 +210,6 @@ public class CheckRecordService extends BasicService {
         return ExecutedResult.success(result);
     }
 
-//    public ExecutedResult<String> stop(Long id) {
-//        // 验证记录是否存在
-//        ExecutedResult<CheckRecordPO> checkExists = this.check4Id(id);
-//        if (checkExists.isFailed()) {
-//            return ExecutedResult.failed(checkExists.getMsg());
-//        }
-//        CheckRecordPO item = new CheckRecordPO();
-//        item.setId(id);
-//        item.setStatus(EState.DISABLED.getValue());
-//
-//       int result = this.dao.updateById(item);
-//       if (result != 1) {
-//           return ExecutedResult.failed("停用[隐患检查记录]失败。");
-//       }
-//       return ExecutedResult.success();
-//   }
-//
-//    public ExecutedResult<String> enable(Long id) {
-//        // 验证记录是否存在
-//        ExecutedResult<CheckRecordPO> checkExists = this.check4Id(id);
-//        if (checkExists.isFailed()) {
-//            return ExecutedResult.failed(checkExists.getMsg());
-//        }
-//        CheckRecordPO item = new CheckRecordPO();
-//        item.setId(id);
-//        item.setStatus(EState.NORMAL.getValue());
-//
-//        int result = this.dao.updateById(item);
-//        if (result != 1) {
-//            return ExecutedResult.failed("启用[隐患检查记录]失败。");
-//        }
-//        return ExecutedResult.success();
-//    }
-//
-//    public ExecutedResult<String> setSort(ReqSetSort request) {
-//        // 验证记录是否存在
-//        ExecutedResult<CheckRecordPO> checkExists = this.check4Id(request.getId());
-//        if (checkExists.isFailed()) {
-//            return ExecutedResult.failed(checkExists.getMsg());
-//        }
-//        CheckRecordPO item = new CheckRecordPO();
-//        item.setId(request.getId());
-//        item.setSort(request.getSort());
-//
-//        int result = this.dao.updateById(item);
-//        if (result != 1) {
-//            return ExecutedResult.failed("设置[隐患检查记录]排序值失败。");
-//        }
-//        return ExecutedResult.success();
-//    }
-//
-//    public ExecutedResult<String> remove(Long id) {
-//        // 验证记录是否存在
-//        ExecutedResult<CheckRecordPO> checkExists = this.check4Id(request.getId());
-//        if (checkExists.isFailed()) {
-//            return ExecutedResult.failed(checkExists.getMsg());
-//        }
-//        CheckRecordPO item = new CheckRecordPO();
-//        item.setId(request.getId());
-//        item.setIsDelete(EYesOrNo.Yes.getValue());
-//
-//        int result = this.dao.updateById(item);
-//        if (result != 1) {
-//            return ExecutedResult.failed("设置[隐患检查记录]排序值失败。");
-//        }
-//        return ExecutedResult.success();
-//    }
-//
-//    public ExecutedResult<String> removeList(List<Long> ids) {
-//        Boolean result = this.dao.removeByListId(ids);
-//        if (BooleanUtils.isFalse(result)) {
-//            return ExecutedResult.failed("删除[隐患检查记录]失败。");
-//        }
-//        return ExecutedResult.success();
-//    }
-
     public ExecutedResult<List<CheckRecordVO>> getList(List<Long> listId) {
         List<CheckRecordVO> result = new ArrayList<>();
 
@@ -296,6 +221,12 @@ public class CheckRecordService extends BasicService {
     }
 
     public ExecutedResult<PagerResult<CheckRecordVO>> search(SearchCheckRecord search) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        // 获取用户
+        SysUser user = userMapper.selectUserById(Long.parseLong(loginUser.getLoginId()));
+        // 获取网格员信息
+        List<GridPersonPO> listGrid = gridPersonMapper.listGridInfo4User(user.getUserGuid());
+
         // 处理创建时间范围-查询参数
         Tuple<String, String> createTimeRange = ParameterUtil.getTimeRange(search.getCreateTimeRange());
         if (StringUtil.isNotNullOrEmpty(createTimeRange.getItem1())) {
@@ -304,6 +235,14 @@ public class CheckRecordService extends BasicService {
         if (StringUtil.isNotNullOrEmpty(createTimeRange.getItem2())) {
             search.setCreateTimeEnd(LocalDateTimeUtil.getTimeStamp(createTimeRange.getItem2()).getTime());
         }
+        // 处理检查时间范围-查询参数
+        Tuple<String, String> checkTimeRange = ParameterUtil.getTimeRange(search.getCheckTimeRange());
+        if (StringUtil.isNotNullOrEmpty(checkTimeRange.getItem1())) {
+            search.setCheckTimeStart(LocalDateTimeUtil.getTimeStamp(checkTimeRange.getItem1()).getTime());
+        }
+        if (StringUtil.isNotNullOrEmpty(checkTimeRange.getItem2())) {
+            search.setCheckTimeEnd(LocalDateTimeUtil.getTimeStamp(checkTimeRange.getItem2()).getTime());
+        }
 
         IPage<CheckRecordPO> pageList = dao.search(search);
         List<CheckRecordVO> listVo = new ArrayList<>();
@@ -329,6 +268,9 @@ public class CheckRecordService extends BasicService {
         SysUser user = userMapper.selectById(userId);
         // 用户所属网格列表
         List<Long> listGridId = gridPersonMapper.listGrid4User(user.getUserGuid());
+        if (ListUtil.isNullOrEmpty(listGridId)) {
+            return ExecutedResult.success(new ArrayList<>());
+        }
         // 网格列表
         List<GridInfoPO> list = gridInfoMapper.selectBatchIds(listGridId);
         // 网格隐患分类列表

secure-producting-system/src/main/java/com/customs/cq/datacenter/system/service/SysLoginService.java

@@ -6,6 +6,8 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.customs.cq.datacenter.common.core.domain.entity.SysDept;
+import com.customs.cq.datacenter.system.mapper.SysDeptMapper;
 import com.customs.cq.datacenter.system.mapper.SysUserMapper;
 import com.customs.cq.datacenter.common.constant.CacheConstants;
 import com.customs.cq.datacenter.common.constant.Constants;
@@ -29,12 +31,14 @@ import com.customs.cq.datacenter.common.utils.redis.RedisUtils;
 import com.customs.cq.datacenter.common.utils.spring.SpringUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Supplier;
 
 /**
@@ -46,6 +50,8 @@ import java.util.function.Supplier;
 @Slf4j
 @Service
 public class SysLoginService {
+    @Autowired
+    private SysDeptMapper deptMapper;
 
     private final SysUserMapper userMapper;
     private final ISysConfigService configService;
@@ -332,7 +338,15 @@ public class SysLoginService {
         loginUser.setUserType(user.getUserType());
         loginUser.setMenuPermission(permissionService.getMenuPermission(user));
         loginUser.setRolePermission(permissionService.getRolePermission(user));
-        loginUser.setDeptName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName());
+        loginUser.setDeptName("");
+        if (Objects.isNull(user.getDept())) {
+            SysDept dept = deptMapper.selectById(user.getDeptId());
+            if (Objects.nonNull(dept)) {
+                loginUser.setDeptName(dept.getDeptName());
+            }
+        } else {
+            loginUser.setDeptName(user.getDept().getDeptName());
+        }
         List<RoleDTO> roles = BeanUtil.copyToList(user.getRoles(), RoleDTO.class);
         loginUser.setRoles(roles);
         return loginUser;