compliance_management / ruoyi-flowable-plus · 提交

转到一个项目

作者 雷海东
提交 1ae6c7dcd675f64f9c7b473472e7d9bd5c77c786 1 个父辈 2301d566

合同甲乙链接跳转字段

内嵌 并排对比
正在显示 6 个修改的文件 包含 48 行增加 和 0 行删除
@@ -132,8 +132,12 @@ public class TblContractController extends BaseController { @@ -132,8 +132,12 @@ public class TblContractController extends BaseController {
132 variables.put("expirationDate", bo.getExpirationDate()); 132 variables.put("expirationDate", bo.getExpirationDate());
133 // 甲方 133 // 甲方
134 variables.put("partyA", bo.getPartyA()); 134 variables.put("partyA", bo.getPartyA());
  135 + // 甲方链接地址
  136 + variables.put("partyAAddress", bo.getPartyAAddress());
135 // 乙方 137 // 乙方
136 variables.put("partyB", bo.getPartyB()); 138 variables.put("partyB", bo.getPartyB());
  139 + // 乙方链接地址
  140 + variables.put("partyBAddress", bo.getPartyBAddress());
137 // 付款方式 141 // 付款方式
138 variables.put("paymentMethod", bo.getPaymentMethod()); 142 variables.put("paymentMethod", bo.getPaymentMethod());
139 // 签订日期 143 // 签订日期
@@ -58,10 +58,18 @@ public class TblContract extends BaseEntity { @@ -58,10 +58,18 @@ public class TblContract extends BaseEntity {
58 */ 58 */
59 private String partyA; 59 private String partyA;
60 /** 60 /**
  61 + * 甲方链接地址
  62 + */
  63 + private String partyAAddress;
  64 + /**
61 * 乙方 65 * 乙方
62 */ 66 */
63 private String partyB; 67 private String partyB;
64 /** 68 /**
  69 + * 乙方链接地址
  70 + */
  71 + private String partyBAddress;
  72 + /**
65 * 付款方式 73 * 付款方式
66 */ 74 */
67 private String paymentMethod; 75 private String paymentMethod;
@@ -69,6 +69,11 @@ public class TblContractBo extends BaseEntity { @@ -69,6 +69,11 @@ public class TblContractBo extends BaseEntity {
69 */ 69 */
70 @NotBlank(message = "甲方不能为空", groups = { AddGroup.class, EditGroup.class }) 70 @NotBlank(message = "甲方不能为空", groups = { AddGroup.class, EditGroup.class })
71 private String partyA; 71 private String partyA;
  72 + /**
  73 + * 甲方链接地址
  74 + */
  75 + @NotBlank(message = "甲方链接地址不能为空", groups = { AddGroup.class, EditGroup.class })
  76 + private String partyAAddress;
72 77
73 /** 78 /**
74 * 乙方 79 * 乙方
@@ -77,6 +82,12 @@ public class TblContractBo extends BaseEntity { @@ -77,6 +82,12 @@ public class TblContractBo extends BaseEntity {
77 private String partyB; 82 private String partyB;
78 83
79 /** 84 /**
  85 + * 乙方链接地址
  86 + */
  87 + @NotBlank(message = "乙方链接地址不能为空", groups = { AddGroup.class, EditGroup.class })
  88 + private String partyBAddress;
  89 +
  90 + /**
80 * 付款方式 91 * 付款方式
81 */ 92 */
82 @NotBlank(message = "付款方式不能为空", groups = { AddGroup.class, EditGroup.class }) 93 @NotBlank(message = "付款方式不能为空", groups = { AddGroup.class, EditGroup.class })
@@ -64,6 +64,11 @@ public class TblContractVo { @@ -64,6 +64,11 @@ public class TblContractVo {
64 */ 64 */
65 @ExcelProperty(value = "甲方") 65 @ExcelProperty(value = "甲方")
66 private String partyA; 66 private String partyA;
  67 + /**
  68 + * 甲方链接地址
  69 + */
  70 + @ExcelProperty(value = "甲方链接地址")
  71 + private String partyAAddress;
67 72
68 /** 73 /**
69 * 乙方 74 * 乙方
@@ -72,6 +77,12 @@ public class TblContractVo { @@ -72,6 +77,12 @@ public class TblContractVo {
72 private String partyB; 77 private String partyB;
73 78
74 /** 79 /**
  80 + * 乙方链接地址
  81 + */
  82 + @ExcelProperty(value = "乙方链接地址")
  83 + private String partyBAddress;
  84 +
  85 + /**
75 * 付款方式 86 * 付款方式
76 */ 87 */
77 @ExcelProperty(value = "付款方式") 88 @ExcelProperty(value = "付款方式")
@@ -57,10 +57,18 @@ public class TblContractModel extends BaseEntity { @@ -57,10 +57,18 @@ public class TblContractModel extends BaseEntity {
57 */ 57 */
58 private String partyA; 58 private String partyA;
59 /** 59 /**
  60 + * 甲方链接地址
  61 + */
  62 + private String partyAAddress;
  63 + /**
60 * 乙方 64 * 乙方
61 */ 65 */
62 private String partyB; 66 private String partyB;
63 /** 67 /**
  68 + * 乙方链接地址
  69 + */
  70 + private String partyBAddress;
  71 + /**
64 * 付款方式 72 * 付款方式
65 */ 73 */
66 private String paymentMethod; 74 private String paymentMethod;
@@ -13,7 +13,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -13,7 +13,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
13 <result property="effectiveDate" column="effective_date"/> 13 <result property="effectiveDate" column="effective_date"/>
14 <result property="expirationDate" column="expiration_date"/> 14 <result property="expirationDate" column="expiration_date"/>
15 <result property="partyA" column="party_a"/> 15 <result property="partyA" column="party_a"/>
  16 + <result property="partyAAddress" column="party_a_address"/>
16 <result property="partyB" column="party_b"/> 17 <result property="partyB" column="party_b"/>
  18 + <result property="partyBAddress" column="party_b_address"/>
17 <result property="paymentMethod" column="payment_method"/> 19 <result property="paymentMethod" column="payment_method"/>
18 <result property="signingDate" column="signing_date"/> 20 <result property="signingDate" column="signing_date"/>
19 <result property="subjectInformation" column="subject_information"/> 21 <result property="subjectInformation" column="subject_information"/>
@@ -33,7 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -33,7 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
33 <result property="effectiveDate" column="effective_date"/> 35 <result property="effectiveDate" column="effective_date"/>
34 <result property="expirationDate" column="expiration_date"/> 36 <result property="expirationDate" column="expiration_date"/>
35 <result property="partyA" column="party_a"/> 37 <result property="partyA" column="party_a"/>
  38 + <result property="partyAAddress" column="party_a_address"/>
36 <result property="partyB" column="party_b"/> 39 <result property="partyB" column="party_b"/>
  40 + <result property="partyBAddress" column="party_b_address"/>
37 <result property="paymentMethod" column="payment_method"/> 41 <result property="paymentMethod" column="payment_method"/>
38 <result property="signingDate" column="signing_date"/> 42 <result property="signingDate" column="signing_date"/>
39 <result property="subjectInformation" column="subject_information"/> 43 <result property="subjectInformation" column="subject_information"/>
@@ -54,7 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -54,7 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
54 a.effective_date, 58 a.effective_date,
55 expiration_date, 59 expiration_date,
56 a.party_a, 60 a.party_a,
  61 + a.party_a_address,
57 a.party_b, 62 a.party_b,
  63 + a.party_b_address,
58 a.payment_method, 64 a.payment_method,
59 a.signing_date, 65 a.signing_date,
60 a.subject_information, 66 a.subject_information,