|
@@ -24,38 +24,31 @@ package com.customs.cq.datacenter.business.service;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.toolkit.Sequence;
|
|
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.*;
|
|
|
|
+import com.customs.cq.datacenter.business.domain.bo.GridCheckFormBo;
|
|
import com.customs.cq.datacenter.business.domain.vo.CheckRecordVO;
|
|
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.ReqCreateCheckRecord;
|
|
-import com.customs.cq.datacenter.business.entity.request.checkrecord.ReqModifyCheckRecord;
|
|
|
|
import com.customs.cq.datacenter.business.entity.request.checkrecorditem.ReqCreateCheckRecordItem;
|
|
import com.customs.cq.datacenter.business.entity.request.checkrecorditem.ReqCreateCheckRecordItem;
|
|
import com.customs.cq.datacenter.business.entity.response.check.ResListGrid4User;
|
|
import com.customs.cq.datacenter.business.entity.response.check.ResListGrid4User;
|
|
import com.customs.cq.datacenter.business.entity.search.SearchCheckRecord;
|
|
import com.customs.cq.datacenter.business.entity.search.SearchCheckRecord;
|
|
-import com.customs.cq.datacenter.business.mapper.impl.CheckRecordMapperImpl;
|
|
|
|
-import com.customs.cq.datacenter.business.mapper.impl.DangerCheckFormMapperImpl;
|
|
|
|
-import com.customs.cq.datacenter.business.mapper.impl.GridInfoMapperImpl;
|
|
|
|
-import com.customs.cq.datacenter.business.mapper.impl.GridPersonMapperImpl;
|
|
|
|
|
|
+import com.customs.cq.datacenter.business.mapper.impl.*;
|
|
import com.customs.cq.datacenter.common.ExecutedResult;
|
|
import com.customs.cq.datacenter.common.ExecutedResult;
|
|
import com.customs.cq.datacenter.common.PagerResult;
|
|
import com.customs.cq.datacenter.common.PagerResult;
|
|
import com.customs.cq.datacenter.common.constant.Constants;
|
|
import com.customs.cq.datacenter.common.constant.Constants;
|
|
import com.customs.cq.datacenter.common.core.domain.entity.SysUser;
|
|
import com.customs.cq.datacenter.common.core.domain.entity.SysUser;
|
|
import com.customs.cq.datacenter.common.core.domain.model.LoginUser;
|
|
import com.customs.cq.datacenter.common.core.domain.model.LoginUser;
|
|
import com.customs.cq.datacenter.common.core.service.BasicService;
|
|
import com.customs.cq.datacenter.common.core.service.BasicService;
|
|
-import com.customs.cq.datacenter.common.enums.ECheckFormStatus;
|
|
|
|
-import com.customs.cq.datacenter.common.enums.ECheckResult;
|
|
|
|
-import com.customs.cq.datacenter.common.enums.EResultCode;
|
|
|
|
-import com.customs.cq.datacenter.common.enums.EYesOrNo;
|
|
|
|
|
|
+import com.customs.cq.datacenter.common.enums.*;
|
|
import com.customs.cq.datacenter.common.exception.ServiceException;
|
|
import com.customs.cq.datacenter.common.exception.ServiceException;
|
|
import com.customs.cq.datacenter.common.helper.LoginHelper;
|
|
import com.customs.cq.datacenter.common.helper.LoginHelper;
|
|
import com.customs.cq.datacenter.common.model.Tuple;
|
|
import com.customs.cq.datacenter.common.model.Tuple;
|
|
import com.customs.cq.datacenter.common.utils.*;
|
|
import com.customs.cq.datacenter.common.utils.*;
|
|
import com.customs.cq.datacenter.system.mapper.SysDictDataMapper;
|
|
import com.customs.cq.datacenter.system.mapper.SysDictDataMapper;
|
|
import com.customs.cq.datacenter.system.mapper.SysUserMapper;
|
|
import com.customs.cq.datacenter.system.mapper.SysUserMapper;
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
@@ -69,11 +62,14 @@ import java.util.stream.Collectors;
|
|
* @author lin.liu
|
|
* @author lin.liu
|
|
* @description 隐患检查记录
|
|
* @description 隐患检查记录
|
|
*/
|
|
*/
|
|
|
|
+@Slf4j
|
|
@Service
|
|
@Service
|
|
public class CheckRecordService extends BasicService {
|
|
public class CheckRecordService extends BasicService {
|
|
@Autowired
|
|
@Autowired
|
|
private CheckRecordMapperImpl dao;
|
|
private CheckRecordMapperImpl dao;
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private CheckRecordItemMapperImpl checkRecordItemMapper;
|
|
|
|
+ @Autowired
|
|
private SysDictDataMapper dictDataMapper;
|
|
private SysDictDataMapper dictDataMapper;
|
|
@Autowired
|
|
@Autowired
|
|
private GridInfoMapperImpl gridInfoMapper;
|
|
private GridInfoMapperImpl gridInfoMapper;
|
|
@@ -82,6 +78,8 @@ public class CheckRecordService extends BasicService {
|
|
@Autowired
|
|
@Autowired
|
|
private DangerCheckFormMapperImpl checkFormMapper;
|
|
private DangerCheckFormMapperImpl checkFormMapper;
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private DangerCheckItemMapperImpl checkItemMapper;
|
|
|
|
+ @Autowired
|
|
private SysUserMapper userMapper;
|
|
private SysUserMapper userMapper;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -91,11 +89,12 @@ public class CheckRecordService extends BasicService {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- public ExecutedResult<Long> create(ReqCreateCheckRecord request) {
|
|
|
|
- // 检验网格
|
|
|
|
- GridInfoPO grid = gridInfoService.check4IdExc(request.getGridId());
|
|
|
|
- // 校验隐患检查单
|
|
|
|
- DangerCheckFormPO form = dangerCheckFormService.check4IdExc(request.getCheckFormId());
|
|
|
|
|
|
+ public ExecutedResult<String> submit(ReqCreateCheckRecord request) {
|
|
|
|
+ // 校验检查记录
|
|
|
|
+ ExecutedResult<CheckRecordPO> checkRecord = this.check4Id(request.getId());
|
|
|
|
+ if (checkRecord.isFailed()) {
|
|
|
|
+ return ExecutedResult.failed(checkRecord.getMsg());
|
|
|
|
+ }
|
|
// 数据字典 - 关区代码
|
|
// 数据字典 - 关区代码
|
|
Map<String, String> mapDicData = dictDataMapper.map4Type("sys_customs_code");
|
|
Map<String, String> mapDicData = dictDataMapper.map4Type("sys_customs_code");
|
|
if (!mapDicData.containsKey(request.getCustoms())) {
|
|
if (!mapDicData.containsKey(request.getCustoms())) {
|
|
@@ -112,26 +111,12 @@ public class CheckRecordService extends BasicService {
|
|
|
|
|
|
// 转换po
|
|
// 转换po
|
|
CheckRecordPO item = CopierUtil.mapTo(request, CheckRecordPO.class);
|
|
CheckRecordPO item = CopierUtil.mapTo(request, CheckRecordPO.class);
|
|
- // 设置主键
|
|
|
|
- item.setId(new Sequence(null).nextId());
|
|
|
|
- // 检查单号
|
|
|
|
- item.setCheckFormNo("CK" + LocalDateTimeUtil.toFormatString(LocalDateTime.now(), "yyyyMMddHHmmssSSS") + RandVerifyCode.complexCode(6));
|
|
|
|
- // 检查表名称
|
|
|
|
- item.setCheckFormName(form.getName());
|
|
|
|
- // 所属部门
|
|
|
|
- item.setDepartment(loginUser.getDeptId().toString());
|
|
|
|
- // 部门名称
|
|
|
|
- item.setDepartmentName(loginUser.getDeptName());
|
|
|
|
// 关区名称
|
|
// 关区名称
|
|
item.setCustomsName(mapDicData.get(request.getCustoms()));
|
|
item.setCustomsName(mapDicData.get(request.getCustoms()));
|
|
// 检查时间
|
|
// 检查时间
|
|
item.setCheckTime(LocalDateTimeUtil.getTimeStamp(request.getCheckTime(), Constants.STR_DATE).getTime());
|
|
item.setCheckTime(LocalDateTimeUtil.getTimeStamp(request.getCheckTime(), Constants.STR_DATE).getTime());
|
|
// 检查人员
|
|
// 检查人员
|
|
item.setCheckPerson(loginUser.getUserId().toString());
|
|
item.setCheckPerson(loginUser.getUserId().toString());
|
|
- // 网格类型
|
|
|
|
- item.setGridCategory(grid.getGridCategory());
|
|
|
|
- // 隐患分类
|
|
|
|
- item.setDangerCategory(grid.getDangerCategory());
|
|
|
|
// 附件列表
|
|
// 附件列表
|
|
item.setAttachmentList("");
|
|
item.setAttachmentList("");
|
|
if (ListUtil.isNotNullOrEmpty(request.getListAttachment())) {
|
|
if (ListUtil.isNotNullOrEmpty(request.getListAttachment())) {
|
|
@@ -171,35 +156,49 @@ public class CheckRecordService extends BasicService {
|
|
if (Objects.equals(request.getIsSubmit(), EYesOrNo.YES.getValue())) {
|
|
if (Objects.equals(request.getIsSubmit(), EYesOrNo.YES.getValue())) {
|
|
item.setStatus(ECheckFormStatus.SUBMITTED.getValue());
|
|
item.setStatus(ECheckFormStatus.SUBMITTED.getValue());
|
|
}
|
|
}
|
|
- // 设置记录创建时间
|
|
|
|
- item.setCreateTime(now);
|
|
|
|
- // 是否删除(逻辑删除)初始值
|
|
|
|
- item.setIsDelete(EYesOrNo.NO.getValue());
|
|
|
|
- // 创建人信息
|
|
|
|
- item.setCreateBy(loginUser.getUserId().toString());
|
|
|
|
- item.setCreateByName(loginUser.getUsername());
|
|
|
|
-
|
|
|
|
- int result = this.dao.insert(item);
|
|
|
|
- if (result != 1) {
|
|
|
|
- return ExecutedResult.failed("创建[隐患检查记录]失败。");
|
|
|
|
|
|
+ // 修改人信息
|
|
|
|
+ item.setUpdateBy(loginUser.getUserId().toString());
|
|
|
|
+ item.setUpdateByName(loginUser.getUsername());
|
|
|
|
+ item.setUpdateTime(LocalDateTimeUtil.getTimeStamp(now));
|
|
|
|
+
|
|
|
|
+ // 构建检查项列表
|
|
|
|
+ List<CheckRecordItemPO> listItem = request.getListItem().stream().map(c -> {
|
|
|
|
+ CheckRecordItemPO checkItem = new CheckRecordItemPO();
|
|
|
|
+ checkItem.setId(c.getId());
|
|
|
|
+ checkItem.setCustoms(item.getCustoms());
|
|
|
|
+ checkItem.setCustomsName(item.getCustomsName());
|
|
|
|
+ checkItem.setCheckTime(item.getCheckTime());
|
|
|
|
+ checkItem.setCheckPerson(item.getCheckPerson());
|
|
|
|
+ checkItem.setRectifyStatus(c.getCheckResult());
|
|
|
|
+ checkItem.setDangerDescription(c.getDangerDescription());
|
|
|
|
+ checkItem.setRectifyPlan(c.getRectifyPlan());
|
|
|
|
+ checkItem.setRectifyDeadline(c.getRectifyDeadline());
|
|
|
|
+ checkItem.setRectifyStatus(ERectifyStatus.NONE.getValue());
|
|
|
|
+ if (StringUtil.isNotNullOrEmpty(c.getRectifyPlan())) {
|
|
|
|
+ checkItem.setRectifySubmitTime(now);
|
|
|
|
+ checkItem.setRectifyStatus(ERectifyStatus.WAITING.getValue());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return checkItem;
|
|
|
|
+ }).collect(Collectors.toList());
|
|
|
|
+
|
|
|
|
+ try {
|
|
|
|
+ this.submitCheckRecord(item, listItem);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ return ExecutedResult.failed("提交检查单失败." + e.getMessage());
|
|
}
|
|
}
|
|
- return ExecutedResult.success(item.getId());
|
|
|
|
|
|
+ return ExecutedResult.success();
|
|
}
|
|
}
|
|
-
|
|
|
|
- public ExecutedResult<String> modify(ReqModifyCheckRecord request) {
|
|
|
|
- // 验证记录是否存在
|
|
|
|
- ExecutedResult<CheckRecordPO> checkExists = this.check4Id(request.getId());
|
|
|
|
- if (checkExists.isFailed()) {
|
|
|
|
- return ExecutedResult.failed(checkExists.getMsg());
|
|
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
|
+ private void submitCheckRecord(CheckRecordPO item, List<CheckRecordItemPO> listItem) throws Exception {
|
|
|
|
+ boolean updateCheckItem = checkRecordItemMapper.update(listItem);
|
|
|
|
+ if (!updateCheckItem) {
|
|
|
|
+ throw new Exception("更新检查项失败");
|
|
}
|
|
}
|
|
- // 转换po
|
|
|
|
- CheckRecordPO item = CopierUtil.mapTo(request, CheckRecordPO.class);
|
|
|
|
-
|
|
|
|
- int result = this.dao.updateById(item);
|
|
|
|
|
|
+ int result = dao.updateById(item);
|
|
if (result != 1) {
|
|
if (result != 1) {
|
|
- return ExecutedResult.failed("编辑[隐患检查记录]失败。");
|
|
|
|
|
|
+ throw new Exception("更新检查记录失败");
|
|
}
|
|
}
|
|
- return ExecutedResult.success();
|
|
|
|
}
|
|
}
|
|
|
|
|
|
public ExecutedResult<CheckRecordVO> get(Long id) {
|
|
public ExecutedResult<CheckRecordVO> get(Long id) {
|
|
@@ -287,7 +286,8 @@ public class CheckRecordService extends BasicService {
|
|
// 网格隐患分类列表
|
|
// 网格隐患分类列表
|
|
Map<Long, DangerCheckFormPO> mapForm = checkFormMapper.map4DangerCategory(list.stream().map(GridInfoPO::getDangerCategory).collect(Collectors.toList()));
|
|
Map<Long, DangerCheckFormPO> mapForm = checkFormMapper.map4DangerCategory(list.stream().map(GridInfoPO::getDangerCategory).collect(Collectors.toList()));
|
|
// 网格今日隐患检查记录
|
|
// 网格今日隐患检查记录
|
|
- List<Long> listTodayFinishGridId = dao.checkToday4Grid(listGridId);
|
|
|
|
|
|
+ List<GridCheckFormBo> listTodayFinishGridId = dao.checkToday4Grid(listGridId);
|
|
|
|
+ Map<Long, GridCheckFormBo> map4Grid = listTodayFinishGridId.stream().collect(Collectors.toMap(GridCheckFormBo::getGridId, c -> c));
|
|
List<ResListGrid4User> listVo = list.stream().map(c -> {
|
|
List<ResListGrid4User> listVo = list.stream().map(c -> {
|
|
DangerCheckFormPO form = mapForm.get(c.getDangerCategory());
|
|
DangerCheckFormPO form = mapForm.get(c.getDangerCategory());
|
|
|
|
|
|
@@ -300,10 +300,146 @@ public class CheckRecordService extends BasicService {
|
|
item.setCheckFormId(form.getId());
|
|
item.setCheckFormId(form.getId());
|
|
item.setCheckFormName(form.getName());
|
|
item.setCheckFormName(form.getName());
|
|
}
|
|
}
|
|
- item.setCheckStatus(listTodayFinishGridId.contains(c.getId()) ? 1 : 0);
|
|
|
|
|
|
+ item.setCheckStatus(ECheckFormStatus.WAITING.getValue());
|
|
|
|
+ if (map4Grid.containsKey(c.getId())) {
|
|
|
|
+ item.setCheckStatus(map4Grid.get(c.getId()).getStatus());
|
|
|
|
+ }
|
|
|
|
|
|
return item;
|
|
return item;
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
return ExecutedResult.success(listVo);
|
|
return ExecutedResult.success(listVo);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 指定日期生成待检记录
|
|
|
|
+ * @param date 指定日期
|
|
|
|
+ */
|
|
|
|
+ public void initCheckRecord(String date) {
|
|
|
|
+ // 获取所有隐患检查表
|
|
|
|
+ List<DangerCheckFormPO> listForm = checkFormMapper.selectList(null);
|
|
|
|
+ // 获取所有隐患检查表-检查项
|
|
|
|
+ List<DangerCheckItemPO> listCheckItem = checkItemMapper.selectList(null);
|
|
|
|
+ Map<Long, List<DangerCheckItemPO>> mapCheckItem4Form = listCheckItem.stream().collect(Collectors.groupingBy(DangerCheckItemPO::getCheckFormId));
|
|
|
|
+
|
|
|
|
+ // 检查单按隐患分类分组
|
|
|
|
+ Map<Long, DangerCheckFormPO> mapForm4DangerCategory = listForm.stream().collect(Collectors.toMap(DangerCheckFormPO::getDangerCategory, c -> c));
|
|
|
|
+
|
|
|
|
+ // 获取所有网格
|
|
|
|
+ List<GridInfoPO> listGrid = gridInfoMapper.selectList(null);
|
|
|
|
+
|
|
|
|
+ // 遍历网格
|
|
|
|
+ for (GridInfoPO grid : listGrid) {
|
|
|
|
+ // 指定网格的所有网格员
|
|
|
|
+ if (!mapForm4DangerCategory.containsKey(grid.getDangerCategory())) {
|
|
|
|
+ log.warn("指定日期生成待检记录, 此网格分类没有配置隐患检查表!{}", (grid.getGridName() + " - " + grid.getDangerCategory()));
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ // 今日是否已生成检查记录
|
|
|
|
+ Long count4Date = dao.checkDate4Grid(grid.getId(), date);
|
|
|
|
+ if (count4Date.compareTo(0L) > 0) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ DangerCheckFormPO form = mapForm4DangerCategory.get(grid.getDangerCategory());
|
|
|
|
+
|
|
|
|
+ Long now = LocalDateTimeUtil.nowTimeStamp();
|
|
|
|
+
|
|
|
|
+ // 生成待检记录
|
|
|
|
+ CheckRecordPO item = new CheckRecordPO();
|
|
|
|
+ // 设置主键
|
|
|
|
+ item.setId(new Sequence(null).nextId());
|
|
|
|
+ // 检查单号
|
|
|
|
+ item.setCheckFormNo("CK" + LocalDateTimeUtil.toFormatString(LocalDateTime.now(), "yyyyMMddHHmmss") + RandVerifyCode.complexCode(6));
|
|
|
|
+ // 所属网格
|
|
|
|
+ item.setGridId(grid.getId());
|
|
|
|
+ // 所属检查表
|
|
|
|
+ item.setCheckFormId(form.getId());
|
|
|
|
+ // 检查表名称
|
|
|
|
+ item.setCheckFormName(form.getName());
|
|
|
|
+ // 所属部门
|
|
|
|
+ item.setDepartment(grid.getDepartment());
|
|
|
|
+ // 部门名称
|
|
|
|
+ item.setDepartmentName(grid.getDepartmentName());
|
|
|
|
+ // 所属关区
|
|
|
|
+ item.setCustoms("");
|
|
|
|
+ // 关区名称
|
|
|
|
+ item.setCustomsName("");
|
|
|
|
+ // 检查时间
|
|
|
|
+ item.setCheckTime(0L);
|
|
|
|
+ // 检查人员
|
|
|
|
+ item.setCheckPerson("");
|
|
|
|
+ // 检查人员名称
|
|
|
|
+ item.setCheckPersonName("");
|
|
|
|
+ // 联系方式
|
|
|
|
+ item.setContactInfo("");
|
|
|
|
+ // 网格类型
|
|
|
|
+ item.setGridCategory(grid.getGridCategory());
|
|
|
|
+ // 隐患分类
|
|
|
|
+ item.setDangerCategory(grid.getDangerCategory());
|
|
|
|
+ // 附件列表
|
|
|
|
+ item.setAttachmentList("");
|
|
|
|
+ // 是否有隐患
|
|
|
|
+ item.setHasDanger(EYesOrNo.NO.getValue());
|
|
|
|
+ // 是否已提供整改措施
|
|
|
|
+ item.setHasRectifyPlan(EYesOrNo.NO.getValue());
|
|
|
|
+ // 整改措施提交时间
|
|
|
|
+ item.setRectifySubmitTime(0L);
|
|
|
|
+ //整改期限
|
|
|
|
+ item.setRectifyDeadline(0L);
|
|
|
|
+ // 状态
|
|
|
|
+ item.setStatus(ECheckFormStatus.WAITING.getValue());
|
|
|
|
+ // 数据创建时间
|
|
|
|
+ item.setCreateTime(now);
|
|
|
|
+ // 数据创建人
|
|
|
|
+ item.setCreateBy("system");
|
|
|
|
+ item.setCreateByName("系统");
|
|
|
|
+ // 是否删除(逻辑删除)初始值
|
|
|
|
+ item.setIsDelete(EYesOrNo.NO.getValue());
|
|
|
|
+
|
|
|
|
+ // 生成检查单的检查项
|
|
|
|
+ List<CheckRecordItemPO> listItem = mapCheckItem4Form.get(form.getId()).stream().map(c -> {
|
|
|
|
+ CheckRecordItemPO checkItem = new CheckRecordItemPO();
|
|
|
|
+ checkItem.setCheckRecordId(item.getId());
|
|
|
|
+ checkItem.setGridId(grid.getId());
|
|
|
|
+ checkItem.setCheckFormId(form.getId());
|
|
|
|
+ checkItem.setCheckFormName(form.getName());
|
|
|
|
+ checkItem.setDepartment(grid.getDepartment());
|
|
|
|
+ checkItem.setDepartmentName(grid.getDepartmentName());
|
|
|
|
+ checkItem.setCustoms("");
|
|
|
|
+ checkItem.setCustomsName("");
|
|
|
|
+ checkItem.setItemName(c.getItemName());
|
|
|
|
+ checkItem.setCheckTime(0L);
|
|
|
|
+ checkItem.setCheckPerson("");
|
|
|
|
+ checkItem.setCheckResult(0);
|
|
|
|
+ checkItem.setDangerDescription("");
|
|
|
|
+ checkItem.setRectifyPlan("");
|
|
|
|
+ checkItem.setRectifySubmitTime(0L);
|
|
|
|
+ checkItem.setRectifyDeadline(0L);
|
|
|
|
+ checkItem.setRectifyStatus(ERectifyStatus.NONE.getValue());
|
|
|
|
+ checkItem.setRectifyTime(0L);
|
|
|
|
+ checkItem.setIsOnTime(EYesOrNo.NO.getValue());
|
|
|
|
+ checkItem.setRectifyPerson("");
|
|
|
|
+ checkItem.setRectifyPersonName("");
|
|
|
|
+ checkItem.setCreateTime(now);
|
|
|
|
+ checkItem.setIsDelete(EYesOrNo.NO.getValue());
|
|
|
|
+
|
|
|
|
+ return checkItem;
|
|
|
|
+ }).collect(Collectors.toList());
|
|
|
|
+ try {
|
|
|
|
+ this.initCheckRecord(item, listItem);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("初始化网格检查记录错误." + e.getMessage(), e);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
|
+ private void initCheckRecord(CheckRecordPO item, List<CheckRecordItemPO> listItem) throws Exception {
|
|
|
|
+ boolean insertCheckItem = checkRecordItemMapper.insert(listItem);
|
|
|
|
+ if (!insertCheckItem) {
|
|
|
|
+ throw new Exception("添加检查项失败");
|
|
|
|
+ }
|
|
|
|
+ int checkRecordRowCount = dao.insert(item);
|
|
|
|
+ if (checkRecordRowCount != 1) {
|
|
|
|
+ throw new Exception("添加检查记录失败");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|