|
|
@ -20,22 +20,25 @@ package com.elink.esua.epdc.service.impl; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
|
import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; |
|
|
|
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; |
|
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
|
import com.elink.esua.epdc.dao.CheckResultDao; |
|
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
|
import com.elink.esua.epdc.dao.*; |
|
|
|
import com.elink.esua.epdc.dto.CheckResultDTO; |
|
|
|
import com.elink.esua.epdc.entity.CheckResultEntity; |
|
|
|
import com.elink.esua.epdc.dto.form.HandleRecordsFormDTO; |
|
|
|
import com.elink.esua.epdc.entity.*; |
|
|
|
import com.elink.esua.epdc.redis.CheckResultRedis; |
|
|
|
import com.elink.esua.epdc.service.CheckResultService; |
|
|
|
import com.elink.esua.epdc.service.ViolationsRecordsImgsService; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
/** |
|
|
|
* 审核结果 |
|
|
@ -49,6 +52,21 @@ public class CheckResultServiceImpl extends BaseServiceImpl<CheckResultDao, Chec |
|
|
|
@Autowired |
|
|
|
private CheckResultRedis checkResultRedis; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private CheckRecordsDao checkRecordsDao; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private ViolationsRecordsDao violationsRecordsDao; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private CheckRecordsImgsDao checkRecordsImgsDao; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private ViolationsRecordsImgsDao violationsRecordsImgsDao; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private ViolationsRecordsImgsService violationsRecordsImgsService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageData<CheckResultDTO> page(Map<String, Object> params) { |
|
|
|
IPage<CheckResultEntity> page = baseDao.selectPage( |
|
|
@ -101,4 +119,42 @@ public class CheckResultServiceImpl extends BaseServiceImpl<CheckResultDao, Chec |
|
|
|
baseDao.deleteBatchIds(Arrays.asList(ids)); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result handleRecords(HandleRecordsFormDTO formDto) { |
|
|
|
//更新待审核记录信息
|
|
|
|
CheckRecordsEntity records = checkRecordsDao.selectById(formDto.getId()); |
|
|
|
records.setAuditTime(new Date()); |
|
|
|
records.setSuggestion(formDto.getResult()); |
|
|
|
checkRecordsDao.updateById(records); |
|
|
|
//保存审核记录
|
|
|
|
CheckResultEntity entity = new CheckResultEntity(); |
|
|
|
entity.setRecordId(formDto.getId()); |
|
|
|
entity.setResult(formDto.getResult()); |
|
|
|
String userId = null; |
|
|
|
if(null != SecurityUser.getUser()){ |
|
|
|
userId = SecurityUser.getUser().getId().toString(); |
|
|
|
} |
|
|
|
entity.setApproverId(userId); |
|
|
|
entity.setIsSend("N"); |
|
|
|
entity.setSuggestion(formDto.getSuggestion()); |
|
|
|
baseDao.insert(entity); |
|
|
|
if(CheckDataUtils.block.equals(formDto.getResult())){ |
|
|
|
ViolationsRecordsEntity violationEntity = ConvertUtils.sourceToTarget(records, ViolationsRecordsEntity.class); |
|
|
|
violationEntity.setDecision("2");//人工审核
|
|
|
|
violationsRecordsDao.insert(violationEntity); |
|
|
|
//保存图片
|
|
|
|
List<ViolationsRecordsImgsEntity> vioImgList = new ArrayList<>(); |
|
|
|
List<CheckRecordsImgsEntity> recordImgs = checkRecordsImgsDao.selectListByRecordId(records.getId()); |
|
|
|
for(CheckRecordsImgsEntity recordImg : recordImgs){ |
|
|
|
ViolationsRecordsImgsEntity vioImgEntity = new ViolationsRecordsImgsEntity(); |
|
|
|
vioImgEntity.setReferenceId(violationEntity.getId()); |
|
|
|
vioImgEntity.setUrl(recordImg.getUrl()); |
|
|
|
vioImgEntity.setSort(recordImg.getSort()); |
|
|
|
vioImgList.add(vioImgEntity); |
|
|
|
} |
|
|
|
violationsRecordsImgsService.insertBatch(vioImgList); |
|
|
|
} |
|
|
|
return new Result<>().ok("处理成功"); |
|
|
|
} |
|
|
|
|
|
|
|
} |