zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合同动态字段及条款修改

Browse Source
This commit is contained in:
guojunyun
2025-11-11 17:26:31 +08:00
parent b0f4dbfb52
commit 1f949f7013
3 changed files with 66 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java
View File

@@ -1,8 +1,8 @@
package com.zt.plat.module.contractorder.api.vo.contract; package com.zt.plat.module.contractorder.api.vo.contract;
import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceDataRespVO; import com.zt.plat.module.base.controller.admin.templtp.vo.TmplInscDatBsnRespVO;
import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceItemRespVO; import com.zt.plat.module.base.controller.admin.templtp.vo.TmplInscItmBsnRespVO;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@@ -251,11 +251,11 @@ public class ContractRespVO {
// 物料信息 // 物料信息
private List<DetailRespVO> detail; private List<DetailRespVO> detail;
// 合同动态表单 // 合同动态字段
private List<TemplateInstanceDataRespVO> dynamicsFields; private List<TmplInscDatBsnRespVO> dynamicsFields;
// 合同动态条款 // 合同动态条款
private List<TemplateInstanceItemRespVO> dynamicsItems; private List<TmplInscItmBsnRespVO> dynamicsItems;
// 价款结算条款 // 价款结算条款
private List<FormulaRespVO> formulas; private List<FormulaRespVO> formulas;

10
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractSaveReqVO.java
View File

@@ -1,7 +1,8 @@
package com.zt.plat.module.contractorder.api.vo.contract; package com.zt.plat.module.contractorder.api.vo.contract;
import cn.hutool.json.JSONArray; import cn.hutool.json.JSONArray;
import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceDataSaveReqVO; import com.zt.plat.module.base.controller.admin.templtp.vo.TmplInscDatBsnSaveReqVO;
import com.zt.plat.module.base.controller.admin.templtp.vo.TmplInscItmBsnSaveReqVO;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@@ -220,8 +221,11 @@ public class ContractSaveReqVO {
// 物料信息 // 物料信息
private List<DetailSaveReqVO> detail; private List<DetailSaveReqVO> detail;
// 合同动态表单 // 合同动态字段
private List<TemplateInstanceDataSaveReqVO> dynamicsFields; private List<TmplInscDatBsnSaveReqVO> dynamicsFields;
// 合同动态条款
private List<TmplInscItmBsnSaveReqVO> dynamicsItems;
// 价款结算条款 // 价款结算条款
private List<FormulaSaveReqVO> formulas; private List<FormulaSaveReqVO> formulas;

106
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
View File

File diff suppressed because it is too large Load Diff