|
|
@@ -169,10 +169,17 @@ public class AdminNewOrderApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "提条状态"));
|
|
|
return res;
|
|
|
}
|
|
|
- if (isSubmit==1&&orderNewService.checkORderTask(t.getOrderNo())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "主项目"));
|
|
|
- return res;
|
|
|
+ if (isSubmit==1) {
|
|
|
+ if (orderNewService.checkORderTask(t.getOrderNo())) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "主项目"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ if (orderNewService.checkORderDun(t.getOrderNo())) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "催款信息"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
if (StringUtils.isNotBlank(signDate)) {
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
try {
|