|
|
@@ -59,76 +59,77 @@ public class ApproveUploadServiceImpl implements IApproveUploadService {
|
|
|
|
|
|
@Override
|
|
|
public ResponseStatus approveUpload(List<ApproveRecordDTO> approveRecordList) {
|
|
|
- logger.info("审批单信息保存开始，数据推送条数：【{}】",approveRecordList.size());
|
|
|
+ logger.info("审批单信息保存开始，数据推送条数：【{}】", approveRecordList.size());
|
|
|
ApproveRecordInfo approveRecordInfo = new ApproveRecordInfo();
|
|
|
try {
|
|
|
- if (!ObjectUtils.isEmpty(approveRecordList)){
|
|
|
+ if (!ObjectUtils.isEmpty(approveRecordList)) {
|
|
|
//审批单信息处理
|
|
|
approveRecordList.forEach(
|
|
|
- approveRecord -> {
|
|
|
-
|
|
|
- try {
|
|
|
- BeanUtils.copyProperties(approveRecord,approveRecordInfo);
|
|
|
- approveRecordInfo.setIsDeleted(YesNoEnum.NO.getValue());
|
|
|
- approveRecordInfo.setCreateUser(approveRecord.getApplicantIdcard());
|
|
|
- approveRecordInfo.setCreateTime(DateUtils.parseDate(approveRecord.getApplyTime(), DateUtils.DATE_FORMAT_19));
|
|
|
- approveRecordInfo.setProcessTitle(approveRecord.getApproveTitle());
|
|
|
- approveRecordInfo.setTaskName("结束");
|
|
|
- approveRecordInfo.setTaskCode("end");
|
|
|
- approveRecordMapper.insert(approveRecordInfo);
|
|
|
- ApproveQueryRelation approveQueryRelation = new ApproveQueryRelation();
|
|
|
- BeanUtils.copyProperties(approveRecord,approveQueryRelation);
|
|
|
- approveQueryRelation.setIsDeleted(YesNoEnum.NO.getValue());
|
|
|
- approveQueryRelation.setCreateUser(approveRecord.getApplicantIdcard());
|
|
|
- approveQueryRelation.setCreateTime(DateUtils.parseDate(approveRecord.getApplyTime(), DateUtils.DATE_FORMAT_19));
|
|
|
- //保存关联关系
|
|
|
- approveQueryRelation.setApproveRecordId(approveRecordInfo.getId());
|
|
|
- approveQueryRelationMapper.insert(approveQueryRelation);
|
|
|
- //审批单包含流转记录处理
|
|
|
- if (!ObjectUtils.isEmpty(approveRecord.getApproveCirculationList())){
|
|
|
- approveRecord.getApproveCirculationList().forEach(
|
|
|
- approveCirculation -> {
|
|
|
- ApproveCirculationInfo approveCirculationInfo = new ApproveCirculationInfo();
|
|
|
- BeanUtils.copyProperties(approveCirculation,approveCirculationInfo);
|
|
|
- approveCirculationInfo.setApproveNo(approveRecordInfo.getApproveNo());
|
|
|
- approveCirculationInfo.setIsDeleted(YesNoEnum.NO.getValue());
|
|
|
- approveCirculationInfo.setCreateUser(approveCirculation.getOperateUserId());
|
|
|
- approveCirculationInfo.setCreateTime(Timestamp.valueOf(approveCirculation.getOperateTime()));
|
|
|
- //保存关联关系
|
|
|
- approveCirculationInfo.setApproveRecordId(approveRecordInfo.getId());
|
|
|
- approveCirculationMapper.insert(approveCirculationInfo);
|
|
|
- //将审批记录转换成已办数据
|
|
|
- ApproveActHiTask actHiTask = new ApproveActHiTask();
|
|
|
- actHiTask.setApplyRecordId(approveRecordInfo.getId());
|
|
|
- actHiTask.setBusinessCode(approveRecordInfo.getProcessNo());
|
|
|
- actHiTask.setBusinessName(approveRecordInfo.getProcessName());
|
|
|
- actHiTask.setTaskId(approveCirculationInfo.getTaskId());
|
|
|
- actHiTask.setTaskCode(approveCirculationInfo.getNodeNo());
|
|
|
- actHiTask.setTaskName(approveCirculationInfo.getNodeName());
|
|
|
- actHiTask.setOperateUserIdcard(approveCirculationInfo.getOperateUserId());
|
|
|
- actHiTask.setOperateUserName(approveCirculationInfo.getOperateUserName());
|
|
|
- actHiTask.setOperateType(approveCirculationInfo.getOperateType());
|
|
|
- actHiTask.setProcessInstanceId(approveRecordInfo.getProcessInstanceId());
|
|
|
- try {
|
|
|
- actHiTask.setOperateTime(DateUtils.parseDate(approveCirculationInfo.getOperateTime(), DateUtils.DATE_FORMAT_19));
|
|
|
- } catch (ParseException e) {
|
|
|
-
|
|
|
- }
|
|
|
- actHiTask.setDeleted(YesNoEnum.NO.getValue());
|
|
|
- approveActHiTaskMapper.insert(actHiTask);
|
|
|
+ approveRecord -> {
|
|
|
+
|
|
|
+ try {
|
|
|
+ BeanUtils.copyProperties(approveRecord, approveRecordInfo);
|
|
|
+ approveRecordInfo.setBusinessCode(approveRecord.getProcessNo());
|
|
|
+ approveRecordInfo.setIsDeleted(YesNoEnum.NO.getValue());
|
|
|
+ approveRecordInfo.setCreateUser(approveRecord.getApplicantIdcard());
|
|
|
+ approveRecordInfo.setCreateTime(DateUtils.parseDate(approveRecord.getApplyTime(), DateUtils.DATE_FORMAT_19));
|
|
|
+ approveRecordInfo.setProcessTitle(approveRecord.getApproveTitle());
|
|
|
+ approveRecordInfo.setTaskName("结束");
|
|
|
+ approveRecordInfo.setTaskCode("end");
|
|
|
+ approveRecordMapper.insert(approveRecordInfo);
|
|
|
+ ApproveQueryRelation approveQueryRelation = new ApproveQueryRelation();
|
|
|
+ BeanUtils.copyProperties(approveRecord, approveQueryRelation);
|
|
|
+ approveQueryRelation.setIsDeleted(YesNoEnum.NO.getValue());
|
|
|
+ approveQueryRelation.setCreateUser(approveRecord.getApplicantIdcard());
|
|
|
+ approveQueryRelation.setCreateTime(DateUtils.parseDate(approveRecord.getApplyTime(), DateUtils.DATE_FORMAT_19));
|
|
|
+ //保存关联关系
|
|
|
+ approveQueryRelation.setApproveRecordId(approveRecordInfo.getId());
|
|
|
+ approveQueryRelationMapper.insert(approveQueryRelation);
|
|
|
+ //审批单包含流转记录处理
|
|
|
+ if (!ObjectUtils.isEmpty(approveRecord.getApproveCirculationList())) {
|
|
|
+ approveRecord.getApproveCirculationList().forEach(
|
|
|
+ approveCirculation -> {
|
|
|
+ ApproveCirculationInfo approveCirculationInfo = new ApproveCirculationInfo();
|
|
|
+ BeanUtils.copyProperties(approveCirculation, approveCirculationInfo);
|
|
|
+ approveCirculationInfo.setApproveNo(approveRecordInfo.getApproveNo());
|
|
|
+ approveCirculationInfo.setIsDeleted(YesNoEnum.NO.getValue());
|
|
|
+ approveCirculationInfo.setCreateUser(approveCirculation.getOperateUserId());
|
|
|
+ approveCirculationInfo.setCreateTime(Timestamp.valueOf(approveCirculation.getOperateTime()));
|
|
|
+ //保存关联关系
|
|
|
+ approveCirculationInfo.setApproveRecordId(approveRecordInfo.getId());
|
|
|
+ approveCirculationMapper.insert(approveCirculationInfo);
|
|
|
+ //将审批记录转换成已办数据
|
|
|
+ ApproveActHiTask actHiTask = new ApproveActHiTask();
|
|
|
+ actHiTask.setApplyRecordId(approveRecordInfo.getId());
|
|
|
+ actHiTask.setBusinessCode(approveRecordInfo.getBusinessCode());
|
|
|
+ actHiTask.setBusinessName(approveRecordInfo.getProcessName());
|
|
|
+ actHiTask.setTaskId(approveCirculationInfo.getTaskId());
|
|
|
+ actHiTask.setTaskCode(approveCirculationInfo.getNodeNo());
|
|
|
+ actHiTask.setTaskName(approveCirculationInfo.getNodeName());
|
|
|
+ actHiTask.setOperateUserIdcard(approveCirculationInfo.getOperateUserId());
|
|
|
+ actHiTask.setOperateUserName(approveCirculationInfo.getOperateUserName());
|
|
|
+ actHiTask.setOperateType(approveCirculationInfo.getOperateType());
|
|
|
+ actHiTask.setProcessInstanceId(approveRecordInfo.getProcessInstanceId());
|
|
|
+ try {
|
|
|
+ actHiTask.setOperateTime(DateUtils.parseDate(approveCirculationInfo.getOperateTime(), DateUtils.DATE_FORMAT_19));
|
|
|
+ } catch (ParseException e) {
|
|
|
+
|
|
|
+ }
|
|
|
+ actHiTask.setDeleted(YesNoEnum.NO.getValue());
|
|
|
+ approveActHiTaskMapper.insert(actHiTask);
|
|
|
|
|
|
|
|
|
- }
|
|
|
- );
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
+ } catch (ParseException e) {
|
|
|
+ e.printStackTrace();
|
|
|
}
|
|
|
- } catch (ParseException e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
|
|
|
- }
|
|
|
+ }
|
|
|
);
|
|
|
}
|
|
|
- }catch (Exception ex){
|
|
|
+ } catch (Exception ex) {
|
|
|
logger.error("保存审批单失败！");
|
|
|
throw new ApplicationException(ErrorCode.APPROVAL_UPLOAD_EXCEPTION.getCode(), ErrorCode.APPROVAL_UPLOAD_EXCEPTION.getMsg());
|
|
|
}
|
|
|
@@ -143,7 +144,7 @@ public class ApproveUploadServiceImpl implements IApproveUploadService {
|
|
|
where.between(ApproveRecordInfo::getCreateTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()));
|
|
|
where.orderByDesc(ApproveRecordInfo::getCreateTime);
|
|
|
List<ApproveRecordInfo> list = approveRecordMapper.selectList(where);
|
|
|
- if (CollectionUtils.isEmpty(list)){
|
|
|
+ if (CollectionUtils.isEmpty(list)) {
|
|
|
return null;
|
|
|
}
|
|
|
return list.get(0);
|
huangzqa