|
|
@@ -13,6 +13,7 @@ import com.sckw.contract.model.vo.req.*;
|
|
|
import com.sckw.contract.model.vo.res.*;
|
|
|
import com.sckw.core.common.enums.enums.DictEnum;
|
|
|
import com.sckw.core.common.enums.enums.DictTypeEnum;
|
|
|
+import com.sckw.core.exception.BusinessException;
|
|
|
import com.sckw.core.exception.SystemException;
|
|
|
import com.sckw.core.model.constant.Global;
|
|
|
import com.sckw.core.model.enums.ContractStatusEnum;
|
|
|
@@ -132,7 +133,7 @@ public class KwcContractTradeService {
|
|
|
public Long addTradeContract(ContractTradeReqVo reqVo) {
|
|
|
TradeBaseInfoReqVo baseInfo = reqVo.getBaseInfo();
|
|
|
List<TradeGoodsInfoReqVo> goodsInfoList = reqVo.getGoodsInfo();
|
|
|
-
|
|
|
+ checkParams(reqVo,baseInfo);
|
|
|
//创建合同
|
|
|
KwcContractTrade kwcContractTrade = getKwcContractTrade(baseInfo, reqVo.getRemark(), reqVo.getPId());
|
|
|
long contactId = new IdWorker(1L).nextId();
|
|
|
@@ -354,7 +355,7 @@ public class KwcContractTradeService {
|
|
|
if (Objects.isNull(kwcContractTrade)) {
|
|
|
throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
|
|
|
}
|
|
|
-
|
|
|
+ checkParams(reqVo,reqVo.getBaseInfo());
|
|
|
KwcContractTrade param = getKwcContractTrade(reqVo.getBaseInfo(), reqVo.getRemark(), reqVo.getPId());
|
|
|
param.setId(contractId);
|
|
|
param.setSigningUrl(reqVo.getContractFile());
|
|
|
@@ -513,6 +514,15 @@ public class KwcContractTradeService {
|
|
|
}
|
|
|
return list;
|
|
|
}
|
|
|
+
|
|
|
+ private void checkParams(ContractTradeReqVo param,TradeBaseInfoReqVo baseInfo) {
|
|
|
+ if (Objects.isNull(baseInfo.getContractCode()) && baseInfo.getContractCode().length() > 20) {
|
|
|
+ throw new BusinessException("合同编号不能为空且最长20字符!");
|
|
|
+ }
|
|
|
+ if (Objects.isNull(baseInfo.getContractName()) && baseInfo.getContractName().length() > 20) {
|
|
|
+ throw new BusinessException("合同名称不能为空且最长20字符!");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|