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 | 128 +++++++++++++++++++++++-------------------
1 files changed, 71 insertions(+), 57 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 458ec6c..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
@@ -1,11 +1,16 @@
package com.ruoyi.system.service.impl;
+import com.aizuda.bpm.engine.entity.FlwHisTask;
+import com.aizuda.bpm.mybatisplus.mapper.FlwHisTaskMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.ProcessCategoryEnum;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.system.bo.ProcessStartBO;
import com.ruoyi.system.dto.SignContractDTO;
import com.ruoyi.system.dto.TerminateContractDTO;
import com.ruoyi.system.mapper.TBillMapper;
@@ -16,19 +21,25 @@
import com.ruoyi.system.query.TContractAppletQuery;
import com.ruoyi.system.query.TContractBillQuery;
import com.ruoyi.system.query.TContractQuery;
+import com.ruoyi.system.service.StateProcessTemplateService;
import com.ruoyi.system.service.TBillService;
+import com.ruoyi.system.service.TContractRentTypeService;
import com.ruoyi.system.service.TContractService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.BillVO;
import com.ruoyi.system.vo.CheckAcceptRecordVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
-import java.util.List;
+import java.time.temporal.TemporalAdjusters;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -50,6 +61,10 @@
private TBillService billService;
@Resource
private TContractMapper contractMapper;
+ @Autowired
+ private StateProcessTemplateService stateProcessTemplateService;
+ @Autowired
+ private FlwHisTaskMapper flwHisTaskMapper;
@Override
public PageInfo<TContract> contractList(TContractQuery query) {
@@ -58,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;
@@ -71,6 +92,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;
@@ -93,31 +120,30 @@
public void terminateContract(TerminateContractDTO dto) {
TContract contract = this.baseMapper.selectById(dto.getId());
contract.setTerminateRemark(dto.getTerminateRemark());
- contract.setStatus("4");
this.baseMapper.updateById(contract);
- // 生成验收记录
- TCheckAcceptRecord tCheckAcceptRecord = new TCheckAcceptRecord();
- tCheckAcceptRecord.setContractId(dto.getId());
- tCheckAcceptRecord.setHouseId(contract.getHouseId());
- tCheckAcceptRecord.setLeaseReason("后台终止");
- tCheckAcceptRecord.setStatus("1");
- checkAcceptRecordMapper.insert(tCheckAcceptRecord);
- // 将所有未缴费账单设置未已失效
- List<TBill> tBills = billMapper.selectList(new LambdaQueryWrapper<TBill>()
- .in(TBill::getPayFeesStatus, Arrays.asList("1,4"))
- .eq(TBill::getContractId, dto.getId()));
- for (TBill tBill : tBills) {
- tBill.setPayFeesStatus("5");
- }
- billService.updateBatchById(tBills);
+ // 进入合同提前终止审批流程
+ ProcessStartBO processStartBO = new ProcessStartBO();
+ processStartBO.setCategory(ProcessCategoryEnum.CATEGORY3.getValue().toString());
+ processStartBO.setModuleName("合同提前终止审批");
+ processStartBO.setName(contract.getContractName());
+ processStartBO.setRemark("");
+ Map<String, Object> variable = new HashMap<>();
+ variable.put("projectId", dto.getId());
+ processStartBO.setVariable(variable);
+ //开启工作流程
+ stateProcessTemplateService.start(processStartBO);
}
-
+ public static void main(String[] args) {
+ String t = "1000438";
+ System.err.println("XN" + String.valueOf(t).substring(1));
+ }
@Override
public CheckAcceptRecordVO getCheckByContractId(String id) {
CheckAcceptRecordVO checkAcceptRecordVO = new CheckAcceptRecordVO();
TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordMapper.selectOne(new LambdaQueryWrapper<TCheckAcceptRecord>()
.eq(TCheckAcceptRecord::getContractId, id));
+ if (tCheckAcceptRecord==null)return checkAcceptRecordVO;
BeanUtils.copyProperties(tCheckAcceptRecord,checkAcceptRecordVO);
THouse tHouse = houseMapper.selectById(tCheckAcceptRecord.getHouseId());
tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
@@ -125,51 +151,32 @@
checkAcceptRecordVO.setHouse(tHouse);
return checkAcceptRecordVO;
}
-
+ @Autowired
+ private TContractRentTypeService contractRentTypeService;
@Override
public R signContract(SignContractDTO dto) {
TContract contract = contractMapper.selectById(dto.getId());
if (contract==null)return R.fail("合同不存在");
if (contract.getStatus().equals("4"))return R.fail("该合同已签订");
contract.setSignature(dto.getSignature());
- contract.setStatus("2");
+ contract.setFirstPayTime(contract.getStartTime().plusDays(10));
+ contract.setStatus("9");
contractMapper.updateById(contract);
- // 用户签订合同后 生成第一批账单包含租金账单和押金账单 后续账单通过定时任务生成
- TBill rent = new TBill();
- rent.setContractId(contract.getId());
- // 应缴费租金
- BigDecimal payableFeesMoney = new BigDecimal("0");
- LocalDateTime startTime = contract.getStartTime();
- LocalDateTime endTime = contract.getEndTime();
-// // 计算相差多少天
-// long days = ChronoUnit.DAYS.between(startTime, endTime);
-// // 计算相差多少个月
-// long months = ChronoUnit.MONTHS.between(startTime, endTime);
-// if (months<=31){
-// // 小于等于一个月 合计租金就是首笔账单金额
-// payableFeesMoney = contract.getTotalRent();
-// }else{
-// switch (contract.getPayType()){
-// case "1":
-// break;
-// case "2":
-// break;
-// case "3":
-// break;
-// }
-// }
-//
-// rent.setPayableFeesMoney(payableFeesMoney);
-// rent.setPayableFeesTime(contract.getFirstPayTime());
-// rent.setPayFeesStatus("1");
-// rent.setBillType("1");
-//
-// TBill deposit = new TBill();
-// deposit.setContractId(contract.getId());
-// deposit.setPayableFeesMoney(contract.getDeposit());
-// deposit.setPayableFeesTime(contract.getFirstPayTime());
-// deposit.setPayFeesStatus("1");
-// deposit.setBillType("2");
+
+ // 进入签订审批流程
+ ProcessStartBO processStartBO = new ProcessStartBO();
+ processStartBO.setCategory(ProcessCategoryEnum.CATEGORY2.getValue().toString());
+ processStartBO.setModuleName("合同签订审批");
+ processStartBO.setName(contract.getContractName());
+ processStartBO.setRemark("");
+ Map<String, Object> variable = new HashMap<>();
+ variable.put("projectId", dto.getId());
+ processStartBO.setVariable(variable);
+ //开启工作流程
+ stateProcessTemplateService.startApplet(processStartBO);
+
+
+
return R.ok();
}
@@ -184,4 +191,11 @@
return list;
}
+
+ @Override
+ public Boolean updateContractAuditStatus(String projectId, Integer status) {
+ LambdaUpdateWrapper<TContract> contractLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ contractLambdaUpdateWrapper.eq(TContract::getId, projectId).set(TContract::getStatus, status);
+ return this.update(contractLambdaUpdateWrapper);
+ }
}
--
Gitblit v1.7.1