|
|
|
@ -33,11 +33,9 @@ import com.epmet.commons.tools.scan.param.ImgTaskDTO; |
|
|
|
import com.epmet.commons.tools.scan.param.TextScanParamDTO; |
|
|
|
import com.epmet.commons.tools.scan.param.TextTaskDTO; |
|
|
|
import com.epmet.commons.tools.scan.result.SyncScanResult; |
|
|
|
import com.epmet.commons.tools.security.dto.GovTokenDto; |
|
|
|
import com.epmet.commons.tools.security.user.LoginUserUtil; |
|
|
|
import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
|
import com.epmet.commons.tools.utils.DateUtils; |
|
|
|
import com.epmet.commons.tools.utils.Result; |
|
|
|
import com.epmet.commons.tools.utils.ScanContentUtils; |
|
|
|
import com.epmet.commons.tools.utils.*; |
|
|
|
import com.epmet.constant.ReadFlagConstant; |
|
|
|
import com.epmet.dto.form.*; |
|
|
|
import com.epmet.dto.result.UserResiInfoResultDTO; |
|
|
|
@ -73,6 +71,7 @@ import com.epmet.resi.group.dto.group.result.*; |
|
|
|
import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; |
|
|
|
import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; |
|
|
|
import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
@ -144,6 +143,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
@Autowired |
|
|
|
private LoginUserUtil loginUserUtil; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private CpUserDetailRedis sysUserInfoRedis; |
|
|
|
|
|
|
|
@Value("${openapi.scan.server.url}") |
|
|
|
private String scanApiUrl; |
|
|
|
|
|
|
|
@ -1258,4 +1260,74 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 工作端 查询组变更待审核列表 |
|
|
|
* @param param |
|
|
|
* @return |
|
|
|
* @author wangc |
|
|
|
* @date 2020.11.03 10:19 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public List<ApplyingGroupResultDTO> getEditAuditingList(CommonGridAndPageFormDTO param) { |
|
|
|
return Optional.ofNullable(PageHelper.startPage(null == param.getPageNo() ? NumConstant.ONE : param.getPageNo() , null == param.getPageSize() ? NumConstant.TWELVE : param.getPageSize()) |
|
|
|
.doSelectPage(() -> { |
|
|
|
groupEditSubmitRecordDao.selectGroupEditApplyList(param.getGridId());}).getResult()).orElse(new LinkedList<>()) |
|
|
|
.stream().map(o -> { return (ApplyingGroupResultDTO)o; }).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 查询小组修改信息的详情内容 不加事务！ |
|
|
|
* @param param |
|
|
|
* @return com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO |
|
|
|
* @author wangc |
|
|
|
* @date 2020.11.03 14:10 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public GroupEditionDetailResultDTO getEditAuditingDetail(GovGroupSummarizeFromDTO param) { |
|
|
|
GroupEditSubmitRecordEntity edit = groupEditSubmitRecordDao.selectEditDetail(param.getGroupId(),null); |
|
|
|
if(null == edit) { |
|
|
|
logger.error("com.epmet.modules.group.service.impl.ResiGroupServiceImpl.getEditAuditingDetail，未找到小组变更信息记录，传参：{}",JSON.toJSONString(param)); |
|
|
|
return null;} |
|
|
|
//取消未读状态
|
|
|
|
GroupEditSubmitRecordEntity _update = new GroupEditSubmitRecordEntity(); |
|
|
|
_update.setId(edit.getId());_update.setReadFlag(ModuleConstant.READ); |
|
|
|
groupEditSubmitRecordDao.updateById(_update); |
|
|
|
GroupEditionDetailResultDTO result = ConvertUtils.sourceToTarget(edit, GroupEditionDetailResultDTO.class); |
|
|
|
result.setGroupLeaderName(resiGroupRedis.getFullName(edit.getCreatedBy())); |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 工作人员提交审核 |
|
|
|
* @param param |
|
|
|
* @return void |
|
|
|
* @author wangc |
|
|
|
* @date 2020.11.03 16:02 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void auditEdit(GroupEditionAuditFormDTO param) { |
|
|
|
if(StringUtils.equals(param.getAuditResult(),ModuleConstant.AUDITING_OPERATION_REJECT) && StringUtils.isBlank(param.getRemark())){ |
|
|
|
throw new RenException("拒绝理由不能为空"); |
|
|
|
} |
|
|
|
int affectedRows = groupEditSubmitRecordDao.updateAuditResult(param.getGroupId(),param.getStaffId(),param.getAuditResult(),param.getRemark()); |
|
|
|
if(affectedRows <= NumConstant.ZERO){ |
|
|
|
logger.error("com.epmet.modules.group.service.impl.ResiGroupServiceImpl.auditEdit，更新组编辑记录时受影响行数小于1，传参：{}",JSON.toJSONString(param)); |
|
|
|
throw new RenException("更新组编辑记录时受影响行数小于1"); |
|
|
|
} |
|
|
|
if(!StringUtils.equals(param.getAuditResult(),ModuleConstant.AUDITING_OPERATION_REJECT)){ |
|
|
|
//同意
|
|
|
|
GroupEditSubmitRecordEntity edit = groupEditSubmitRecordDao.selectEditDetail(param.getGroupId(),param.getAuditResult()); |
|
|
|
if(null == edit){ |
|
|
|
logger.error("com.epmet.modules.group.service.impl.ResiGroupServiceImpl.auditEdit，找不到待审核的组更新记录，传参：{}",JSON.toJSONString(param)); |
|
|
|
throw new RenException("找不到待审核的组更新记录"); |
|
|
|
} |
|
|
|
ResiGroupEntity _update = ConvertUtils.sourceToTarget(edit,ResiGroupEntity.class); |
|
|
|
_update.setId(param.getGroupId()); |
|
|
|
baseDao.updateById(_update); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
wangchao
5 years ago