From 8775f67d35eb48e9a63c5a7d2286436d6d39271c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:18:46 +0800
Subject: [PATCH] 权限
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 91 insertions(+), 28 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 5f77e82..528af73 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,6 +21,7 @@
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;
@@ -24,6 +30,7 @@
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;
@@ -31,9 +38,8 @@
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -55,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) {
@@ -76,6 +86,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(flwHisTask.getInstanceId());
+ }
}
pageInfo.setRecords(list);
return pageInfo;
@@ -100,12 +116,33 @@
contract.setTerminateRemark(dto.getTerminateRemark());
contract.setStatus("4");
this.baseMapper.updateById(contract);
+
+ // 进入合同提前终止审批流程
+ 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);
+
// 生成验收记录
TCheckAcceptRecord tCheckAcceptRecord = new TCheckAcceptRecord();
tCheckAcceptRecord.setContractId(dto.getId());
tCheckAcceptRecord.setHouseId(contract.getHouseId());
- tCheckAcceptRecord.setLeaseReason("后台终止");
- tCheckAcceptRecord.setStatus("1");
+ tCheckAcceptRecord.setLeaseReason("后台终止合同");
+ tCheckAcceptRecord.setStatus(false);
+ tCheckAcceptRecord.setAcceptanceTime(LocalDateTime.now());
+ LocalDate now = LocalDate.now();
+ String replace = (now + "").replace("-", "");
+ int size = checkAcceptRecordMapper.selectList(new LambdaQueryWrapper<TCheckAcceptRecord>()
+ .likeRight(TCheckAcceptRecord::getAcceptanceTime, LocalDate.now())).size();
+ tCheckAcceptRecord.setCode(replace.substring(2)+String.format("%03d", size+1));
+
+
checkAcceptRecordMapper.insert(tCheckAcceptRecord);
// 将所有未缴费账单设置未已失效
List<TBill> tBills = billMapper.selectList(new LambdaQueryWrapper<TBill>()
@@ -117,7 +154,13 @@
billService.updateBatchById(tBills);
}
-
+ 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));
+ }
@Override
public CheckAcceptRecordVO getCheckByContractId(String id) {
CheckAcceptRecordVO checkAcceptRecordVO = new CheckAcceptRecordVO();
@@ -140,9 +183,21 @@
if (contract.getStatus().equals("4"))return R.fail("该合同已签订");
contract.setSignature(dto.getSignature());
contract.setStatus("4");
- contractMapper.updateById(contract);
contract.setFirstPayTime(contract.getStartTime().plusDays(10));
- List<TBill> bills = new ArrayList<>();
+ contractMapper.updateById(contract);
+
+ // 进入签订审批流程
+ 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);
+
List<TContractRentType> contractRentTypes = contractRentTypeService.list();
// 生成第一笔账单
// 第一次应缴费日期
@@ -150,7 +205,7 @@
TBill rentBill = new TBill();
rentBill.setContractId(contract.getId());
rentBill.setContractNumber(contract.getContractNumber());
- rentBill.setPayableFeesTime(firstPayTime);
+ rentBill.setPayableFeesTime(firstPayTime.toLocalDate());
if (firstPayTime.toLocalDate().equals(LocalDate.now())){
rentBill.setPayFeesStatus("1");
}else {
@@ -208,12 +263,15 @@
}
}else{
if (contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(contract.getEndTime())){
- rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
- }else{
rentBill.setEndTime(contract.getEndTime());
+
+ }else{
+ LocalDateTime firstPayTime1 = contract.getFirstPayTime();
+ // 将firstPayTime1的日设置为当月最后一天
+ rentBill.setEndTime(firstPayTime1.with(TemporalAdjusters.lastDayOfMonth()));
}
// 不走递增递减
- long allDays = ChronoUnit.DAYS.between(contract.getFirstPayTime(), rentBill.getEndTime());
+ long allDays = ChronoUnit.DAYS.between(contract.getStartPayTime(), rentBill.getEndTime());
rentBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
@@ -226,7 +284,7 @@
depositBill.setOutstandingMoney(depositBill.getPayableFeesMoney());
depositBill.setStartTime(contract.getStartPayTime());
depositBill.setEndTime(contract.getEndTime());
- depositBill.setPayableFeesTime(firstPayTime);
+ depositBill.setPayableFeesTime(firstPayTime.toLocalDate());
if (firstPayTime.toLocalDate().equals(LocalDate.now())){
depositBill.setPayFeesStatus("1");
@@ -246,7 +304,6 @@
while(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isBefore(contract.getEndTime())){
-
TBill tBill = new TBill();
tBill.setContractId(contract.getId());
tBill.setContractNumber(contract.getContractNumber());
@@ -401,28 +458,27 @@
}
}else{
- long allDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), (contract.getPayType().equals("1")?
- beforeBill.getEndTime().plusMonths(1):contract.getPayType().equals("2")?
- beforeBill.getEndTime().plusMonths(3):beforeBill.getEndTime().plusMonths(12)).with(TemporalAdjusters.lastDayOfMonth()));
- tBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
+
+ tBill.setPayableFeesMoney(contract.getMonthRent());
tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
}
tBill.setContractNumber(contract.getContractNumber());
if (beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).getDayOfMonth()<=15){
- tBill.setPayableFeesTime(contract.getEndTime());
+ tBill.setPayableFeesTime(contract.getEndTime().toLocalDate());
}else{
tBill.setPayableFeesTime((contract.getPayType().equals("1")?
- beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15):contract.getPayType().equals("2")?
- beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15):beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12)));
+ beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15).toLocalDate():contract.getPayType().equals("2")?
+ beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15).toLocalDate():beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12).toLocalDate()));
}
tBill.setPayFeesStatus("2");
tBill.setBillType("1");
tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
- tBill.setEndTime(contract.getEndTime());
+ tBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
+ billMapper.insert(tBill);
}
- billMapper.insert(tBill);
- }
+ beforeBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
+ }
}
} catch (Exception e) {
@@ -597,16 +653,16 @@
}
tBill.setContractNumber(contract.getContractNumber());
if (beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).getDayOfMonth()<=15){
- tBill.setPayableFeesTime(contract.getEndTime().withHour(0).withMinute(0).withSecond(0));
+ tBill.setPayableFeesTime(contract.getEndTime().withHour(0).withMinute(0).withSecond(0).toLocalDate());
}else{
tBill.setPayableFeesTime((contract.getPayType().equals("1")?
- beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15):contract.getPayType().equals("2")?
- beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15):beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12).withHour(0).withMinute(0).withSecond(0)));
+ beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15).toLocalDate():contract.getPayType().equals("2")?
+ beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15).toLocalDate():beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12).withHour(0).withMinute(0).withSecond(0).toLocalDate()));
}
tBill.setPayFeesStatus("1");
tBill.setBillType("1");
tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
- tBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
+ tBill.setEndTime(contract.getEndTime());
billService.save(tBill);
}
@@ -624,4 +680,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