10-27-添加审核
This commit is contained in:
@ -1,17 +1,17 @@
|
|||||||
package org.dromara.xzd.domain;
|
package org.dromara.xzd.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
import java.io.Serial;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 承包合同竣工结算对象 xzd_contract_account
|
* 承包合同竣工结算对象 xzd_contract_account
|
||||||
*
|
*
|
||||||
@ -32,6 +32,11 @@ public class XzdContractAccount extends BaseEntity {
|
|||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单据编号
|
* 单据编号
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -30,6 +30,11 @@ public class XzdContractAgreement extends BaseEntity {
|
|||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 合同编码
|
* 合同编码
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,15 +1,15 @@
|
|||||||
package org.dromara.xzd.domain;
|
package org.dromara.xzd.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 承包合同变更对象 xzd_contract_change
|
* 承包合同变更对象 xzd_contract_change
|
||||||
@ -31,6 +31,11 @@ public class XzdContractChange extends BaseEntity {
|
|||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单据编码
|
* 单据编码
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,17 +1,17 @@
|
|||||||
package org.dromara.xzd.domain;
|
package org.dromara.xzd.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
import java.io.Serial;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 承包合同信息对象 xzd_contract_details
|
* 承包合同信息对象 xzd_contract_details
|
||||||
*
|
*
|
||||||
@ -32,6 +32,11 @@ public class XzdContractDetails extends BaseEntity {
|
|||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 所属部门ID
|
* 所属部门ID
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -31,6 +31,11 @@ public class XzdContractProgressSettlement extends BaseEntity {
|
|||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 方案id
|
* 方案id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -32,6 +32,11 @@ public class XzdContractTermination extends BaseEntity {
|
|||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门id
|
* 部门id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -36,6 +36,11 @@ public class XzdSupplierInfo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long cityCode;
|
private Long cityCode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单位编号
|
* 单位编号
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,17 +1,17 @@
|
|||||||
package org.dromara.xzd.domain;
|
package org.dromara.xzd.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
import java.io.Serial;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 承包合同竣工结算调整对象 xzd_workcontract_completion_adjust
|
* 承包合同竣工结算调整对象 xzd_workcontract_completion_adjust
|
||||||
*
|
*
|
||||||
@ -32,6 +32,11 @@ public class XzdWorkcontractCompletionAdjust extends BaseEntity {
|
|||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门id
|
* 部门id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -2,14 +2,15 @@ package org.dromara.xzd.domain.bo;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.dromara.xzd.domain.XzdContractAccount;
|
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import org.dromara.common.core.validate.AddGroup;
|
|
||||||
import org.dromara.common.core.validate.EditGroup;
|
|
||||||
import io.github.linpeilie.annotations.AutoMapper;
|
import io.github.linpeilie.annotations.AutoMapper;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import jakarta.validation.constraints.*;
|
import org.dromara.common.core.validate.AddGroup;
|
||||||
|
import org.dromara.common.core.validate.EditGroup;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
|
import org.dromara.xzd.domain.XzdContractAccount;
|
||||||
import org.dromara.xzd.domain.XzdJsqdTz;
|
import org.dromara.xzd.domain.XzdJsqdTz;
|
||||||
import org.dromara.xzd.domain.XzdZbjghyd;
|
import org.dromara.xzd.domain.XzdZbjghyd;
|
||||||
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
|
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
|
||||||
@ -36,6 +37,11 @@ public class XzdContractAccountBo extends BaseEntity {
|
|||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单据编号
|
* 单据编号
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -29,6 +29,11 @@ public class XzdContractAgreementBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 合同编码
|
* 合同编码
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -33,6 +33,11 @@ public class XzdContractChangeBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单据编码
|
* 单据编码
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,15 +1,16 @@
|
|||||||
package org.dromara.xzd.domain.bo;
|
package org.dromara.xzd.domain.bo;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
|
|
||||||
import org.dromara.xzd.domain.*;
|
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import org.dromara.common.core.validate.AddGroup;
|
|
||||||
import org.dromara.common.core.validate.EditGroup;
|
|
||||||
import io.github.linpeilie.annotations.AutoMapper;
|
import io.github.linpeilie.annotations.AutoMapper;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import jakarta.validation.constraints.*;
|
import org.dromara.common.core.validate.AddGroup;
|
||||||
|
import org.dromara.common.core.validate.EditGroup;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
|
import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
|
||||||
|
import org.dromara.xzd.domain.*;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
@ -32,6 +33,11 @@ public class XzdContractDetailsBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 所属部门ID
|
* 所属部门ID
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -36,6 +36,11 @@ public class XzdContractProgressSettlementBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 方案id
|
* 方案id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -31,6 +31,11 @@ public class XzdContractTerminationBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门id
|
* 部门id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,15 +1,16 @@
|
|||||||
package org.dromara.xzd.domain.bo;
|
package org.dromara.xzd.domain.bo;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.dromara.xzd.domain.XzdJsqdTz;
|
|
||||||
import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust;
|
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import org.dromara.common.core.validate.AddGroup;
|
|
||||||
import org.dromara.common.core.validate.EditGroup;
|
|
||||||
import io.github.linpeilie.annotations.AutoMapper;
|
import io.github.linpeilie.annotations.AutoMapper;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import jakarta.validation.constraints.*;
|
import org.dromara.common.core.validate.AddGroup;
|
||||||
|
import org.dromara.common.core.validate.EditGroup;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
|
import org.dromara.xzd.domain.XzdJsqdTz;
|
||||||
|
import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust;
|
||||||
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
|
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
@ -39,6 +40,11 @@ public class XzdWorkcontractCompletionAdjustBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long deptId;
|
private Long deptId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单据编号
|
* 单据编号
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -41,6 +41,11 @@ public class XzdContractAccountVo implements Serializable {
|
|||||||
@ExcelProperty(value = "id")
|
@ExcelProperty(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单据编号
|
* 单据编号
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -36,6 +36,11 @@ public class XzdContractAgreementVo implements Serializable {
|
|||||||
@ExcelProperty(value = "")
|
@ExcelProperty(value = "")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 合同编码
|
* 合同编码
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -40,6 +40,11 @@ public class XzdContractChangeVo implements Serializable {
|
|||||||
@ExcelProperty(value = "")
|
@ExcelProperty(value = "")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单据编码
|
* 单据编码
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -40,6 +40,11 @@ public class XzdContractDetailsVo implements Serializable {
|
|||||||
@ExcelProperty(value = "")
|
@ExcelProperty(value = "")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 所属部门ID
|
* 所属部门ID
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -41,6 +41,11 @@ public class XzdContractProgressSettlementVo implements Serializable {
|
|||||||
@ExcelProperty(value = "id")
|
@ExcelProperty(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 方案id
|
* 方案id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -36,6 +36,11 @@ public class XzdContractTerminationVo implements Serializable {
|
|||||||
@ExcelProperty(value = "")
|
@ExcelProperty(value = "")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门id
|
* 部门id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -41,6 +41,11 @@ public class XzdSupplierInfoVo implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private Long cityCode;
|
private Long cityCode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单位编号
|
* 单位编号
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,23 +1,21 @@
|
|||||||
package org.dromara.xzd.domain.vo;
|
package org.dromara.xzd.domain.vo;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import org.dromara.xzd.domain.XzdContractAccount;
|
|
||||||
import org.dromara.xzd.domain.XzdJsqdTz;
|
|
||||||
import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust;
|
|
||||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||||
import com.alibaba.excel.annotation.ExcelProperty;
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
|
||||||
import io.github.linpeilie.annotations.AutoMapper;
|
import io.github.linpeilie.annotations.AutoMapper;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||||
|
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||||
|
import org.dromara.xzd.domain.XzdJsqdTz;
|
||||||
|
import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust;
|
||||||
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
|
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@ -41,6 +39,11 @@ public class XzdWorkcontractCompletionAdjustVo implements Serializable {
|
|||||||
@ExcelProperty(value = "id")
|
@ExcelProperty(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
private Long deptId;
|
private Long deptId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.dromara.common.core.domain.event.ProcessEvent;
|
||||||
import org.dromara.common.core.utils.MapstructUtils;
|
import org.dromara.common.core.utils.MapstructUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import org.dromara.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
@ -24,7 +26,9 @@ import org.dromara.xzd.service.IXzdCorrespondentList;
|
|||||||
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
|
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
|
||||||
import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl;
|
import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -37,6 +41,7 @@ import java.util.Map;
|
|||||||
* @author Lion Li
|
* @author Lion Li
|
||||||
* @date 2025-10-15
|
* @date 2025-10-15
|
||||||
*/
|
*/
|
||||||
|
@Slf4j
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Service
|
@Service
|
||||||
public class XzdContractAccountServiceImpl extends ServiceImpl<XzdContractAccountMapper, XzdContractAccount> implements IXzdContractAccountService {
|
public class XzdContractAccountServiceImpl extends ServiceImpl<XzdContractAccountMapper, XzdContractAccount> implements IXzdContractAccountService {
|
||||||
@ -410,4 +415,24 @@ public class XzdContractAccountServiceImpl extends ServiceImpl<XzdContractAccoun
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
|
||||||
|
* 正常使用只需#processEvent.flowCode=='leave1'
|
||||||
|
* 示例为了方便则使用startsWith匹配了全部示例key
|
||||||
|
*
|
||||||
|
* @param processEvent 参数
|
||||||
|
*/
|
||||||
|
@EventListener(condition = "#processEvent.flowCode.endsWith('XzdContractAccount')")
|
||||||
|
@Transactional
|
||||||
|
public void processPlansHandler(ProcessEvent processEvent) {
|
||||||
|
log.info("承包合同竣工结算审核任务执行了{}", processEvent.toString());
|
||||||
|
String id = processEvent.getBusinessId();
|
||||||
|
XzdContractAccount byId = this.getById(Long.valueOf(id));
|
||||||
|
byId.setShzt(processEvent.getStatus());
|
||||||
|
boolean b = this.updateById(byId);
|
||||||
|
if (!b) {
|
||||||
|
log.error("承包合同竣工结算审核任务更新状态失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.dromara.common.core.domain.event.ProcessEvent;
|
||||||
import org.dromara.common.core.utils.MapstructUtils;
|
import org.dromara.common.core.utils.MapstructUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import org.dromara.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
@ -22,6 +24,7 @@ import org.dromara.xzd.mapper.XzdContractAgreementMapper;
|
|||||||
import org.dromara.xzd.service.IXzdContractAgreementService;
|
import org.dromara.xzd.service.IXzdContractAgreementService;
|
||||||
import org.dromara.xzd.service.IXzdCorrespondentList;
|
import org.dromara.xzd.service.IXzdCorrespondentList;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@ -33,6 +36,7 @@ import java.util.*;
|
|||||||
* @author Lion Li
|
* @author Lion Li
|
||||||
* @date 2025-10-12
|
* @date 2025-10-12
|
||||||
*/
|
*/
|
||||||
|
@Slf4j
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Service
|
@Service
|
||||||
public class XzdContractAgreementServiceImpl extends ServiceImpl<XzdContractAgreementMapper, XzdContractAgreement> implements IXzdContractAgreementService {
|
public class XzdContractAgreementServiceImpl extends ServiceImpl<XzdContractAgreementMapper, XzdContractAgreement> implements IXzdContractAgreementService {
|
||||||
@ -233,4 +237,24 @@ public class XzdContractAgreementServiceImpl extends ServiceImpl<XzdContractAgre
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
|
||||||
|
* 正常使用只需#processEvent.flowCode=='leave1'
|
||||||
|
* 示例为了方便则使用startsWith匹配了全部示例key
|
||||||
|
*
|
||||||
|
* @param processEvent 参数
|
||||||
|
*/
|
||||||
|
@EventListener(condition = "#processEvent.flowCode.endsWith('XzdContractAgreement')")
|
||||||
|
@Transactional
|
||||||
|
public void processPlansHandler(ProcessEvent processEvent) {
|
||||||
|
log.info("合作协议审核任务执行了{}", processEvent.toString());
|
||||||
|
String id = processEvent.getBusinessId();
|
||||||
|
XzdContractAgreement byId = this.getById(Long.valueOf(id));
|
||||||
|
byId.setShzt(processEvent.getStatus());
|
||||||
|
boolean b = this.updateById(byId);
|
||||||
|
if (!b) {
|
||||||
|
log.error("合作协议审核任务更新状态失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.dromara.common.core.domain.event.ProcessEvent;
|
||||||
import org.dromara.common.core.utils.MapstructUtils;
|
import org.dromara.common.core.utils.MapstructUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import org.dromara.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
@ -27,6 +29,7 @@ import org.dromara.xzd.mapper.XzdContractChangeMapper;
|
|||||||
import org.dromara.xzd.service.IXzdContractChangeService;
|
import org.dromara.xzd.service.IXzdContractChangeService;
|
||||||
import org.dromara.xzd.service.IXzdCorrespondentList;
|
import org.dromara.xzd.service.IXzdCorrespondentList;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@ -43,6 +46,7 @@ import java.util.Map;
|
|||||||
*/
|
*/
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Service
|
@Service
|
||||||
|
@Slf4j
|
||||||
public class XzdContractChangeServiceImpl extends ServiceImpl<XzdContractChangeMapper, XzdContractChange> implements IXzdContractChangeService {
|
public class XzdContractChangeServiceImpl extends ServiceImpl<XzdContractChangeMapper, XzdContractChange> implements IXzdContractChangeService {
|
||||||
|
|
||||||
private final XzdContractChangeMapper baseMapper;
|
private final XzdContractChangeMapper baseMapper;
|
||||||
@ -467,4 +471,24 @@ public class XzdContractChangeServiceImpl extends ServiceImpl<XzdContractChangeM
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
|
||||||
|
* 正常使用只需#processEvent.flowCode=='leave1'
|
||||||
|
* 示例为了方便则使用startsWith匹配了全部示例key
|
||||||
|
*
|
||||||
|
* @param processEvent 参数
|
||||||
|
*/
|
||||||
|
@EventListener(condition = "#processEvent.flowCode.endsWith('XzdContractChange')")
|
||||||
|
@Transactional
|
||||||
|
public void processPlansHandler(ProcessEvent processEvent) {
|
||||||
|
log.info("承包合同变更审核任务执行了{}", processEvent.toString());
|
||||||
|
String id = processEvent.getBusinessId();
|
||||||
|
XzdContractChange byId = this.getById(Long.valueOf(id));
|
||||||
|
byId.setShzt(processEvent.getStatus());
|
||||||
|
boolean b = this.updateById(byId);
|
||||||
|
if (!b) {
|
||||||
|
log.error("承包合同变更审核任务更新状态失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.dromara.common.core.domain.event.ProcessEvent;
|
||||||
import org.dromara.common.core.utils.MapstructUtils;
|
import org.dromara.common.core.utils.MapstructUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import org.dromara.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
@ -28,6 +30,7 @@ import org.dromara.xzd.mapper.XzdContractDetailsMapper;
|
|||||||
import org.dromara.xzd.service.IXzdContractDetailsService;
|
import org.dromara.xzd.service.IXzdContractDetailsService;
|
||||||
import org.dromara.xzd.service.IXzdCorrespondentList;
|
import org.dromara.xzd.service.IXzdCorrespondentList;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@ -42,6 +45,7 @@ import java.util.Map;
|
|||||||
* @author Lion Li
|
* @author Lion Li
|
||||||
* @date 2025-10-12
|
* @date 2025-10-12
|
||||||
*/
|
*/
|
||||||
|
@Slf4j
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Service
|
@Service
|
||||||
public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetailsMapper, XzdContractDetails> implements IXzdContractDetailsService {
|
public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetailsMapper, XzdContractDetails> implements IXzdContractDetailsService {
|
||||||
@ -566,4 +570,24 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
|
||||||
|
* 正常使用只需#processEvent.flowCode=='leave1'
|
||||||
|
* 示例为了方便则使用startsWith匹配了全部示例key
|
||||||
|
*
|
||||||
|
* @param processEvent 参数
|
||||||
|
*/
|
||||||
|
@EventListener(condition = "#processEvent.flowCode.endsWith('XzdContractDetails')")
|
||||||
|
@Transactional
|
||||||
|
public void processPlansHandler(ProcessEvent processEvent) {
|
||||||
|
log.info("承包合同审核任务执行了{}", processEvent.toString());
|
||||||
|
String id = processEvent.getBusinessId();
|
||||||
|
XzdContractDetails byId = this.getById(Long.valueOf(id));
|
||||||
|
byId.setShzt(processEvent.getStatus());
|
||||||
|
boolean b = this.updateById(byId);
|
||||||
|
if (!b) {
|
||||||
|
log.error("承包合同审核任务更新状态失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.dromara.common.core.domain.R;
|
import org.dromara.common.core.domain.R;
|
||||||
|
import org.dromara.common.core.domain.event.ProcessEvent;
|
||||||
import org.dromara.common.core.utils.MapstructUtils;
|
import org.dromara.common.core.utils.MapstructUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import org.dromara.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
@ -30,6 +32,7 @@ import org.dromara.xzd.settlement.service.impl.XzdAlterationInventoryServiceImpl
|
|||||||
import org.dromara.xzd.settlement.service.impl.XzdContractInventoryServiceImpl;
|
import org.dromara.xzd.settlement.service.impl.XzdContractInventoryServiceImpl;
|
||||||
import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl;
|
import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@ -44,6 +47,7 @@ import java.util.Map;
|
|||||||
* @author Lion Li
|
* @author Lion Li
|
||||||
* @date 2025-10-14
|
* @date 2025-10-14
|
||||||
*/
|
*/
|
||||||
|
@Slf4j
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Service
|
@Service
|
||||||
public class XzdContractProgressSettlementServiceImpl extends ServiceImpl<XzdContractProgressSettlementMapper, XzdContractProgressSettlement> implements IXzdContractProgressSettlementService {
|
public class XzdContractProgressSettlementServiceImpl extends ServiceImpl<XzdContractProgressSettlementMapper, XzdContractProgressSettlement> implements IXzdContractProgressSettlementService {
|
||||||
@ -535,4 +539,24 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl<XzdCon
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
|
||||||
|
* 正常使用只需#processEvent.flowCode=='leave1'
|
||||||
|
* 示例为了方便则使用startsWith匹配了全部示例key
|
||||||
|
*
|
||||||
|
* @param processEvent 参数
|
||||||
|
*/
|
||||||
|
@EventListener(condition = "#processEvent.flowCode.endsWith('ProgressSettlement')")
|
||||||
|
@Transactional
|
||||||
|
public void processPlansHandler(ProcessEvent processEvent) {
|
||||||
|
log.info("承包合同进度结算审核任务执行了{}", processEvent.toString());
|
||||||
|
String id = processEvent.getBusinessId();
|
||||||
|
XzdContractProgressSettlement byId = this.getById(Long.valueOf(id));
|
||||||
|
byId.setShzt(processEvent.getStatus());
|
||||||
|
boolean b = this.updateById(byId);
|
||||||
|
if (!b) {
|
||||||
|
log.error("承包合同进度结算审核任务更新状态失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.dromara.common.core.domain.event.ProcessEvent;
|
||||||
import org.dromara.common.core.utils.MapstructUtils;
|
import org.dromara.common.core.utils.MapstructUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import org.dromara.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
@ -17,6 +19,7 @@ import org.dromara.xzd.domain.vo.XzdContractTerminationVo;
|
|||||||
import org.dromara.xzd.mapper.XzdContractTerminationMapper;
|
import org.dromara.xzd.mapper.XzdContractTerminationMapper;
|
||||||
import org.dromara.xzd.service.IXzdContractTerminationService;
|
import org.dromara.xzd.service.IXzdContractTerminationService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@ -31,6 +34,7 @@ import java.util.Map;
|
|||||||
* @author Lion Li
|
* @author Lion Li
|
||||||
* @date 2025-10-13
|
* @date 2025-10-13
|
||||||
*/
|
*/
|
||||||
|
@Slf4j
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Service
|
@Service
|
||||||
public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTerminationMapper, XzdContractTermination> implements IXzdContractTerminationService {
|
public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTerminationMapper, XzdContractTermination> implements IXzdContractTerminationService {
|
||||||
@ -189,4 +193,24 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
|
||||||
|
* 正常使用只需#processEvent.flowCode=='leave1'
|
||||||
|
* 示例为了方便则使用startsWith匹配了全部示例key
|
||||||
|
*
|
||||||
|
* @param processEvent 参数
|
||||||
|
*/
|
||||||
|
@EventListener(condition = "#processEvent.flowCode.endsWith('XzdContractTermination')")
|
||||||
|
@Transactional
|
||||||
|
public void processPlansHandler(ProcessEvent processEvent) {
|
||||||
|
log.info("承包合同终止审核任务执行了{}", processEvent.toString());
|
||||||
|
String id = processEvent.getBusinessId();
|
||||||
|
XzdContractTermination byId = this.getById(Long.valueOf(id));
|
||||||
|
byId.setShzt(processEvent.getStatus());
|
||||||
|
boolean b = this.updateById(byId);
|
||||||
|
if (!b) {
|
||||||
|
log.error("承包合同终止审核任务更新状态失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.dromara.common.core.domain.R;
|
import org.dromara.common.core.domain.R;
|
||||||
|
import org.dromara.common.core.domain.event.ProcessEvent;
|
||||||
import org.dromara.common.core.service.XzdSupplierInfoService;
|
import org.dromara.common.core.service.XzdSupplierInfoService;
|
||||||
import org.dromara.common.core.utils.MapstructUtils;
|
import org.dromara.common.core.utils.MapstructUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import org.dromara.common.core.utils.StringUtils;
|
||||||
@ -26,6 +28,7 @@ import org.dromara.xzd.service.IXzdCustomerSupplierYybService;
|
|||||||
import org.dromara.xzd.service.IXzdSupplierInfoService;
|
import org.dromara.xzd.service.IXzdSupplierInfoService;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@ -37,6 +40,7 @@ import java.util.*;
|
|||||||
* @author Lion Li
|
* @author Lion Li
|
||||||
* @date 2025-09-30
|
* @date 2025-09-30
|
||||||
*/
|
*/
|
||||||
|
@Slf4j
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Service
|
@Service
|
||||||
public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMapper, XzdSupplierInfo> implements IXzdSupplierInfoService, XzdSupplierInfoService {
|
public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMapper, XzdSupplierInfo> implements IXzdSupplierInfoService, XzdSupplierInfoService {
|
||||||
@ -946,4 +950,25 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
|
|||||||
}
|
}
|
||||||
return xzdSupplierInfoVo.getUnitName();
|
return xzdSupplierInfoVo.getUnitName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
|
||||||
|
* 正常使用只需#processEvent.flowCode=='leave1'
|
||||||
|
* 示例为了方便则使用startsWith匹配了全部示例key
|
||||||
|
*
|
||||||
|
* @param processEvent 参数
|
||||||
|
*/
|
||||||
|
@EventListener(condition = "#processEvent.flowCode.endsWith('XzdSupplierInfo')")
|
||||||
|
@Transactional
|
||||||
|
public void processPlansHandler(ProcessEvent processEvent) {
|
||||||
|
log.info("供应商审核任务执行了{}", processEvent.toString());
|
||||||
|
String id = processEvent.getBusinessId();
|
||||||
|
XzdSupplierInfo byId = this.getById(Long.valueOf(id));
|
||||||
|
byId.setShzt(processEvent.getStatus());
|
||||||
|
boolean b = this.updateById(byId);
|
||||||
|
if (!b) {
|
||||||
|
log.error("供应商审核任务更新状态失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.dromara.common.core.domain.event.ProcessEvent;
|
||||||
import org.dromara.common.core.utils.MapstructUtils;
|
import org.dromara.common.core.utils.MapstructUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import org.dromara.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
@ -23,6 +25,7 @@ import org.dromara.xzd.service.IXzdWorkcontractCompletionAdjustService;
|
|||||||
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
|
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
|
||||||
import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl;
|
import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@ -39,6 +42,7 @@ import java.util.Map;
|
|||||||
*/
|
*/
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Service
|
@Service
|
||||||
|
@Slf4j
|
||||||
public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl<XzdWorkcontractCompletionAdjustMapper, XzdWorkcontractCompletionAdjust> implements IXzdWorkcontractCompletionAdjustService {
|
public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl<XzdWorkcontractCompletionAdjustMapper, XzdWorkcontractCompletionAdjust> implements IXzdWorkcontractCompletionAdjustService {
|
||||||
|
|
||||||
private final XzdWorkcontractCompletionAdjustMapper baseMapper;
|
private final XzdWorkcontractCompletionAdjustMapper baseMapper;
|
||||||
@ -361,4 +365,24 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl<XzdW
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
|
||||||
|
* 正常使用只需#processEvent.flowCode=='leave1'
|
||||||
|
* 示例为了方便则使用startsWith匹配了全部示例key
|
||||||
|
*
|
||||||
|
* @param processEvent 参数
|
||||||
|
*/
|
||||||
|
@EventListener(condition = "#processEvent.flowCode.endsWith('CompletionAdjust')")
|
||||||
|
@Transactional
|
||||||
|
public void processPlansHandler(ProcessEvent processEvent) {
|
||||||
|
log.info("承包合同竣工结算调整审核任务执行了{}", processEvent.toString());
|
||||||
|
String id = processEvent.getBusinessId();
|
||||||
|
XzdWorkcontractCompletionAdjust byId = this.getById(Long.valueOf(id));
|
||||||
|
byId.setShzt(processEvent.getStatus());
|
||||||
|
boolean b = this.updateById(byId);
|
||||||
|
if (!b) {
|
||||||
|
log.error("承包合同竣工结算调整审核任务更新状态失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,17 +1,17 @@
|
|||||||
package org.dromara.xzd.skyfk.cbhtsc.domain;
|
package org.dromara.xzd.skyfk.cbhtsc.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
import java.io.Serial;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 承包合同收款对象 xzd_contract_payment
|
* 承包合同收款对象 xzd_contract_payment
|
||||||
*
|
*
|
||||||
@ -32,6 +32,11 @@ public class XzdContractPayment extends BaseEntity {
|
|||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门id
|
* 部门id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,16 +1,17 @@
|
|||||||
package org.dromara.xzd.skyfk.cbhtsc.domain.bo;
|
package org.dromara.xzd.skyfk.cbhtsc.domain.bo;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import io.github.linpeilie.annotations.AutoMapper;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.dromara.common.core.validate.AddGroup;
|
||||||
|
import org.dromara.common.core.validate.EditGroup;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
import org.dromara.xzd.domain.bo.XzdContractSkxxBo;
|
import org.dromara.xzd.domain.bo.XzdContractSkxxBo;
|
||||||
import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkFapiaoBo;
|
import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkFapiaoBo;
|
||||||
import org.dromara.xzd.skyfk.cbhtsc.domain.XzdContractPayment;
|
import org.dromara.xzd.skyfk.cbhtsc.domain.XzdContractPayment;
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import org.dromara.common.core.validate.AddGroup;
|
|
||||||
import org.dromara.common.core.validate.EditGroup;
|
|
||||||
import io.github.linpeilie.annotations.AutoMapper;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.EqualsAndHashCode;
|
|
||||||
import jakarta.validation.constraints.*;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
@ -33,6 +34,11 @@ public class XzdContractPaymentBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门id
|
* 部门id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -40,6 +40,11 @@ public class XzdContractPaymentVo implements Serializable {
|
|||||||
@ExcelProperty(value = "id")
|
@ExcelProperty(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门id
|
* 部门id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.dromara.common.core.domain.event.ProcessEvent;
|
||||||
import org.dromara.common.core.utils.MapstructUtils;
|
import org.dromara.common.core.utils.MapstructUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import org.dromara.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
@ -33,6 +35,7 @@ import org.dromara.xzd.skyfk.cbhtsc.domain.vo.XzdContractPaymentVo;
|
|||||||
import org.dromara.xzd.skyfk.cbhtsc.mapper.XzdContractPaymentMapper;
|
import org.dromara.xzd.skyfk.cbhtsc.mapper.XzdContractPaymentMapper;
|
||||||
import org.dromara.xzd.skyfk.cbhtsc.service.IXzdContractPaymentService;
|
import org.dromara.xzd.skyfk.cbhtsc.service.IXzdContractPaymentService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@ -49,6 +52,7 @@ import java.util.Map;
|
|||||||
*/
|
*/
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Service
|
@Service
|
||||||
|
@Slf4j
|
||||||
public class XzdContractPaymentServiceImpl extends ServiceImpl<XzdContractPaymentMapper, XzdContractPayment> implements IXzdContractPaymentService {
|
public class XzdContractPaymentServiceImpl extends ServiceImpl<XzdContractPaymentMapper, XzdContractPayment> implements IXzdContractPaymentService {
|
||||||
|
|
||||||
private final XzdContractPaymentMapper baseMapper;
|
private final XzdContractPaymentMapper baseMapper;
|
||||||
@ -339,4 +343,24 @@ public class XzdContractPaymentServiceImpl extends ServiceImpl<XzdContractPaymen
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
|
||||||
|
* 正常使用只需#processEvent.flowCode=='leave1'
|
||||||
|
* 示例为了方便则使用startsWith匹配了全部示例key
|
||||||
|
*
|
||||||
|
* @param processEvent 参数
|
||||||
|
*/
|
||||||
|
@EventListener(condition = "#processEvent.flowCode.endsWith('XzdContractPayment')")
|
||||||
|
@Transactional
|
||||||
|
public void processPlansHandler(ProcessEvent processEvent) {
|
||||||
|
log.info("承包合同收款审核任务执行了{}", processEvent.toString());
|
||||||
|
String id = processEvent.getBusinessId();
|
||||||
|
XzdContractPayment byId = this.getById(Long.valueOf(id));
|
||||||
|
byId.setShzt(processEvent.getStatus());
|
||||||
|
boolean b = this.updateById(byId);
|
||||||
|
if (!b) {
|
||||||
|
log.error("承包合同收款审核任务更新状态失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,15 +1,15 @@
|
|||||||
package org.dromara.xzd.skyfk.fbhtfk.domain;
|
package org.dromara.xzd.skyfk.fbhtfk.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 收款与付款-分包合同付款对象 xzd_skyfk_fbhtfk
|
* 收款与付款-分包合同付款对象 xzd_skyfk_fbhtfk
|
||||||
@ -31,6 +31,11 @@ public class XzdSkyfkFbhtfk extends BaseEntity {
|
|||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门id
|
* 部门id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -34,6 +34,11 @@ public class XzdSkyfkFbhtfkBo extends BaseEntity {
|
|||||||
@NotNull(message = "id不能为空", groups = { EditGroup.class })
|
@NotNull(message = "id不能为空", groups = { EditGroup.class })
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门id
|
* 部门id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -39,6 +39,11 @@ public class XzdSkyfkFbhtfkVo implements Serializable {
|
|||||||
@ExcelProperty(value = "id")
|
@ExcelProperty(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门id
|
* 部门id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.dromara.common.core.domain.event.ProcessEvent;
|
||||||
import org.dromara.common.core.utils.MapstructUtils;
|
import org.dromara.common.core.utils.MapstructUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import org.dromara.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
@ -33,6 +35,7 @@ import org.dromara.xzd.skyfk.fbhtfk.domain.vo.XzdSkyfkFbhtfkVo;
|
|||||||
import org.dromara.xzd.skyfk.fbhtfk.mapper.XzdSkyfkFbhtfkMapper;
|
import org.dromara.xzd.skyfk.fbhtfk.mapper.XzdSkyfkFbhtfkMapper;
|
||||||
import org.dromara.xzd.skyfk.fbhtfk.service.IXzdSkyfkFbhtfkService;
|
import org.dromara.xzd.skyfk.fbhtfk.service.IXzdSkyfkFbhtfkService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@ -49,6 +52,7 @@ import java.util.Map;
|
|||||||
*/
|
*/
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Service
|
@Service
|
||||||
|
@Slf4j
|
||||||
public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper, XzdSkyfkFbhtfk> implements IXzdSkyfkFbhtfkService {
|
public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper, XzdSkyfkFbhtfk> implements IXzdSkyfkFbhtfkService {
|
||||||
|
|
||||||
private final XzdSkyfkFbhtfkMapper baseMapper;
|
private final XzdSkyfkFbhtfkMapper baseMapper;
|
||||||
@ -379,4 +383,24 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
|
||||||
|
* 正常使用只需#processEvent.flowCode=='leave1'
|
||||||
|
* 示例为了方便则使用startsWith匹配了全部示例key
|
||||||
|
*
|
||||||
|
* @param processEvent 参数
|
||||||
|
*/
|
||||||
|
@EventListener(condition = "#processEvent.flowCode.endsWith('XzdSkyfkFbhtfk')")
|
||||||
|
@Transactional
|
||||||
|
public void processPlansHandler(ProcessEvent processEvent) {
|
||||||
|
log.info("承包合同收款审核任务执行了{}", processEvent.toString());
|
||||||
|
String id = processEvent.getBusinessId();
|
||||||
|
XzdSkyfkFbhtfk byId = this.getById(Long.valueOf(id));
|
||||||
|
byId.setShzt(processEvent.getStatus());
|
||||||
|
boolean b = this.updateById(byId);
|
||||||
|
if (!b) {
|
||||||
|
log.error("承包合同收款审核任务更新状态失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,17 +1,17 @@
|
|||||||
package org.dromara.xzd.spykp.kpsq.domain;
|
package org.dromara.xzd.spykp.kpsq.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
import java.io.Serial;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 收票与开票-开票申请对象 xzd_spykp_kpsq
|
* 收票与开票-开票申请对象 xzd_spykp_kpsq
|
||||||
*
|
*
|
||||||
@ -32,6 +32,11 @@ public class XzdSpykpKpsq extends BaseEntity {
|
|||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 类型
|
* 类型
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,14 +1,15 @@
|
|||||||
package org.dromara.xzd.spykp.kpsq.domain.bo;
|
package org.dromara.xzd.spykp.kpsq.domain.bo;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsq;
|
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import org.dromara.common.core.validate.AddGroup;
|
|
||||||
import org.dromara.common.core.validate.EditGroup;
|
|
||||||
import io.github.linpeilie.annotations.AutoMapper;
|
import io.github.linpeilie.annotations.AutoMapper;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import jakarta.validation.constraints.*;
|
import org.dromara.common.core.validate.AddGroup;
|
||||||
|
import org.dromara.common.core.validate.EditGroup;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
|
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsq;
|
||||||
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsqKpmx;
|
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsqKpmx;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
@ -32,6 +33,11 @@ public class XzdSpykpKpsqBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 类型
|
* 类型
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,19 +1,18 @@
|
|||||||
package org.dromara.xzd.spykp.kpsq.domain.vo;
|
package org.dromara.xzd.spykp.kpsq.domain.vo;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsq;
|
|
||||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||||
import com.alibaba.excel.annotation.ExcelProperty;
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.github.linpeilie.annotations.AutoMapper;
|
import io.github.linpeilie.annotations.AutoMapper;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsq;
|
||||||
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsqKpmx;
|
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsqKpmx;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@ -37,6 +36,11 @@ public class XzdSpykpKpsqVo implements Serializable {
|
|||||||
@ExcelProperty(value = "id")
|
@ExcelProperty(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 类型
|
* 类型
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,36 +1,36 @@
|
|||||||
package org.dromara.xzd.spykp.kpsq.service.impl;
|
package org.dromara.xzd.spykp.kpsq.service.impl;
|
||||||
|
|
||||||
import cn.hutool.core.util.IdUtil;
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
||||||
import org.dromara.common.core.utils.MapstructUtils;
|
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
|
||||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
||||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.dromara.common.core.domain.event.ProcessEvent;
|
||||||
|
import org.dromara.common.core.utils.MapstructUtils;
|
||||||
|
import org.dromara.common.core.utils.StringUtils;
|
||||||
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||||
import org.dromara.common.satoken.utils.LoginHelper;
|
import org.dromara.common.satoken.utils.LoginHelper;
|
||||||
import org.dromara.common.utils.BatchNumberGenerator;
|
import org.dromara.common.utils.BatchNumberGenerator;
|
||||||
import org.dromara.system.domain.vo.SysDeptVo;
|
import org.dromara.system.domain.vo.SysDeptVo;
|
||||||
import org.dromara.system.service.impl.SysDeptServiceImpl;
|
import org.dromara.system.service.impl.SysDeptServiceImpl;
|
||||||
import org.dromara.system.service.impl.SysOssServiceImpl;
|
import org.dromara.system.service.impl.SysOssServiceImpl;
|
||||||
import org.dromara.xzd.domain.XzdContractSkxx;
|
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsq;
|
||||||
import org.dromara.xzd.paymentsReceipts.domain.bo.XzdSfkFapiaoBo;
|
|
||||||
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsqKpmx;
|
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsqKpmx;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import org.dromara.xzd.spykp.kpsq.domain.bo.XzdSpykpKpsqBo;
|
import org.dromara.xzd.spykp.kpsq.domain.bo.XzdSpykpKpsqBo;
|
||||||
import org.dromara.xzd.spykp.kpsq.domain.vo.XzdSpykpKpsqVo;
|
import org.dromara.xzd.spykp.kpsq.domain.vo.XzdSpykpKpsqVo;
|
||||||
import org.dromara.xzd.spykp.kpsq.domain.XzdSpykpKpsq;
|
|
||||||
import org.dromara.xzd.spykp.kpsq.mapper.XzdSpykpKpsqMapper;
|
import org.dromara.xzd.spykp.kpsq.mapper.XzdSpykpKpsqMapper;
|
||||||
import org.dromara.xzd.spykp.kpsq.service.IXzdSpykpKpsqService;
|
import org.dromara.xzd.spykp.kpsq.service.IXzdSpykpKpsqService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 收票与开票-开票申请Service业务层处理
|
* 收票与开票-开票申请Service业务层处理
|
||||||
@ -40,6 +40,7 @@ import java.util.Collection;
|
|||||||
*/
|
*/
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Service
|
@Service
|
||||||
|
@Slf4j
|
||||||
public class XzdSpykpKpsqServiceImpl extends ServiceImpl<XzdSpykpKpsqMapper, XzdSpykpKpsq> implements IXzdSpykpKpsqService {
|
public class XzdSpykpKpsqServiceImpl extends ServiceImpl<XzdSpykpKpsqMapper, XzdSpykpKpsq> implements IXzdSpykpKpsqService {
|
||||||
|
|
||||||
private final XzdSpykpKpsqMapper baseMapper;
|
private final XzdSpykpKpsqMapper baseMapper;
|
||||||
@ -314,4 +315,24 @@ public class XzdSpykpKpsqServiceImpl extends ServiceImpl<XzdSpykpKpsqMapper, Xzd
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
|
||||||
|
* 正常使用只需#processEvent.flowCode=='leave1'
|
||||||
|
* 示例为了方便则使用startsWith匹配了全部示例key
|
||||||
|
*
|
||||||
|
* @param processEvent 参数
|
||||||
|
*/
|
||||||
|
@EventListener(condition = "#processEvent.flowCode.endsWith('XzdSpykpKpsq')")
|
||||||
|
@Transactional
|
||||||
|
public void processPlansHandler(ProcessEvent processEvent) {
|
||||||
|
log.info("开票申请审核任务执行了{}", processEvent.toString());
|
||||||
|
String id = processEvent.getBusinessId();
|
||||||
|
XzdSpykpKpsq byId = this.getById(Long.valueOf(id));
|
||||||
|
byId.setShzt(processEvent.getStatus());
|
||||||
|
boolean b = this.updateById(byId);
|
||||||
|
if (!b) {
|
||||||
|
log.error("开票申请审核任务更新状态失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -32,6 +32,11 @@ public class XzdSpykpSjsqd extends BaseEntity {
|
|||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 1承包2分包3采购4综合
|
* 1承包2分包3采购4综合
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -32,6 +32,11 @@ public class XzdSpykpSjsqdBo extends BaseEntity {
|
|||||||
// @NotNull(message = "id不能为空", groups = { EditGroup.class })
|
// @NotNull(message = "id不能为空", groups = { EditGroup.class })
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 1承包2分包3采购4综合
|
* 1承包2分包3采购4综合
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -36,6 +36,11 @@ public class XzdSpykpSjsqdVo implements Serializable {
|
|||||||
@ExcelProperty(value = "id")
|
@ExcelProperty(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核状态
|
||||||
|
*/
|
||||||
|
private String shzt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 1承包2分包3采购4综合
|
* 1承包2分包3采购4综合
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.dromara.common.core.domain.event.ProcessEvent;
|
||||||
import org.dromara.common.core.domain.model.LoginUser;
|
import org.dromara.common.core.domain.model.LoginUser;
|
||||||
import org.dromara.common.core.utils.MapstructUtils;
|
import org.dromara.common.core.utils.MapstructUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import org.dromara.common.core.utils.StringUtils;
|
||||||
@ -33,7 +35,9 @@ import org.dromara.xzd.spykp.sjsqd.domain.vo.XzdSpykpSjsqdVo;
|
|||||||
import org.dromara.xzd.spykp.sjsqd.mapper.XzdSpykpSjsqdMapper;
|
import org.dromara.xzd.spykp.sjsqd.mapper.XzdSpykpSjsqdMapper;
|
||||||
import org.dromara.xzd.spykp.sjsqd.service.IXzdSpykpSjsqdService;
|
import org.dromara.xzd.spykp.sjsqd.service.IXzdSpykpSjsqdService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -48,6 +52,7 @@ import java.util.Map;
|
|||||||
*/
|
*/
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Service
|
@Service
|
||||||
|
@Slf4j
|
||||||
public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, XzdSpykpSjsqd> implements IXzdSpykpSjsqdService {
|
public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, XzdSpykpSjsqd> implements IXzdSpykpSjsqdService {
|
||||||
|
|
||||||
private final XzdSpykpSjsqdMapper baseMapper;
|
private final XzdSpykpSjsqdMapper baseMapper;
|
||||||
@ -306,4 +311,24 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, X
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等)
|
||||||
|
* 正常使用只需#processEvent.flowCode=='leave1'
|
||||||
|
* 示例为了方便则使用startsWith匹配了全部示例key
|
||||||
|
*
|
||||||
|
* @param processEvent 参数
|
||||||
|
*/
|
||||||
|
@EventListener(condition = "#processEvent.flowCode.endsWith('XzdSpykpSjsqd')")
|
||||||
|
@Transactional
|
||||||
|
public void processPlansHandler(ProcessEvent processEvent) {
|
||||||
|
log.info("收据申请单审核任务执行了{}", processEvent.toString());
|
||||||
|
String id = processEvent.getBusinessId();
|
||||||
|
XzdSpykpSjsqd byId = this.getById(Long.valueOf(id));
|
||||||
|
byId.setShzt(processEvent.getStatus());
|
||||||
|
boolean b = this.updateById(byId);
|
||||||
|
if (!b) {
|
||||||
|
log.error("收据申请单审核任务更新状态失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user