Browse Source

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

Antiloveg 8 years ago
parent
commit
eb30f5c16f

+ 16 - 0
src/main/java/com/goafanti/achievement/bo/AchievementOrderLogAdminBo.java

@@ -0,0 +1,16 @@
+package com.goafanti.achievement.bo;
+
+public class AchievementOrderLogAdminBo extends AchievementOrderLogUserBo{
+	private String operator;
+
+	public String getOperator() {
+		return operator;
+	}
+
+	public void setOperator(String operator) {
+		this.operator = operator;
+	}
+	
+	
+
+}

+ 3 - 0
src/main/java/com/goafanti/achievement/service/AchievementOrderLogService.java

@@ -2,10 +2,13 @@ package com.goafanti.achievement.service;
 
 import java.util.List;
 
+import com.goafanti.achievement.bo.AchievementOrderLogAdminBo;
 import com.goafanti.achievement.bo.AchievementOrderLogUserBo;
 
 public interface AchievementOrderLogService {
 
 	List<AchievementOrderLogUserBo> selectAchievementOrderLogByAchievementOrderId(String achievementOrderId);
 
+	List<AchievementOrderLogAdminBo> selectAdminAchievementOrderLogByAchievementOrderId(String achievementOrderId);
+
 }

+ 8 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementOrderLogServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.achievement.bo.AchievementOrderLogAdminBo;
 import com.goafanti.achievement.bo.AchievementOrderLogUserBo;
 import com.goafanti.achievement.service.AchievementOrderLogService;
 import com.goafanti.common.dao.AchievementOrderLogMapper;
@@ -12,9 +13,16 @@ import com.goafanti.common.dao.AchievementOrderLogMapper;
 public class AchievementOrderLogServiceImpl implements AchievementOrderLogService {
 	@Autowired
 	private AchievementOrderLogMapper achievementOrderLogMapper;
+	
 	@Override
 	public List<AchievementOrderLogUserBo> selectAchievementOrderLogByAchievementOrderId(String achievementOrderId) {
 		return achievementOrderLogMapper.selectAchievementOrderLogByAchievementOrderId(achievementOrderId);
 	}
+	
+	@Override
+	public List<AchievementOrderLogAdminBo> selectAdminAchievementOrderLogByAchievementOrderId(
+			String achievementOrderId) {
+		return achievementOrderLogMapper.selectAdminAchievementOrderLogByAchievementOrderId(achievementOrderId);
+	}
 
 }

+ 37 - 20
src/main/java/com/goafanti/admin/controller/AdminOrderApiController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.goafanti.achievement.service.AchievementOrderLogService;
 import com.goafanti.achievement.service.AchievementOrderService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
@@ -27,17 +28,34 @@ import com.goafanti.demand.service.DemandOrderService;
 @RequestMapping(value = "/api/admin/portal/order")
 public class AdminOrderApiController extends CertifyApiController {
 	@Resource
-	private AchievementOrderService	achievementOrderService;
+	private AchievementOrderService		achievementOrderService;
 	@Resource
-	private DemandOrderService		demandOrderService;
+	private DemandOrderService			demandOrderService;
 	@Resource
-	private DemandOrderLogService	demandOrderLogService;
-	
+	private DemandOrderLogService		demandOrderLogService;
+	@Resource
+	private AchievementOrderLogService	achievementOrderLogService;
+
+	/**
+	 * 科技成果线索单/意向单Log
+	 */
+	@RequestMapping(value = "/achievementOrderLog", method = RequestMethod.GET)
+	public Result achievementOrderLog(String achievementOrderId) {
+		Result res = new Result();
+		if (StringUtils.isEmpty(achievementOrderId)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "科技成果订单ID"));
+			return res;
+		}
+		res.setData(achievementOrderLogService.selectAdminAchievementOrderLogByAchievementOrderId(achievementOrderId));
+		return res;
+	}
+
 	/**
 	 * 科技成果线索单/意向单列表(个人用户)
 	 */
 	@RequestMapping(value = "/userAchievementOrderList", method = RequestMethod.GET)
