From c48ecad4633a6624fec92e42ecd9eeca488a636c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 06 三月 2025 13:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 155 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 105 insertions(+), 50 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index 3053ff9..ea77182 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -3,33 +3,39 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.aizuda.bpm.engine.entity.FlwTask;
+import com.aizuda.bpm.mybatisplus.mapper.FlwTaskMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.ImmutableMap;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.DictConstants;
-import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.ProcessCategoryEnum;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.WebUtils;
-import com.ruoyi.system.dto.*;
+import com.ruoyi.system.bo.ProcessStartBO;
+import com.ruoyi.system.dto.RevokeDTO;
+import com.ruoyi.system.dto.SetContractDto;
+import com.ruoyi.system.dto.TContractDTO;
+import com.ruoyi.system.dto.TerminateContractDTO;
import com.ruoyi.system.export.ContractExport;
-import com.ruoyi.system.export.OpticalInspectionExport;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TContractBillQuery;
import com.ruoyi.system.query.TContractQuery;
-import com.ruoyi.system.query.THouseQuery;
-import com.ruoyi.system.query.TUserHistoryQuery;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.task.base.QuartzManager;
+import com.ruoyi.system.task.base.TimeJobType;
+import com.ruoyi.system.task.jobs.StateProcessJob;
import com.ruoyi.system.vo.BillVO;
import com.ruoyi.system.vo.CheckAcceptRecordVO;
-import com.ruoyi.system.vo.HouseVO;
+import com.ruoyi.system.vo.TContractVO;
import com.ruoyi.web.controller.tool.NumberToChineseUtils;
import com.ruoyi.web.controller.tool.WordUtil;
-import io.swagger.annotations.Api;
-import com.ruoyi.system.vo.TContractVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
@@ -44,7 +50,6 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
-import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.*;
@@ -71,29 +76,58 @@
private TBillService billService;
@Autowired
private TCheckAcceptRecordService checkAcceptRecordService;
+ @Autowired
+ private StateProcessTemplateService stateProcessTemplateService;
+ @Autowired
+ private FlwTaskMapper flwTaskMapper;
- @ApiOperation(value = "测试生成账单")
- @PostMapping(value = "/testBill")
- public R testBill(String id) {
- SignContractDTO signContractDTO = new SignContractDTO();
- signContractDTO.setId(id);
- contractService.signContract(signContractDTO);
- return R.ok();
- }
@ApiOperation(value = "获取合同分页列表")
@PostMapping(value = "/contractList")
- @PreAuthorize("@ss.hasPermi('system:contract:list')")
-
+ @PreAuthorize("@ss.hasPermi('contract:list')")
public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
return R.ok(contractService.contractList(query));
}
@Log(title = "合同管理-新增合同", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增合同")
@PostMapping(value = "/addContract")
- @PreAuthorize("@ss.hasPermi('system:contract:add')")
+ @PreAuthorize("@ss.hasPermi('contract:list:add')")
public R<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
+ long count = contractService.count(new LambdaQueryWrapper<TContract>().eq(TContract::getContractNumber, dto.getContractNumber()));
+ if (count!=0){
+ return R.fail("合同编号不可重复");
+ }
dto.setChangeRent(dto.getMonthRent());
contractService.save(dto);
+ if (dto.getStatus().equals("2")){
+ //发起合同新增审批
+ ProcessStartBO processStartBO = new ProcessStartBO();
+ processStartBO.setCategory(ProcessCategoryEnum.CATEGORY1.getValue().toString());
+ processStartBO.setModuleName("合同新增审批");
+ processStartBO.setName(dto.getContractName());
+ //需要显示发起申请人所在单位
+// String cedName = SecurityUtils.getLoginUser().getUser().getDept().getDeptName();
+// String remark = String.format("【镇/街】:%s,【征收实施单位】:%s,【申请金额】:%s万元", stateProject.getStreet(), cedName, stateApplyRecord.getAmount());
+ processStartBO.setRemark("");
+ Map<String, Object> variable = new HashMap<>();
+ variable.put("projectId", dto.getId());
+ processStartBO.setVariable(variable);
+ //开启工作流程
+ Boolean start = stateProcessTemplateService.start(processStartBO);
+ if(start){
+ FlwTask flwTask = flwTaskMapper.selectOne(Wrappers.lambdaQuery(FlwTask.class)
+ .like(FlwTask::getVariable, dto.getId())
+ .orderByDesc(FlwTask::getCreateTime)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(flwTask)){
+ // 添加定时任务
+ Map<String, ? extends Object> maps =
+ new ImmutableMap.Builder<String, Long>().
+ put("id", flwTask.getId())
+ .build();
+ QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name+flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT,new Date(new Date().getTime()+48*60*60*1000L), maps);
+ }
+ }
+ }
if (dto.getIsIncreasing()){
TContractRentType tContractRentType = new TContractRentType();
tContractRentType.setContractId(dto.getId());
@@ -109,8 +143,7 @@
@Log(title = "合同管理-编辑合同", businessType = BusinessType.UPDATE)
@ApiOperation(value = "编辑合同")
@PostMapping(value = "/updateContract")
- @PreAuthorize("@ss.hasPermi('system:contract:update')")
-
+ @PreAuthorize("@ss.hasPermi('contract:list:edit')")
public R<Boolean> updateContract(@Validated @RequestBody TContractDTO dto) {
contractService.updateById(dto);
contractRentTypeService.remove(new LambdaQueryWrapper<TContractRentType>()
@@ -125,12 +158,41 @@
tContractRentType.setCycleTime(dto.getCycleTime());
contractRentTypeService.save(tContractRentType);
}
+ if (dto.getStatus().equals("2")){
+ //发起合同新增审批
+ ProcessStartBO processStartBO = new ProcessStartBO();
+ processStartBO.setCategory(ProcessCategoryEnum.CATEGORY1.getValue().toString());
+ processStartBO.setModuleName("合同新增审批");
+ processStartBO.setName(dto.getContractName());
+ //需要显示发起申请人所在单位
+// String cedName = SecurityUtils.getLoginUser().getUser().getDept().getDeptName();
+// String remark = String.format("【镇/街】:%s,【征收实施单位】:%s,【申请金额】:%s万元", stateProject.getStreet(), cedName, stateApplyRecord.getAmount());
+ processStartBO.setRemark("");
+ Map<String, Object> variable = new HashMap<>();
+ variable.put("projectId", dto.getId());
+ processStartBO.setVariable(variable);
+ //开启工作流程
+ Boolean start = stateProcessTemplateService.start(processStartBO);
+ if(start){
+ FlwTask flwTask = flwTaskMapper.selectOne(Wrappers.lambdaQuery(FlwTask.class)
+ .like(FlwTask::getVariable, dto.getId())
+ .orderByDesc(FlwTask::getCreateTime)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(flwTask)){
+ // 添加定时任务
+ Map<String, ? extends Object> maps =
+ new ImmutableMap.Builder<String, Long>().
+ put("id", flwTask.getId())
+ .build();
+ QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name+flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT,new Date(new Date().getTime()+48*60*60*1000L), maps);
+ }
+ }
+ }
return R.ok();
}
@Log(title = "合同管理-批量删除合同", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除合同")
- @PreAuthorize("@ss.hasPermi('system:contract:delete')")
-
+ @PreAuthorize("@ss.hasPermi('contract:list:delete')")
@DeleteMapping(value = "/deleteContractByIds")
public R<Boolean> deleteContractByIds(@RequestParam String ids) {
if (StringUtils.isNotEmpty(ids)){
@@ -141,27 +203,22 @@
@ApiOperation(value = "查询合同信息信息")
@GetMapping(value = "/getContractById")
- @PreAuthorize("@ss.hasPermi('system:contract:detail')")
-
+ @PreAuthorize("@ss.hasPermi('contract:list:detail')")
public R<TContractVO> getContractById(@RequestParam String id) {
TContractVO res = new TContractVO();
TContract contract = contractService.getById(id);
BeanUtils.copyProperties(contract,res);
- res.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,res.getPayType()));
- res.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,res.getStatus()));
TContractRentType contractRentType = contractRentTypeService.lambdaQuery().eq(TContractRentType::getContractId, id).one();
if (contractRentType!=null){
BeanUtils.copyProperties(contractRentType,res);
}
- TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>()
- .eq(TContract::getHouseId,contract.getHouseId())
- .eq(TContract::getStatus, 4)
- .le(TContract::getStartTime, LocalDateTime.now())
- .ge(TContract::getEndTime, LocalDateTime.now()));
+// TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>()
+// .eq(TContract::getHouseId,contract.getHouseId())
+// .eq(TContract::getStatus, 4)
+// .le(TContract::getStartTime, LocalDateTime.now())
+// .ge(TContract::getEndTime, LocalDateTime.now()));
THouse house = houseService.getById(contract.getHouseId());
- if (oldContract!=null){
- house.setTenantType(oldContract.getPayType());
- }
+ house.setTenantType(contract.getPayType());
res.setHouse(house);
List<TBill> list = billService.lambdaQuery()
.eq(TBill::getContractId, id)
@@ -172,24 +229,25 @@
payMoney = payMoney.add(tBill.getPayFeesMoney()).add(tBill.getPayableFeesPenalty());
}
TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery().eq(TCheckAcceptRecord::getContractId, id).one();
- res.setCheckResult(Objects.nonNull(tCheckAcceptRecord)?tCheckAcceptRecord.getCheckResult():false);
+ res.setCheckResult(Objects.nonNull(tCheckAcceptRecord)&&Objects.nonNull(tCheckAcceptRecord.getCheckResult())?tCheckAcceptRecord.getCheckResult():false);
res.setPayMoney(payMoney);
return R.ok(res);
}
@Log(title = "合同管理-撤销审批", businessType = BusinessType.UPDATE)
@ApiOperation(value = "撤销审批")
- @PreAuthorize("@ss.hasPermi('system:contract:revoke')")
-
- @GetMapping(value = "/updateContractStatus")
- public R<Boolean> updateContractStatus(String id) {
- TContract contract = contractService.getById(id);
+ @PreAuthorize("@ss.hasPermi('contract:list:cancel')")
+ @PostMapping(value = "/updateContractStatus")
+ public R<Boolean> updateContractStatus(@RequestBody RevokeDTO dto) {
+ TContract contract = contractService.getById(dto.getContractId());
contract.setStatus("1");
contractService.updateById(contract);
+ // 撤销审批实例
+ stateProcessTemplateService.revoke(dto.getInstanceId());
+
return R.ok();
}
- @PreAuthorize("@ss.hasPermi('system:contract:confirm')")
-
+ @PreAuthorize("@ss.hasPermi('contract:list:settlement')")
@Log(title = "合同管理-确认结算", businessType = BusinessType.UPDATE)
@ApiOperation(value = "确认结算")
@PostMapping(value = "/confirmSettlement")
@@ -202,21 +260,18 @@
}
@ApiOperation(value = "终止合同剩余未缴费账单列表")
@PostMapping(value = "/contractBillList")
- @PreAuthorize("@ss.hasPermi('system:contract:billList')")
public R<PageInfo<BillVO>> contractBillList(@RequestBody TContractBillQuery query) {
return R.ok(contractService.contractBillList(query));
}
@ApiOperation(value = "终止合同")
@PostMapping(value = "/terminateContract")
- @PreAuthorize("@ss.hasPermi('system:contract:terminate')")
+ @PreAuthorize("@ss.hasPermi('contract:list:break')")
public R terminateContract(@RequestBody TerminateContractDTO dto) {
contractService.terminateContract(dto);
- // 生成房屋验收记录 待验收
return R.ok();
}
@ApiOperation(value = "根据合同id查看验收记录")
@GetMapping(value = "/getCheckByContractId")
- @PreAuthorize("@ss.hasPermi('system:contract:checkDetail')")
public R<CheckAcceptRecordVO> getCheckByContractId(String id) {
return R.ok(contractService.getCheckByContractId(id));
}
@@ -225,7 +280,7 @@
@ApiOperation(value = "生成合同附件")
@PostMapping("/set")
@Log(title = "生成合同附件", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:contract:set')")
+ @PreAuthorize("@ss.hasPermi('contract:list:generate')")
public R<List<String>> set(@RequestBody SetContractDto dto,HttpServletResponse response){
List<TContract> list = contractService.lambdaQuery().in(TContract::getId, dto.getIds()).list();
List<String> res = new ArrayList<>();
@@ -265,7 +320,7 @@
* 导出
*/
@ApiOperation(value = "导出")
- @PreAuthorize("@ss.hasPermi('system:contract:export')")
+ @PreAuthorize("@ss.hasPermi('contract:list:export')")
@Log(title = "导出", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void exportOpticalInspection(@RequestBody TContractQuery query)
--
Gitblit v1.7.1