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 | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 201 insertions(+), 0 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
new file mode 100644
index 0000000..30368c2
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
@@ -0,0 +1,201 @@
+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;
+import com.ruoyi.system.mapper.TCheckAcceptRecordMapper;
+import com.ruoyi.system.mapper.TContractMapper;
+import com.ruoyi.system.mapper.THouseMapper;
+import com.ruoyi.system.model.*;
+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.time.temporal.TemporalAdjusters;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 合同管理 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-17
+ */
+@Service
+public class TContractServiceImpl extends ServiceImpl<TContractMapper, TContract> implements TContractService {
+ @Resource
+ private TCheckAcceptRecordMapper checkAcceptRecordMapper;
+ @Resource
+ private THouseMapper houseMapper;
+ @Resource
+ private TBillMapper billMapper;
+ @Resource
+ private TBillService billService;
+ @Resource
+ private TContractMapper contractMapper;
+ @Autowired
+ private StateProcessTemplateService stateProcessTemplateService;
+ @Autowired
+ private FlwHisTaskMapper flwHisTaskMapper;
+
+ @Override
+ public PageInfo<TContract> contractList(TContractQuery query) {
+ PageInfo<TContract> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TContract> list = this.baseMapper.contractList(query,pageInfo);
+ 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;
+
+ }
+
+ @Override
+ public PageInfo<TContract> contractAppletList(TContractAppletQuery query) {
+ PageInfo<TContract> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TContract> list = this.baseMapper.contractAppletList(query,pageInfo);
+ 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;
+ }
+
+ @Override
+ public PageInfo<BillVO> contractBillList(TContractBillQuery query) {
+ PageInfo<BillVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<BillVO> list = this.baseMapper.contractBillList(query,pageInfo);
+ for (BillVO billVO : list) {
+ if (billVO.getPayFeesStatus().equals("4")){
+ billVO.setPayFeesMoneyString((billVO.getPayFeesMoney().add(billVO.getPayableFeesPenalty()))+"【"+billVO.getPayFeesMoney()+"+"+billVO.getPayableFeesPenalty()+"】");
+ }
+ billVO.setPayFeesStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_PAY_FEES_STATUS,billVO.getPayFeesStatus()));
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+ @Override
+ public void terminateContract(TerminateContractDTO dto) {
+ 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());
+ 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()));
+ tHouse.setBusinessAttributes(DictUtils.getDictLabel(DictConstants.DICT_TYPE_BUSINESS_ATTRIBUTES,tHouse.getBusinessAttributes()));
+ 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.setFirstPayTime(contract.getStartTime().plusDays(10));
+ contract.setStatus("9");
+ 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);
+
+
+
+ return R.ok();
+ }
+
+ @Override
+ public void export(TContractQuery query) {
+
+ }
+
+ @Override
+ public List<TContract> contractExportList(TContractQuery query) {
+ List<TContract> list = this.baseMapper.contractExportList(query);
+
+ 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