-	public Result userAchievementOrderList(String uid, String username, Integer status, String pageNo, String pageSize){
+	public Result userAchievementOrderList(String uid, String username, Integer status, String pageNo,
+			String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -50,12 +68,12 @@ public class AdminOrderApiController extends CertifyApiController {
 		res.setData(achievementOrderService.listUserAchievementOrder(uid, username, status, pNo, pSize));
 		return res;
 	}
-	
+
 	/**
 	 * 科技成果线索单/意向单列表(组织用户)
 	 */
 	@RequestMapping(value = "/orgAchievementOrderList", method = RequestMethod.GET)
-	public Result orgAchievementOrderList(String uid, String unitName, Integer status, String pageNo, String pageSize){
+	public Result orgAchievementOrderList(String uid, String unitName, Integer status, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -68,7 +86,6 @@ public class AdminOrderApiController extends CertifyApiController {
 		res.setData(achievementOrderService.listOrgAchievementOrder(uid, unitName, status, pNo, pSize));
 		return res;
 	}
-	
 
 	/**
 	 * 科技需求线索单/意向单列表(个人用户)
@@ -119,34 +136,34 @@ public class AdminOrderApiController extends CertifyApiController {
 		res.setData(demandOrderLogService.selectAdminDemandOrderLogByDemandOrderId(demandOrderId));
 		return res;
 	}
-	
+
 	/**
 	 * 科技需求线索单/意向单修改
 	 */
 	@RequestMapping(value = "/updateDemandOrder", method = RequestMethod.POST)
-	public Result updateDemandOrder(@Valid InputDemandOrder inputDemandOrder, BindingResult bindingResult, String recordTimeFormattedDate,
-			Boolean flag) {
+	public Result updateDemandOrder(@Valid InputDemandOrder inputDemandOrder, BindingResult bindingResult,
+			String recordTimeFormattedDate, Boolean flag) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					AchievementOrderFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if (StringUtils.isBlank(inputDemandOrder.getDemandId())){
+		if (StringUtils.isBlank(inputDemandOrder.getDemandId())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到科技需求ID", "科技需求ID"));
 			return res;
 		}
-		if (null == inputDemandOrder.getStatus()){
+		if (null == inputDemandOrder.getStatus()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到科技需求状态", "科技需求状态"));
 			return res;
 		}
-		
-		if (null == flag){
+
+		if (null == flag) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到科技需求修改标记", "科技需求修改标记"));
 			return res;
 		}
-		
-		if (flag && StringUtils.isBlank(recordTimeFormattedDate)){
+
+		if (flag && StringUtils.isBlank(recordTimeFormattedDate)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到科技需求记录修改时间", "科技需求记录修改时间"));
 			return res;
 		}
@@ -157,7 +174,7 @@ public class AdminOrderApiController extends CertifyApiController {
 		res.setData(demandOrderService.updateDemandOrder(order, dol, recordTimeFormattedDate));
 		return res;
 	}
-	
+
 	/**
 	 * 关闭科技需求线索单/意向单
 	 */
@@ -176,13 +193,13 @@ public class AdminOrderApiController extends CertifyApiController {
 		}
 		Boolean unSign = false;
 		if (DemandOrderStatus.CREATE.getCode().equals(order.getStatus())
-				|| DemandOrderStatus.INTENTIONMONEY.getCode().equals(order.getStatus())){
+				|| DemandOrderStatus.INTENTIONMONEY.getCode().equals(order.getStatus())) {
 			unSign = true;
 		}
 		res.setData(demandOrderService.updateShutdownByUser(order, unSign));
 		return res;
 	}
-	
+
 	/**
 	 * 下载科技需求线索单/意向单文件
 	 */

+ 3 - 0
src/main/java/com/goafanti/common/dao/AchievementOrderLogMapper.java

@@ -2,6 +2,7 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
+import com.goafanti.achievement.bo.AchievementOrderLogAdminBo;
 import com.goafanti.achievement.bo.AchievementOrderLogUserBo;
 import com.goafanti.common.model.AchievementOrderLog;
 
@@ -19,4 +20,6 @@ public interface AchievementOrderLogMapper {
     int updateByPrimaryKey(AchievementOrderLog record);
 
 	List<AchievementOrderLogUserBo> selectAchievementOrderLogByAchievementOrderId(String achievementOrderId);
+
+	List<AchievementOrderLogAdminBo> selectAdminAchievementOrderLogByAchievementOrderId(String achievementOrderId);
 }

+ 10 - 0
src/main/java/com/goafanti/common/mapper/AchievementOrderLogMapper.xml

@@ -111,4 +111,14 @@
   	where achievement_order_id = #{achievementOrderId,jdbcType=VARCHAR}
   	order by record_time 
   </select>
+  
+  <select id="selectAdminAchievementOrderLogByAchievementOrderId" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementOrderLogAdminBo">
+  	select 
+  		aol.record_time as recordTime, aol.status, aol.comment,
+  		a.name as operator
+  	from achievement_order_log aol
+  	left join admin a on a.id = aol.operator
+  	where aol.achievement_order_id = #{achievementOrderId,jdbcType=VARCHAR}
+  	order by aol.record_time 
+  </select>
 </mapper>