|
@@ -128,17 +128,21 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_EMPTY_ERROR,"编号"));
|
|
res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_EMPTY_ERROR,"编号"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
- try {
|
|
|
|
|
- String format = AFTConstants.YYYYMMDDHHMMSS;
|
|
|
|
|
- if (in.getType()==5){
|
|
|
|
|
- format = AFTConstants.YYYYMMDD;
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (StringUtils.isNotBlank(in.getReleaseStarts())&&StringUtils.isNotBlank(in.getReleaseEnds())){
|
|
|
|
|
+ try {
|
|
|
|
|
+ String format = AFTConstants.YYYYMMDDHHMMSS;
|
|
|
|
|
+ if (in.getType()==5){
|
|
|
|
|
+ format = AFTConstants.YYYYMMDD;
|
|
|
|
|
+ }
|
|
|
|
|
+ in.setReleaseStart(DateUtils.parseDate(in.getReleaseStarts(), format));
|
|
|
|
|
+ in.setReleaseEnd(DateUtils.parseDate(in.getReleaseEnds(), format));
|
|
|
|
|
+ } catch (ParseException e) {
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ throw new BusinessException("转换异常");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- in.setReleaseStart(DateUtils.parseDate(in.getReleaseStarts(), format));
|
|
|
|
|
- in.setReleaseEnd(DateUtils.parseDate(in.getReleaseEnds(), format));
|
|
|
|
|
- } catch (ParseException e) {
|
|
|
|
|
- e.printStackTrace();
|
|
|
|
|
- throw new BusinessException("转换异常");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
if (in.getStatus()!=3&&in.getType()<4) {
|
|
if (in.getStatus()!=3&&in.getType()<4) {
|
|
|
int i = publicReleaseService.checkTime(in);
|
|
int i = publicReleaseService.checkTime(in);
|
|
|
if (i==1) {
|
|
if (i==1) {
|