From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
index 672dfbd..30368c2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
@@ -73,6 +73,12 @@
for (TContract tContract : list) {
tContract.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,tContract.getPayType()));
tContract.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,tContract.getStatus()));
+ FlwHisTask flwHisTask = flwHisTaskMapper.selectOne(new LambdaQueryWrapper<FlwHisTask>()
+ .like(FlwHisTask::getVariable, tContract.getId())
+ .last("LIMIT 1"));
+ if (Objects.nonNull(flwHisTask)){
+ tContract.setInstanceId(Objects.nonNull(flwHisTask.getInstanceId())?String.valueOf(flwHisTask.getInstanceId()):"");
+ }
}
pageInfo.setRecords(list);
return pageInfo;
@@ -90,7 +96,7 @@
.like(FlwHisTask::getVariable, tContract.getId())
.last("LIMIT 1"));
if (Objects.nonNull(flwHisTask)){
- tContract.setInstanceId(flwHisTask.getInstanceId());
+ tContract.setInstanceId(Objects.nonNull(flwHisTask.getInstanceId())?String.valueOf(flwHisTask.getInstanceId()):"");
}
}
pageInfo.setRecords(list);
@@ -115,7 +121,6 @@
TContract contract = this.baseMapper.selectById(dto.getId());
contract.setTerminateRemark(dto.getTerminateRemark());
this.baseMapper.updateById(contract);
-
// 进入合同提前终止审批流程
ProcessStartBO processStartBO = new ProcessStartBO();
processStartBO.setCategory(ProcessCategoryEnum.CATEGORY3.getValue().toString());
@@ -127,16 +132,11 @@
processStartBO.setVariable(variable);
//开启工作流程
stateProcessTemplateService.start(processStartBO);
-
-
}
public static void main(String[] args) {
-// LocalDate now = LocalDate.now();
-// String replace = (now + "").replace("-", "");
-// System.err.println(replace.substring(2));
-//
-// System.err.println(String.format("%03d",1));
+ String t = "1000438";
+ System.err.println("XN" + String.valueOf(t).substring(1));
}
@Override
public CheckAcceptRecordVO getCheckByContractId(String id) {
@@ -160,6 +160,7 @@
if (contract.getStatus().equals("4"))return R.fail("该合同已签订");
contract.setSignature(dto.getSignature());
contract.setFirstPayTime(contract.getStartTime().plusDays(10));
+ contract.setStatus("9");
contractMapper.updateById(contract);
// 进入签订审批流程
--
Gitblit v1.7.1