|
@@ -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);
|
|
|
// 网格隐患分类列表
|