用印数量增加
This commit is contained in:
@@ -287,6 +287,9 @@ public class ContractLaunchDto implements Serializable {
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private LocalDateTime signDate;
|
||||
|
||||
/** 用印数量,默认为1 */
|
||||
private Integer sealQuantity;
|
||||
|
||||
/** 合同生效日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private LocalDateTime activeDate;
|
||||
|
||||
@@ -616,6 +616,7 @@ public class ContractLaunchServiceImpl implements ContractLaunchService {
|
||||
target.setNeedAmendments(source.getNeedAmendments());
|
||||
target.setEstimatedAmount(source.getEstimatedAmount());
|
||||
target.setSealType(source.getSealType());
|
||||
target.setSealQuantity(source.getSealQuantity());
|
||||
target.setTextSource(source.getTextSource());
|
||||
target.setMandateType(source.getMandateType());
|
||||
target.setCargoType(source.getCargoType());
|
||||
@@ -926,6 +927,9 @@ public class ContractLaunchServiceImpl implements ContractLaunchService {
|
||||
if (contract.getPushUrl() == null || contract.getPushUrl().isBlank()) {
|
||||
contract.setPushUrl("/contract/launch/callback/law/approve");
|
||||
}
|
||||
if (contract.getSealQuantity() == null) {
|
||||
contract.setSealQuantity(1);
|
||||
}
|
||||
if (contract.getPartyList() == null) {
|
||||
contract.setPartyList(new ArrayList<>());
|
||||
}
|
||||
@@ -957,6 +961,9 @@ public class ContractLaunchServiceImpl implements ContractLaunchService {
|
||||
if (contract.getSealType() == null || contract.getSealType().isBlank()) {
|
||||
throw new ServiceException("签订方式不能为空");
|
||||
}
|
||||
if (contract.getSealQuantity() != null && contract.getSealQuantity() < 1) {
|
||||
throw new ServiceException("用印数量必须大于等于1");
|
||||
}
|
||||
if (contract.getContractPeriodType() == null || contract.getContractPeriodType().isBlank()) {
|
||||
throw new ServiceException("合同期限类型不能为空");
|
||||
}
|
||||
@@ -1207,7 +1214,7 @@ public class ContractLaunchServiceImpl implements ContractLaunchService {
|
||||
seal.put("seal_isSeal", "1");
|
||||
seal.put("seal_approveSame", "1");
|
||||
seal.put("seal_type", contract.getSealType());
|
||||
seal.put("seal_quantity", "1");
|
||||
seal.put("seal_quantity", contract.getSealQuantity() == null ? "1" : String.valueOf(contract.getSealQuantity()));
|
||||
seal.put("seal_date", contract.getSignDate());
|
||||
payload.put("c_seal", seal);
|
||||
// 签订信息
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
<result property="needAmendments" column="NEED_AMENDMENTS"/>
|
||||
<result property="estimatedAmount" column="ESTIMATED_AMOUNT"/>
|
||||
<result property="sealType" column="SEAL_TYPE"/>
|
||||
<result property="sealQuantity" column="SEAL_QUANTITY"/>
|
||||
<result property="textSource" column="TEXT_SOURCE"/>
|
||||
<result property="mandateType" column="MANDATE_TYPE"/>
|
||||
<result property="cargoType" column="CARGO_TYPE"/>
|
||||
@@ -174,7 +175,7 @@
|
||||
TEMPLATE_ID, TEMPLATE_CODE, TEMPLATE_NAME, STATUS, APPROVE_STATUS, APPROVE_MESSAGE,
|
||||
SEAL_CONTRACT_ID, SEAL_CONTRACT_STATUS, CONTRACT_AMOUNT, CURRENCY_NAME,
|
||||
CONTRACT_PERIOD_TYPE, PERIOD_EXPLAIN, EFFECTIVE_START, EFFECTIVE_END,
|
||||
PAYMENT_METHOD, PRIMARY_CONTENT, AMOUNT_EXPLAIN, VALUATION_MODE, NEED_AMENDMENTS, ESTIMATED_AMOUNT, SEAL_TYPE,
|
||||
PAYMENT_METHOD, PRIMARY_CONTENT, AMOUNT_EXPLAIN, VALUATION_MODE, NEED_AMENDMENTS, ESTIMATED_AMOUNT, SEAL_TYPE, SEAL_QUANTITY,
|
||||
TEXT_SOURCE, MANDATE_TYPE, CARGO_TYPE, ASSIST_DEPARTMENT_NAME, EXECUTOR_ACCOUNT,
|
||||
CREATOR_PHONE, SELF_CODE, MAIN_CONTRACT_CODE, SIGNING_SUBJECT_CODE, DATE_TYPE, IS_ADDIT, IS_ELECTRON,
|
||||
PAYMENT_DIRECTION, PUSH_URL, IS_MAJOR_CONTRACT, IS_OPEN_BIDDING, IS_YEAR_BUDGET, IS_SHARE,
|
||||
@@ -251,7 +252,7 @@
|
||||
TEMPLATE_ID, TEMPLATE_CODE, TEMPLATE_NAME, STATUS, APPROVE_STATUS, APPROVE_MESSAGE,
|
||||
SEAL_CONTRACT_ID, SEAL_CONTRACT_STATUS, CONTRACT_AMOUNT, CURRENCY_NAME,
|
||||
CONTRACT_PERIOD_TYPE, PERIOD_EXPLAIN, EFFECTIVE_START, EFFECTIVE_END,
|
||||
PAYMENT_METHOD, PRIMARY_CONTENT, AMOUNT_EXPLAIN, VALUATION_MODE, NEED_AMENDMENTS, ESTIMATED_AMOUNT, SEAL_TYPE,
|
||||
PAYMENT_METHOD, PRIMARY_CONTENT, AMOUNT_EXPLAIN, VALUATION_MODE, NEED_AMENDMENTS, ESTIMATED_AMOUNT, SEAL_TYPE, SEAL_QUANTITY,
|
||||
TEXT_SOURCE, MANDATE_TYPE, CARGO_TYPE, ASSIST_DEPARTMENT_NAME, EXECUTOR_ACCOUNT,
|
||||
CREATOR_PHONE, SELF_CODE, MAIN_CONTRACT_CODE, SIGNING_SUBJECT_CODE, DATE_TYPE, IS_ADDIT, IS_ELECTRON,
|
||||
PAYMENT_DIRECTION, PUSH_URL, IS_MAJOR_CONTRACT, IS_OPEN_BIDDING, IS_YEAR_BUDGET, IS_SHARE,
|
||||
@@ -271,7 +272,7 @@
|
||||
#{templateId}, #{templateCode}, #{templateName}, #{status}, #{approveStatus}, #{approveMessage},
|
||||
#{sealContractId}, #{sealContractStatus}, #{contractAmount}, #{currencyName},
|
||||
#{contractPeriodType}, #{periodExplain}, #{effectiveStart}, #{effectiveEnd},
|
||||
#{paymentMethod}, #{primaryContent}, #{amountExplain}, #{valuationMode}, #{needAmendments}, #{estimatedAmount}, #{sealType},
|
||||
#{paymentMethod}, #{primaryContent}, #{amountExplain}, #{valuationMode}, #{needAmendments}, #{estimatedAmount}, #{sealType}, #{sealQuantity},
|
||||
#{textSource}, #{mandateType}, #{cargoType}, #{assistDepartmentName}, #{executorAccount},
|
||||
#{creatorPhone}, #{selfCode}, #{mainContractCode}, #{signingSubjectCode}, #{dateType}, #{isAddit}, #{isElectron},
|
||||
#{paymentDirection}, #{pushUrl}, #{isMajorContract}, #{isOpenBidding}, #{isYearBudget}, #{isShare},
|
||||
@@ -319,6 +320,7 @@
|
||||
NEED_AMENDMENTS = #{needAmendments},
|
||||
ESTIMATED_AMOUNT = #{estimatedAmount},
|
||||
SEAL_TYPE = #{sealType},
|
||||
SEAL_QUANTITY = #{sealQuantity},
|
||||
TEXT_SOURCE = #{textSource},
|
||||
MANDATE_TYPE = #{mandateType},
|
||||
CARGO_TYPE = #{cargoType},
|
||||
|
||||
Reference in New Issue
Block a user