|
@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import jakarta.annotation.Resource;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
|
import vip.xiaonuo.biz.modular.qyrecardbody.entity.QyRecardBody;
|
|
|
import vip.xiaonuo.biz.modular.qyrecardbody.param.QyRecardBodyAddParam;
|
|
|
import vip.xiaonuo.biz.modular.qyrecardbody.param.QyRecardBodyEditParam;
|
|
@@ -32,7 +33,10 @@ import vip.xiaonuo.biz.modular.qyrecardbody.service.QyRecardBodyService;
|
|
|
import vip.xiaonuo.biz.modular.qyrecordattachment.entity.QyRecordAttachment;
|
|
|
import vip.xiaonuo.biz.modular.qyrecordattachment.param.QyRecordAttachmentAddParam;
|
|
|
import vip.xiaonuo.biz.modular.qyrecordattachment.param.QyRecordAttachmentEditParam;
|
|
|
+import vip.xiaonuo.biz.modular.qyrecordattachment.param.QyRecordAttachmentIdParam;
|
|
|
import vip.xiaonuo.biz.modular.qyrecordattachment.service.QyRecordAttachmentService;
|
|
|
+import vip.xiaonuo.biz.modular.qyrecordinfochecklist.entity.QyRecordInfoCheckList;
|
|
|
+import vip.xiaonuo.biz.modular.qyrecordinfochecklist.service.QyRecordInfoCheckListService;
|
|
|
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
|
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
@@ -45,6 +49,7 @@ import vip.xiaonuo.biz.modular.qyrecordinfo.param.QyRecordInfoPageParam;
|
|
|
import vip.xiaonuo.biz.modular.qyrecordinfo.service.QyRecordInfoService;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -63,6 +68,9 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
|
|
|
@Resource
|
|
|
private QyRecardBodyService qyRecardBodyService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private QyRecordInfoCheckListService qyRecordInfoCheckListService;
|
|
|
+
|
|
|
@Override
|
|
|
public Page<QyRecordInfo> page(QyRecordInfoPageParam qyRecordInfoPageParam) {
|
|
|
QueryWrapper<QyRecordInfo> queryWrapper = new QueryWrapper<QyRecordInfo>().checkSqlInjection();
|
|
@@ -80,7 +88,7 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
|
|
|
}
|
|
|
if (ObjectUtil.isAllNotEmpty(qyRecordInfoPageParam.getSortField(), qyRecordInfoPageParam.getSortOrder())) {
|
|
|
CommonSortOrderEnum.validate(qyRecordInfoPageParam.getSortOrder());
|
|
|
- queryWrapper.orderBy(true, qyRecordInfoPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),
|
|
|
+ queryWrapper.orderBy(true, qyRecordInfoPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.DESC.getValue()),
|
|
|
StrUtil.toUnderlineCase(qyRecordInfoPageParam.getSortField()));
|
|
|
} else {
|
|
|
queryWrapper.lambda().orderByAsc(QyRecordInfo::getId);
|
|
@@ -93,11 +101,10 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
|
|
|
public void add(QyRecordInfoAddParam qyRecordInfoAddParam) {
|
|
|
QyRecordInfo qyRecordInfo = BeanUtil.toBean(qyRecordInfoAddParam, QyRecordInfo.class);
|
|
|
this.save(qyRecordInfo);
|
|
|
- QyRecordInfo recordInfo = this.getOne(new LambdaQueryWrapper<QyRecordInfo>().eq(QyRecordInfo::getYlTzCode, qyRecordInfo.getYlTzCode()));
|
|
|
List<QyRecardBodyAddParam> qyRecardBodyAddParams = qyRecordInfoAddParam.getQyRecardBodyAddParams();
|
|
|
if(CollectionUtil.isNotEmpty(qyRecardBodyAddParams)){
|
|
|
qyRecardBodyAddParams.stream().forEach(qyRecardBodyAddParam -> {
|
|
|
- qyRecardBodyAddParam.setQyRecordInfoId(recordInfo.getId());
|
|
|
+ qyRecardBodyAddParam.setQyRecordInfoId(qyRecordInfo.getId());
|
|
|
QyRecardBody qyRecardBody = BeanUtil.toBean(qyRecardBodyAddParam, QyRecardBody.class);
|
|
|
qyRecardBody.setQyRecordInfoId(qyRecordInfo.getId());
|
|
|
qyRecardBodyService.save(qyRecardBody);
|
|
@@ -106,11 +113,20 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
|
|
|
List<QyRecordAttachmentAddParam> qyRecordAttachmentAddParams = qyRecordInfoAddParam.getQyRecordAttachmentAddParams();
|
|
|
if(CollectionUtil.isNotEmpty(qyRecordAttachmentAddParams)){
|
|
|
qyRecordAttachmentAddParams.stream().forEach(qyRecordAttachmentAddParam -> {
|
|
|
- qyRecordAttachmentAddParam.setQyRecordInfoId(recordInfo.getId());
|
|
|
+ qyRecordAttachmentAddParam.setQyRecordInfoId(qyRecordInfo.getId());
|
|
|
QyRecordAttachment qyRecordAttachment = BeanUtil.toBean(qyRecordAttachmentAddParam, QyRecordAttachment.class);
|
|
|
qyRecordAttachmentService.save(qyRecordAttachment);
|
|
|
});
|
|
|
}
|
|
|
+ QyRecordInfoCheckList qyRecordInfoCheckList = new QyRecordInfoCheckList();
|
|
|
+ qyRecordInfoCheckList.setYlTzCode(qyRecordInfo.getYlTzCode());
|
|
|
+ qyRecordInfoCheckList.setCheckTime(new Date());
|
|
|
+ qyRecordInfoCheckList.setResult("审核中");
|
|
|
+ qyRecordInfoCheckList.setResult("提交成功,待审核");
|
|
|
+ qyRecordInfoCheckList.setApplyType("备案");
|
|
|
+ String nickname = StpLoginUserUtil.getLoginUser().getNickname();
|
|
|
+ qyRecordInfoCheckList.setApplyMan(nickname);
|
|
|
+ qyRecordInfoCheckListService.save(qyRecordInfoCheckList);
|
|
|
}
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -128,6 +144,16 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
|
|
|
});
|
|
|
qyRecardBodyService.delete(bodyIdParams);
|
|
|
}
|
|
|
+ List<QyRecordAttachment> list_ = qyRecordAttachmentService.list(new LambdaQueryWrapper<QyRecordAttachment>().eq(QyRecordAttachment::getQyRecordInfoId, qyRecordInfo.getId()));
|
|
|
+ if(CollectionUtil.isNotEmpty(list_)){
|
|
|
+ List<String> ids = list.stream().map(qyRecordAttachment -> qyRecordAttachment.getId()).collect(Collectors.toList());
|
|
|
+ List<QyRecordAttachmentIdParam> attachmentIdParams = new ArrayList<>();
|
|
|
+ ids.forEach(id ->{
|
|
|
+ attachmentIdParams.add(new QyRecordAttachmentIdParam(id));
|
|
|
+ });
|
|
|
+ qyRecordAttachmentService.delete(attachmentIdParams);
|
|
|
+ }
|
|
|
+
|
|
|
List<QyRecardBodyEditParam> bodyAddParams = qyRecordInfoEditParam.getQyRecardBodyEditParams();
|
|
|
if (CollectionUtil.isNotEmpty(bodyAddParams)){
|
|
|
bodyAddParams.stream().forEach(qyRecardBodyAddParam -> {
|
|
@@ -137,7 +163,6 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
|
|
|
qyRecardBodyService.save(qyRecardBody);
|
|
|
});
|
|
|
}
|
|
|
-
|
|
|
List<QyRecordAttachmentEditParam> attachmentEditParams = qyRecordInfoEditParam.getQyRecordAttachmentEditParams();
|
|
|
if(CollectionUtil.isNotEmpty(attachmentEditParams)){
|
|
|
attachmentEditParams.stream().forEach(qyRecordAttachmentAddParam -> {
|
|
@@ -156,8 +181,28 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public QyRecordInfo detail(QyRecordInfoIdParam qyRecordInfoIdParam) {
|
|
|
- return this.queryEntity(qyRecordInfoIdParam.getId());
|
|
|
+ public QyRecordInfoAddParam detail(QyRecordInfoIdParam qyRecordInfoIdParam) {
|
|
|
+ QyRecordInfo recordInfo = this.queryEntity(qyRecordInfoIdParam.getId());
|
|
|
+ List<QyRecardBody> bodyList = qyRecardBodyService.list(new LambdaQueryWrapper<QyRecardBody>().eq(QyRecardBody::getQyRecordInfoId, recordInfo.getId()));
|
|
|
+ List<QyRecordAttachment> attachmentList = qyRecordAttachmentService.list(new LambdaQueryWrapper<QyRecordAttachment>().eq(QyRecordAttachment::getQyRecordInfoId, recordInfo.getId()));
|
|
|
+ QyRecordInfoAddParam param = BeanUtil.toBean(recordInfo, QyRecordInfoAddParam.class);
|
|
|
+ List<QyRecardBodyAddParam> qyRecardBodyAddParamList = new ArrayList<>();
|
|
|
+ List<QyRecordAttachmentAddParam> qyRecordAttachmentAddParamList = new ArrayList<>();
|
|
|
+ if(CollectionUtil.isNotEmpty(bodyList)){
|
|
|
+ bodyList.stream().forEach(item ->{
|
|
|
+ QyRecardBodyAddParam bean = BeanUtil.toBean(item, QyRecardBodyAddParam.class);
|
|
|
+ qyRecardBodyAddParamList.add(bean);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if(CollectionUtil.isNotEmpty(attachmentList)){
|
|
|
+ attachmentList.stream().forEach(item ->{
|
|
|
+ QyRecordAttachmentAddParam bean_ = BeanUtil.toBean(item, QyRecordAttachmentAddParam.class);
|
|
|
+ qyRecordAttachmentAddParamList.add(bean_);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ param.setQyRecardBodyAddParams(qyRecardBodyAddParamList);
|
|
|
+ param.setQyRecordAttachmentAddParams(qyRecordAttachmentAddParamList);
|
|
|
+ return param;
|
|
|
}
|
|
|
|
|
|
@Override
|