java/xizang.git

			@@ -3,8 +3,10 @@
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			import org.springframework.format.annotation.DateTimeFormat;

			import java.io.Serializable;
			import java.util.Date;

			@Data
			@ApiModel(value = "终止合同DTO")
			@@ -16,4 +18,8 @@
			@ApiModelProperty(value = "备注说明")
			private String terminateRemark;

			@ApiModelProperty(value = "终止日期")
			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date terminateTime;

			}

			@@ -28,17 +28,23 @@
			import com.google.common.collect.ImmutableMap;
			import com.ruoyi.common.core.domain.entity.SysRole;
			import com.ruoyi.common.enums.ProcessCategoryEnum;
			import com.ruoyi.common.enums.SubmitStatusEnum;
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.system.mapper.TCheckAcceptRecordMapper;
			import com.ruoyi.system.model.*;
			import com.ruoyi.system.service.*;
			import com.ruoyi.system.model.TBill;
			import com.ruoyi.system.model.TCheckAcceptRecord;
			import com.ruoyi.system.model.TContract;
			import com.ruoyi.system.model.TContractRentType;
			import com.ruoyi.system.model.THouse;
			import com.ruoyi.system.service.ISysRoleService;
			import com.ruoyi.system.service.TBillService;
			import com.ruoyi.system.service.TContractRentTypeService;
			import com.ruoyi.system.service.TContractService;
			import com.ruoyi.system.service.THouseService;
			import com.ruoyi.system.task.base.QuartzManager;
			import com.ruoyi.system.task.base.TimeJobType;
			import com.ruoyi.system.task.jobs.StateProcessJob;
			import lombok.RequiredArgsConstructor;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Component;

			import java.math.BigDecimal;
			@@ -46,7 +52,11 @@
			import java.time.LocalDateTime;
			import java.time.temporal.ChronoUnit;
			import java.time.temporal.TemporalAdjusters;
			import java.util.*;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.Map;
			import java.util.Objects;
			import java.util.function.Supplier;
			import java.util.stream.Collectors;

			@@ -992,6 +1002,10 @@
			contractService.updateContractAuditStatus(processParameter.getString("projectId"), submitStatus);
			// 生成验收记录
			TContract contract = contractService.getById(processParameter.getString("projectId"));
			//更新合同结束时间
			contract.setEndTime(contract.getTerminateTime());
			contractService.updateById(contract);

			TCheckAcceptRecord tCheckAcceptRecord = new TCheckAcceptRecord();
			tCheckAcceptRecord.setContractId(contract.getId());
			tCheckAcceptRecord.setHouseId(contract.getHouseId());

	ruoyi-system/src/main/java/com/ruoyi/system/dto/TerminateContractDTO.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -184,4 +184,8 @@
			@TableField("house_use_scope")
			private String houseUseScope;

			@ApiModelProperty(value = "终止日期-前端传的")
			@TableField("terminate_time")
			private LocalDateTime terminateTime;

			}