合同模板功能修改

hx-common/src/main/java/com/fjhx/common/entity/contract/dto/ContractTemplateSelectDto.java

@@ -15,8 +15,8 @@ import lombok.Setter;
 public class ContractTemplateSelectDto extends BaseSelectDto {
 
     /**
-     * 公司id
+     * 模板类型
      */
-    private Long corporationId;
+    private Integer templateType;
 
 }

hx-common/src/main/java/com/fjhx/common/entity/contract/po/ContractTemplate.java

@@ -6,7 +6,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * <p>
@@ -22,28 +21,15 @@ import javax.validation.constraints.NotNull;
 public class ContractTemplate extends BasePo {
 
     /**
-     * 模板名称
-     */
-    @NotBlank(message = "模板名称不能为空")
-    private String templateName;
-
-    /**
-     * 公司id
+     * 模板类型
      */
-    @NotNull(message = "公司id不能为空")
-    private Long corporationId;
+    private Integer templateType;
 
     /**
-     * 联系人名称
-     */
-    @NotBlank(message = "联系人名称不能为空")
-    private String contactName;
-
-    /**
-     * 联系人电话
+     * 模板名称
      */
-    @NotBlank(message = "联系人电话不能为空")
-    private String contactNumber;
+    @NotBlank(message = "模板名称不能为空")
+    private String templateName;
 
     /**
      * 模板内容

hx-common/src/main/java/com/fjhx/common/service/contract/impl/ContractTemplateServiceImpl.java

@@ -28,8 +28,11 @@ public class ContractTemplateServiceImpl extends ServiceImpl<ContractTemplateMap
     @Override
     public Page<ContractTemplateVo> getPage(ContractTemplateSelectDto dto) {
         IWrapper<ContractTemplate> wrapper = getWrapper();
-        wrapper.eq("ct", ContractTemplate::getCorporationId, dto.getCorporationId());
         wrapper.keyword(dto, new SqlField("ct", ContractTemplate::getTemplateName));
+
+        //合同类型过滤
+        wrapper.eq("ct", ContractTemplate::getTemplateType, dto.getTemplateType());
+
         wrapper.orderByDesc("ct", ContractTemplate::getId);
 
         return this.baseMapper.getPage(dto.getPage(), wrapper);

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -444,4 +444,9 @@ public class Contract extends BasePo {
      */
     private String prodTag;
 
+    /**
+     * 合同模板内容
+     */
+    private String templateContent;
+
 }