1.合同简称校验

src/main/java/com/ydtech/modules/fnc/dto/contract/ContractDto.java

@@ -124,4 +124,8 @@ public class ContractDto implements Serializable {
 
     @ApiModelProperty("顺延日")
     private String dayTime;
+
+
+    @ApiModelProperty("顺延时间类型")
+    private String dateType;
 }

src/main/java/com/ydtech/modules/fnc/entity/ContractEntity.java

@@ -141,6 +141,10 @@ public class ContractEntity implements Serializable {
     @TableField("parent_id")
     private String parentId;
 
+    @ApiModelProperty("顺延时间类型")
+    @TableField("date_type")
+    private String dateType;
+
 
 
     @ApiModelProperty("供应商id")

src/main/java/com/ydtech/modules/fnc/service/contract/impl/contractServiceImpl.java

@@ -91,10 +91,10 @@ public class contractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
             contractEntity.setInternalCompanyName(interName);
 
             contractEntity.setContractStatus("0");
-            if(contractDto.getExpiringDate() !=null){
-                LocalDateTime shouldPostponedDate =this.saveShouldPostponedDate(contractDto);
-                contractEntity.setShouldPostponedDate(shouldPostponedDate);
-            }
+//            if(contractDto.getExpiringDate() !=null){
+//                LocalDateTime shouldPostponedDate =this.saveShouldPostponedDate(contractDto);
+//                contractEntity.setShouldPostponedDate(shouldPostponedDate);
+//            }
 
             baseMapper.insert(contractEntity);
             if (contractDto.getSupplierIdList() != null) {
@@ -119,10 +119,10 @@ public class contractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
                 contractEntity.setInternalCompanyName(interName);
             }
 
-            if(contractDto.getExpiringDate() !=null){
-                LocalDateTime shouldPostponedDate =this.saveShouldPostponedDate(contractDto);
-                contractEntity.setShouldPostponedDate(shouldPostponedDate);
-            }
+//            if(contractDto.getExpiringDate() !=null){
+//                LocalDateTime shouldPostponedDate =this.saveShouldPostponedDate(contractDto);
+//                contractEntity.setShouldPostponedDate(shouldPostponedDate);
+//            }
 
             baseMapper.updateById(contractEntity);
             contractSupplierService.saveAndUpdate(contractDto.getSupplierIdList(), contractEntity.getId());
@@ -217,6 +217,9 @@ public class contractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
             String firtLetter = "";
             String contractCode = contractDto.getContractCode();
             String simpleName = this.getSimpleName(contractDto.getExternalCompaniesId());
+            if (StringUtils.isEmpty(simpleName)) {
+                throw new SystemException("甲方简称为空不能新增 生成不了合同编号");
+            }
             if (simpleName.isEmpty()) {
                 return contractCode;
             }