|
|
|
@@ -23,6 +23,7 @@ import org.apache.commons.collections.map.HashedMap; |
|
|
|
import org.apache.commons.io.FileUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.poi.xwpf.usermodel.XWPFDocument; |
|
|
|
import org.apache.shiro.SecurityUtils; |
|
|
|
import org.flowable.engine.RuntimeService; |
|
|
|
import org.flowable.engine.TaskService; |
|
|
|
import org.flowable.task.api.Task; |
|
|
|
@@ -680,20 +681,25 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
for (Task task : tasks) { |
|
|
|
logger.info("合同id:{},taskid:{}", id, task.getId()); |
|
|
|
runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "合同作废"); |
|
|
|
|
|
|
|
// 修改合同审核状态 |
|
|
|
WxRentContract rentContract = record; |
|
|
|
rentContract.setId(id); |
|
|
|
rentContract.setApplyStatus(EnumRentContractAppStatus.CANCLE.getCode()); |
|
|
|
updateApplyStatus(rentContract); |
|
|
|
|
|
|
|
// 保存审批历史入 |
|
|
|
MallUserInfo mallUserInfo = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession"); |
|
|
|
WxFlowRecord updateRecord = new WxFlowRecord(); |
|
|
|
updateRecord.setBusinessId(id); |
|
|
|
updateRecord.setStatus(EnumFlowRecordStatus.CANCLE.getCode()); |
|
|
|
updateRecord.setBusinessType(1); |
|
|
|
updateRecord.setUserId(mallUserInfo.getId()); |
|
|
|
updateRecord.setProcessInstanceId(task.getProcessInstanceId()); |
|
|
|
wxFlowRecordService.saveOrUpdate(updateRecord); |
|
|
|
} |
|
|
|
} |
|
|
|
// 修改合同审核状态 |
|
|
|
WxRentContract rentContract = record; |
|
|
|
rentContract.setId(id); |
|
|
|
rentContract.setApplyStatus(EnumRentContractAppStatus.CANCLE.getCode()); |
|
|
|
updateApplyStatus(rentContract); |
|
|
|
|
|
|
|
// 保存审批历史入 |
|
|
|
WxFlowRecord updateRecord = new WxFlowRecord(); |
|
|
|
updateRecord.setBusinessId(id); |
|
|
|
updateRecord.setStatus(EnumFlowRecordStatus.CANCLE.getCode()); |
|
|
|
updateRecord.setBusinessType(1); |
|
|
|
wxFlowRecordService.saveOrUpdate(updateRecord); |
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("deleteProcessInstance error", e); |
|
|
|
} |
|
|
|
@@ -1240,40 +1246,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
int allCount = wxRentContractMapper.selectCount(wxRentContract); |
|
|
|
resultData.put("allCount", allCount); |
|
|
|
|
|
|
|
//审核流程中止 |
|
|
|
List<Long> collect = wxRentContractMapper.getRentInvalidList(wxRentContract).stream() |
|
|
|
.map(r -> r.getId()).collect(Collectors.toList()); |
|
|
|
if (!CollectionUtils.isEmpty(collect)) { |
|
|
|
for (Long id:collect) { |
|
|
|
try { |
|
|
|
logger.info("合同id:{},开始停止...",id); |
|
|
|
//结束审批流 by luozukai |
|
|
|
List<Task> tasks = taskService.createTaskQuery().processDefinitionKey(WxFlowServiceImpl.getFlowKeyByType(1)) |
|
|
|
.processVariableValueEquals("businessId",id).list(); |
|
|
|
if (!CollectionUtils.isEmpty(tasks)) { |
|
|
|
for (Task task:tasks) { |
|
|
|
logger.info("合同id:{},taskid:{}",id,task.getId()); |
|
|
|
runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "合同作废"); |
|
|
|
} |
|
|
|
} |
|
|
|
// 修改合同审核状态 |
|
|
|
WxRentContract rentContract = new WxRentContract(); |
|
|
|
rentContract.setId(id); |
|
|
|
rentContract.setApplyStatus(EnumRentContractAppStatus.CANCLE.getCode()); |
|
|
|
updateApplyStatus(rentContract); |
|
|
|
|
|
|
|
// 保存审批历史入 |
|
|
|
WxFlowRecord updateRecord = new WxFlowRecord(); |
|
|
|
updateRecord.setBusinessId(id); |
|
|
|
updateRecord.setStatus(EnumFlowRecordStatus.CANCLE.getCode()); |
|
|
|
updateRecord.setBusinessType(1); |
|
|
|
wxFlowRecordService.saveOrUpdate(updateRecord); |
|
|
|
}catch (Exception e){ |
|
|
|
logger.error("deleteProcessInstance error",e); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//待签约 |
|
|
|
wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); |
|
|
|
int waitSignCount = wxRentContractMapper.queryRentContractWaitSignStatus(wxRentContract); |
|
|
|
|