diff --git a/src/main/java/com/nbport/zgwl/contractlaunch/dto/ContractLaunchDto.java b/src/main/java/com/nbport/zgwl/contractlaunch/dto/ContractLaunchDto.java index ddea503..bbf5f38 100644 --- a/src/main/java/com/nbport/zgwl/contractlaunch/dto/ContractLaunchDto.java +++ b/src/main/java/com/nbport/zgwl/contractlaunch/dto/ContractLaunchDto.java @@ -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; diff --git a/src/main/java/com/nbport/zgwl/contractlaunch/service/ContractLaunchServiceImpl.java b/src/main/java/com/nbport/zgwl/contractlaunch/service/ContractLaunchServiceImpl.java index 47e092c..a1bbc39 100644 --- a/src/main/java/com/nbport/zgwl/contractlaunch/service/ContractLaunchServiceImpl.java +++ b/src/main/java/com/nbport/zgwl/contractlaunch/service/ContractLaunchServiceImpl.java @@ -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); // 签订信息 diff --git a/src/main/resources/mapper/contractlaunch/ContractLaunchMapper.xml b/src/main/resources/mapper/contractlaunch/ContractLaunchMapper.xml index 24964e0..cfbd227 100644 --- a/src/main/resources/mapper/contractlaunch/ContractLaunchMapper.xml +++ b/src/main/resources/mapper/contractlaunch/ContractLaunchMapper.xml @@ -34,6 +34,7 @@ + @@ -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}, diff --git a/zgwl_contract_launch_oracle.sql b/zgwl_contract_launch_oracle.sql index 7f5220a..35976d8 100644 --- a/zgwl_contract_launch_oracle.sql +++ b/zgwl_contract_launch_oracle.sql @@ -303,6 +303,7 @@ COMMENT ON COLUMN SEAL_CONTRACT_LAUNCH_MAIN.AMOUNT_EXPLAIN IS '金额说明'; COMMENT ON COLUMN SEAL_CONTRACT_LAUNCH_MAIN.VALUATION_MODE IS '计价方式'; COMMENT ON COLUMN SEAL_CONTRACT_LAUNCH_MAIN.NEED_AMENDMENTS IS '是否需修订条款:1是 0否'; COMMENT ON COLUMN SEAL_CONTRACT_LAUNCH_MAIN.ESTIMATED_AMOUNT IS '预估金额'; +COMMENT ON COLUMN SEAL_CONTRACT_LAUNCH_MAIN.SEAL_QUANTITY IS '用印数量'; COMMENT ON COLUMN SEAL_CONTRACT_LAUNCH_MAIN.SEAL_TYPE IS '签订方式'; COMMENT ON COLUMN SEAL_CONTRACT_LAUNCH_MAIN.TEXT_SOURCE IS '文本来源'; COMMENT ON COLUMN SEAL_CONTRACT_LAUNCH_MAIN.MANDATE_TYPE IS '委托类型';