|
|
@@ -1,6 +1,7 @@
|
|
|
package com.goafanti.achievement.controller;
|
|
|
|
|
|
import java.util.Arrays;
|
|
|
+import java.util.List;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import com.goafanti.achievement.bo.InputAchievement;
|
|
|
+import com.goafanti.achievement.service.AchievementOrderService;
|
|
|
import com.goafanti.achievement.service.AchievementService;
|
|
|
import com.goafanti.admin.service.AftFileService;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
@@ -23,8 +25,10 @@ import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.CertifyApiController;
|
|
|
import com.goafanti.common.enums.AchievementAuditStatus;
|
|
|
import com.goafanti.common.enums.AchievementFields;
|
|
|
+import com.goafanti.common.enums.AchievementOrderStatus;
|
|
|
import com.goafanti.common.enums.AttachmentType;
|
|
|
import com.goafanti.common.model.Achievement;
|
|
|
+import com.goafanti.common.model.AchievementOrder;
|
|
|
import com.goafanti.common.model.AftFile;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
@@ -36,6 +40,8 @@ public class AchievementApiController extends CertifyApiController {
|
|
|
private AchievementService achievementService;
|
|
|
@Resource
|
|
|
private AftFileService aftFileService;
|
|
|
+ @Resource
|
|
|
+ private AchievementOrderService achievementOrderService;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -288,7 +294,14 @@ public class AchievementApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/delete", method = RequestMethod.POST)
|
|
|
private Result delete(@RequestParam(name = "ids[]", required = false) String[] ids) {
|
|
|
Result res = new Result();
|
|
|
- if (ids == null || ids.length < 1) {
|
|
|
+ if (ids == null || ids.length == 1) {
|
|
|
+ List<AchievementOrder> list = achievementOrderService.selectAchievementOrderByAchievementId(ids[0]);
|
|
|
+ for (AchievementOrder order : list){
|
|
|
+ if (!AchievementOrderStatus.CREATE.getCode().equals(order.getStatus())){
|
|
|
+ res.getError().add(buildError("", "当前科技成果有订单,无法删除!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ }
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
|
|
|
} else {
|
|
|
res.setData(achievementService.deleteByPrimaryKey(Arrays.asList(ids)));
|