|
|
@@ -9,15 +9,20 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import com.goafanti.achievement.service.AchievementOrderService;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
+import com.goafanti.common.constant.ErrorConstants;
|
|
|
+import com.goafanti.common.controller.CertifyApiController;
|
|
|
+import com.goafanti.demand.service.DemandOrderLogService;
|
|
|
import com.goafanti.demand.service.DemandOrderService;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping(value = "/api/admin/portal/order")
|
|
|
-public class AdminOrderApiController {
|
|
|
+public class AdminOrderApiController extends CertifyApiController {
|
|
|
@Resource
|
|
|
- private AchievementOrderService achievementOrderService;
|
|
|
+ private AchievementOrderService achievementOrderService;
|
|
|
@Resource
|
|
|
- private DemandOrderService demandOrderService;
|
|
|
+ private DemandOrderService demandOrderService;
|
|
|
+ @Resource
|
|
|
+ private DemandOrderLogService demandOrderLogService;
|
|
|
|
|
|
/**
|
|
|
* 科技需求线索单/意向单列表(个人用户)
|
|
|
@@ -36,12 +41,12 @@ public class AdminOrderApiController {
|
|
|
res.setData(demandOrderService.listUserDemandOrder(uid, username, status, pNo, pSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 科技需求线索单/意向单列表(组织用户)
|
|
|
*/
|
|
|
@RequestMapping(value = "/orgDemandOrderList", method = RequestMethod.GET)
|
|
|
- public Result orgDemandOrderList(String uid, String unitName, Integer status, String pageNo, String pageSize){
|
|
|
+ public Result orgDemandOrderList(String uid, String unitName, Integer status, String pageNo, String pageSize) {
|
|
|
Result res = new Result();
|
|
|
Integer pNo = 1;
|
|
|
Integer pSize = 10;
|
|
|
@@ -54,4 +59,18 @@ public class AdminOrderApiController {
|
|
|
res.setData(demandOrderService.listOrgDemandOrder(uid, unitName, status, pNo, pSize));
|
|
|
return res;
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 科技需求线索单/意向单log
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/demandOrderLog", method = RequestMethod.GET)
|
|
|
+ public Result demandOrderLog(String demandOrderId) {
|
|
|
+ Result res = new Result();
|
|
|
+ if (StringUtils.isEmpty(demandOrderId)) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "科技需求订单ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ res.setData(demandOrderLogService.selectAdminDemandOrderLogByDemandOrderId(demandOrderId));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
}
|