Browse Source

管理端--关闭科技成果线索单/意向单

Antiloveg 8 years ago
parent
commit
eb30711129

+ 1 - 1
src/main/java/com/goafanti/achievement/service/AchievementOrderService.java

@@ -19,7 +19,7 @@ public interface AchievementOrderService {
 
 	AchievementOrder selectByPrimaryKey(String id);
 
-	int updateShutdownByUser(AchievementOrder order);
+	int updateShutdownByUser(AchievementOrder order, Boolean unSign);
 
 	List<AchievementOrder> selectAchievementOrderByAchievementId(String string);
 

+ 8 - 3
src/main/java/com/goafanti/achievement/service/impl/AchievementOrderServiceImpl.java

@@ -76,8 +76,12 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
 	}
 
 	@Override
-	public int updateShutdownByUser(AchievementOrder order) {
-		order.setStatus(AchievementOrderStatus.SHUTDOWNUNSIGN.getCode());
+	public int updateShutdownByUser(AchievementOrder order, Boolean unSign) {
+		if (unSign) {
+			order.setStatus(AchievementOrderStatus.SHUTDOWNUNSIGN.getCode());
+		} else {
+			order.setStatus(AchievementOrderStatus.SHUTDOWN.getCode());
+		}
 		return achievementOrderMapper.updateByPrimaryKeySelective(order);
 	}
 
@@ -98,7 +102,8 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
 			pSize = 10;
 		}
 		return (Pagination<UserAchievementOrderListBo>) findPage("findUserAchievementOrderListByPage",
-				"findUserAchievementOrderCount", disposeAchievementOrder(uid, username, null, status, true), pNo, pSize);
+				"findUserAchievementOrderCount", disposeAchievementOrder(uid, username, null, status, true), pNo,
+				pSize);
 	}
 
 	@SuppressWarnings("unchecked")

+ 30 - 0
src/main/java/com/goafanti/admin/controller/AdminOrderApiController.java

@@ -17,7 +17,9 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AchievementOrderFields;
+import com.goafanti.common.enums.AchievementOrderStatus;
 import com.goafanti.common.enums.DemandOrderStatus;
+import com.goafanti.common.model.AchievementOrder;
 import com.goafanti.common.model.DemandOrder;
 import com.goafanti.common.model.DemandOrderLog;
 import com.goafanti.demand.bo.InputDemandOrder;
@@ -37,6 +39,34 @@ public class AdminOrderApiController extends CertifyApiController {
 	private AchievementOrderLogService	achievementOrderLogService;
 
 	/**
+	 * 关闭科技成果线索单/意向单
+	 */
+	@RequestMapping(value = "/achievementShutdown", method = RequestMethod.POST)
+	public Result achevementShutdown(String id) {
+		Result res = new Result();
+
+		if (StringUtils.isBlank(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到科技成果线索单/意向单ID", "科技成果线索单/意向单ID"));
+			return res;
+		}
+
+		AchievementOrder order = achievementOrderService.selectByPrimaryKey(id);
+		if (null == order) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "科技成果线索单/意向单ID"));
+			return res;
+		}
+		Boolean unSign = false;
+		if (AchievementOrderStatus.CREATE.getCode().equals(order.getStatus())
+				|| AchievementOrderStatus.INTENTIONMONEY.getCode().equals(order.getStatus())) {
+			unSign = true;
+		}
+
+		res.setData(achievementOrderService.updateShutdownByUser(order, unSign));
+
+		return res;
+	}
+
+	/**
 	 * 科技成果线索单/意向单Log
 	 */
 	@RequestMapping(value = "/achievementOrderLog", method = RequestMethod.GET)

+ 1 - 1
src/main/java/com/goafanti/portal/controller/PortalOrderApiController.java

@@ -101,7 +101,7 @@ public class PortalOrderApiController extends CertifyApiController {
 			return res;
 		}
 
-		res.setData(achievementOrderService.updateShutdownByUser(order));
+		res.setData(achievementOrderService.updateShutdownByUser(order, true));
 		
 		return res;
 	}