diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java index e685b800..5405fa1a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java @@ -48,7 +48,7 @@ public class ProcessPartTypeApplyRecordServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(lawsPartType, req.getParameterMap()); queryWrapper.eq("l1.del_flag","0"); - queryWrapper.orderByDesc("l1.create_time"); + queryWrapper.orderByAsc("l1.create_time"); List re = processPartTypeApplyRecordMapper.pageList(queryWrapper); return re; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java index 03d69c82..b6453d3f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java @@ -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 processInfoVO) { @@ -145,6 +150,7 @@ public class ProcessPartTypeApplyServiceImpl extends ServiceImpl processInfoVO) { ProcessPartTypeApply businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + businessInfoDTO.setId(processInfoVO.getBusinessId()); saveOrUpdate(businessInfoDTO); if(!StringUtils.isEmpty(businessInfoDTO.getIds())){ List ids = Arrays.asList(businessInfoDTO.getIds().split(",")); @@ -306,10 +312,11 @@ public class ProcessPartTypeApplyServiceImpl extends ServiceImpl queryProcessPartTypeApplyRecord = new LambdaQueryWrapper<>(); - queryProcessPartTypeApplyRecord.eq(ProcessPartTypeApplyRecord::getProcessId,data.getId()); - queryProcessPartTypeApplyRecord.orderByAsc(ProcessPartTypeApplyRecord::getCreateTime); - List list = processPartTypeApplyRecordService.list(queryProcessPartTypeApplyRecord); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("l1.del_flag","0"); + queryWrapper.eq("l1.process_id",data.getId()); + queryWrapper.orderByAsc("l1.create_time"); + List list = processPartTypeApplyRecordMapper.pageList(queryWrapper); if(!CollectionUtils.isEmpty(list)){ data.setList(list); }