Browse Source

科技成果log

Antiloveg 8 years ago
parent
commit
ee43921a26

+ 55 - 0
src/main/java/com/goafanti/achievement/bo/AchievementOrderLogUserBo.java

@@ -0,0 +1,55 @@
+package com.goafanti.achievement.bo;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
+
+public class AchievementOrderLogUserBo {
+	private Date	recordTime;
+
+	private Integer	status;
+
+	private String	comment;
+	
+	
+	public Date getRecordTime() {
+		return recordTime;
+	}
+
+	public void setRecordTime(Date recordTime) {
+		this.recordTime = recordTime;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	public String getRecordTimeFormattedDate() {
+		if (this.recordTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getRecordTime(), AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+
+	public void setRecordTimeFormattedDate(String createTimeFormattedDate) {
+
+	}
+}

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

@@ -1,5 +1,11 @@
 package com.goafanti.achievement.service;
 
+import java.util.List;
+
+import com.goafanti.achievement.bo.AchievementOrderLogUserBo;
+
 public interface AchievementOrderLogService {
 
+	List<AchievementOrderLogUserBo> selectAchievementOrderLogByAchievementOrderId(String achievementOrderId);
+
 }

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

@@ -13,4 +13,8 @@ public interface AchievementOrderService {
 
 	Pagination<AchievementOrderListBo> listOrderList(Integer status, Integer pNo, Integer pSize);
 
+	AchievementOrder selectByPrimaryKey(String id);
+
+	int updateShutdownByUser(AchievementOrder order);
+
 }

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

@@ -1,9 +1,20 @@
 package com.goafanti.achievement.service.impl;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.achievement.bo.AchievementOrderLogUserBo;
 import com.goafanti.achievement.service.AchievementOrderLogService;
+import com.goafanti.common.dao.AchievementOrderLogMapper;
 @Service
 public class AchievementOrderLogServiceImpl implements AchievementOrderLogService {
+	@Autowired
+	private AchievementOrderLogMapper achievementOrderLogMapper;
+	@Override
+	public List<AchievementOrderLogUserBo> selectAchievementOrderLogByAchievementOrderId(String achievementOrderId) {
+		return achievementOrderLogMapper.selectAchievementOrderLogByAchievementOrderId(achievementOrderId);
+	}
 
 }

+ 9 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementOrderServiceImpl.java

@@ -68,5 +68,14 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
 		return (Pagination<AchievementOrderListBo>) findPage("findAchievementOrderListByPage",
 				"findAchievementOrderCount", params, pNo, pSize);
 	}
+	@Override
+	public AchievementOrder selectByPrimaryKey(String id) {
+		return achievementOrderMapper.selectByPrimaryKey(id);
+	}
+	@Override
+	public int updateShutdownByUser(AchievementOrder order) {
+		order.setStatus(AchievementOrderStatus.SHUTDOWNUNSIGN.getCode());
+		return achievementOrderMapper.updateByPrimaryKeySelective(order);
+	}
 
 }

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

@@ -1,5 +1,8 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
+import com.goafanti.achievement.bo.AchievementOrderLogUserBo;
 import com.goafanti.common.model.AchievementOrderLog;
 
 public interface AchievementOrderLogMapper {
@@ -14,4 +17,6 @@ public interface AchievementOrderLogMapper {
     int updateByPrimaryKeySelective(AchievementOrderLog record);
 
     int updateByPrimaryKey(AchievementOrderLog record);
+
+	List<AchievementOrderLogUserBo> selectAchievementOrderLogByAchievementOrderId(String achievementOrderId);
 }

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

@@ -103,4 +103,12 @@
       comment = #{comment,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  
+   <select id="selectAchievementOrderLogByAchievementOrderId" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementOrderLogUserBo">
+  	select 
+  		record_time as recordTime, status, comment
+  	from achievement_order_log
+  	where achievement_order_id = #{achievementOrderId,jdbcType=VARCHAR}
+  	order by record_time 
+  </select>
 </mapper>

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

@@ -21,6 +21,7 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AchievementAuditStatus;
 import com.goafanti.common.enums.AchievementOrderFields;
+import com.goafanti.common.enums.AchievementOrderStatus;
 import com.goafanti.common.enums.AchievementReleaseStatus;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.enums.DeleteStatus;
@@ -56,7 +57,54 @@ public class PortalOrderApiController extends CertifyApiController {
 	@Resource
 	private AchievementOrderService		achievementOrderService;
 	
+	/**
+	 * 科技成果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;
+		}
+		AchievementOrder order = achievementOrderService.selectByPrimaryKey(achievementOrderId);
+		if (null != order && TokenManager.getUserId().equals(order.getUid())) {
+			res.setData(achievementOrderLogService.selectAchievementOrderLogByAchievementOrderId(achievementOrderId));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技成果订单ID"));
+		}
+		
+		return res;
+	}
 	
+	/**
+	 * 关闭科技成果订单
+	 */
+	@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;
+		}
+
+		if (!AchievementOrderStatus.CREATE.getCode().equals(order.getStatus())) {
+			res.getError().add(buildError("", "当前状态无法撤销!"));
+			return res;
+		}
+
+		res.setData(achievementOrderService.updateShutdownByUser(order));
+		
+		return res;
+	}
 
 	/**
 	 * 科技成果订单列表