QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善关键零部件型号申请流程

Browse Source
This commit is contained in:
梁琦涛
2024-10-09 14:25:12 +08:00
parent b38c242af7
commit 87c049f1bc
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class ProcessPartTypeApplyRecordServiceImpl extends ServiceImpl<ProcessPa
QueryWrapper<ProcessPartTypeApplyRecord> queryWrapper =
QueryGenerator.initQueryWrapper(lawsPartType, req.getParameterMap());
queryWrapper.eq("l1.del_flag","0");
queryWrapper.orderByDesc("l1.create_time");
queryWrapper.orderByAsc("l1.create_time");
List<ProcessPartTypeApplyRecord> re = processPartTypeApplyRecordMapper.pageList(queryWrapper);
return re;
}
laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java
+11 -4
View File
@@ -2,9 +2,11 @@ package com.jero.modules.activiti.process.part.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.activiti.common.ActivitiCommon;
import com.jero.modules.activiti.entity.ProcessAll;
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
@@ -18,6 +20,7 @@ import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.activiti.process.part.entity.ProcessPartTypeApply;
import com.jero.modules.activiti.process.part.entity.ProcessPartTypeApplyRecord;
import com.jero.modules.activiti.process.part.mapper.ProcessPartTypeApplyMapper;
import com.jero.modules.activiti.process.part.mapper.ProcessPartTypeApplyRecordMapper;
import com.jero.modules.activiti.process.part.service.IProcessPartTypeApplyRecordService;
import com.jero.modules.activiti.process.part.service.IProcessPartTypeApplyService;
import com.jero.modules.activiti.service.ProcessAllService;
@@ -77,6 +80,8 @@ public class ProcessPartTypeApplyServiceImpl extends ServiceImpl<ProcessPartType
private ILawsPartTypeService lawsPartTypeService;
@Resource
private IProcessPartTypeApplyRecordService processPartTypeApplyRecordService;
@Resource
private ProcessPartTypeApplyRecordMapper processPartTypeApplyRecordMapper;
@Override
public void startProcess(ProcessInfoVO<ProcessPartTypeApply> processInfoVO) {
@@ -145,6 +150,7 @@ public class ProcessPartTypeApplyServiceImpl extends ServiceImpl<ProcessPartType
*/
private void startNodeBusProcess(ProcessInfoVO<ProcessPartTypeApply> processInfoVO) {
ProcessPartTypeApply businessInfoDTO = processInfoVO.getBusinessInfoDTO();
businessInfoDTO.setId(processInfoVO.getBusinessId());
saveOrUpdate(businessInfoDTO);
if(!StringUtils.isEmpty(businessInfoDTO.getIds())){
List<String> ids = Arrays.asList(businessInfoDTO.getIds().split(","));
@@ -306,10 +312,11 @@ public class ProcessPartTypeApplyServiceImpl extends ServiceImpl<ProcessPartType
lambdaQueryWrapper.eq(ProcessPartTypeApply::getProcessInstanceId, processInstanceId);
ProcessPartTypeApply data = getOne(lambdaQueryWrapper,false);
if(!Objects.isNull(data)){
LambdaQueryWrapper<ProcessPartTypeApplyRecord> queryProcessPartTypeApplyRecord = new LambdaQueryWrapper<>();
queryProcessPartTypeApplyRecord.eq(ProcessPartTypeApplyRecord::getProcessId,data.getId());
queryProcessPartTypeApplyRecord.orderByAsc(ProcessPartTypeApplyRecord::getCreateTime);
List<ProcessPartTypeApplyRecord> list = processPartTypeApplyRecordService.list(queryProcessPartTypeApplyRecord);
QueryWrapper<ProcessPartTypeApplyRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("l1.del_flag","0");
queryWrapper.eq("l1.process_id",data.getId());
queryWrapper.orderByAsc("l1.create_time");
List<ProcessPartTypeApplyRecord> list = processPartTypeApplyRecordMapper.pageList(queryWrapper);
if(!CollectionUtils.isEmpty(list)){
data.setList(list);
}