#2 添加后台管理店铺违规处理记录列表按修改时间降序排列

src/main/java/com/uas/platform/b2c/prod/store/model/StoreViolations.java

@@ -63,6 +63,12 @@ public class StoreViolations {
 	@Column(name = "vi_create_time")
 	private Date createTime;
 
+	/**
+	 * 违规处理修改时间
+	 */
+	@Column(name = "vi_update_time")
+	private Date updateTime;
+
 	/**
 	 * 违规处理记录是否处于当前违规申述处理流程
 	 */
@@ -365,4 +371,12 @@ public class StoreViolations {
 	public void setCurrent(Boolean current) {
 		this.current = current;
 	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
 }

src/main/java/com/uas/platform/b2c/prod/store/service/impl/StoreViolationsServiceImpl.java

@@ -78,6 +78,7 @@ public class StoreViolationsServiceImpl implements StoreViolationsService {
 		violations.setDisposeProofJson(StoreBusinessUtils.fromResourcesAboutViolations(violations.getDisposeProof()));
 		violations.setDisposeOperator(operator);
 		violations.setCreateTime(operator.getOperateTime());
+		violations.setUpdateTime(operator.getOperateTime());
 
 		// 计算处置结束时间
 		int index = violations.getDisposition().indexOf('_');
@@ -150,6 +151,7 @@ public class StoreViolationsServiceImpl implements StoreViolationsService {
 		violations.setStatus(ViolationsStatus.COMPLAINT);
 		violations.setComplaintProofJson(StoreBusinessUtils.fromResourcesAboutViolations(violations.getComplaintProof()));
 		violations.setComplaintOperator(operator);
+		violations.setUpdateTime(operator.getOperateTime());
 
 		violationsDao.save(violations);
 
@@ -197,6 +199,8 @@ public class StoreViolationsServiceImpl implements StoreViolationsService {
 			storeIn.setStatus(StoreStatus.CLOSED);	// 申述失败设置店铺状态为违规关店状态
 		}
 
+		violations.setUpdateTime(operator.getOperateTime());
+
 		violationsDao.save(violations);
 
 		storeIn.setUpdateTime(new Date());
@@ -273,6 +277,7 @@ public class StoreViolationsServiceImpl implements StoreViolationsService {
 		violations.setRestoreOperator(operator);
 		violations.setRestore(true);
 		violations.setStatus(ViolationsStatus.DONE);
+		violations.setUpdateTime(operator.getOperateTime());
 		violationsDao.save(violations);
 
 		storeIn.setUpdateTime(new Date());
@@ -299,6 +304,7 @@ public class StoreViolationsServiceImpl implements StoreViolationsService {
 
 				violations.setStatus(ViolationsStatus.DONE);
 				violations.setCurrent(false);
+				violations.setUpdateTime(new Date());
 
 				violationsDao.save(violations);
 

src/main/webapp/resources/js/common/module/store_admin_violations_module.js

@@ -223,7 +223,10 @@ define([ 'ngResource', 'common/query/storeViolations', 'ngTable', 'ngSanitize',
 		function active() {
 			$scope.violationsTableParams = new ngTableParams({
 				page : 1,
-				count : 10
+				count : 10,
+				sorting: {
+					updateTime: 'DESC'
+				}
 			}, {
 				total : 0,
 				getData : function($defer, params) {

src/main/webapp/resources/view/admin/store/fragments/violations_list.html

@@ -137,12 +137,7 @@
 						<p ng-if="!violations.disposition" class="blue">违规店铺</p>
 					</td>
 					<td ng-bind="violations.createTime | date: 'yyyy-MM-dd HH:mm:ss'">2017-05-09 10:28:30</td>
-					<td>
-						<span ng-if="violations.restoreOperator" ng-bind="violations.restoreOperator.operateTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
-						<span ng-if="violations.authOperator && !violations.restoreOperator" ng-bind="violations.authOperator.operateTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
-						<span ng-if="violations.complaintOperator && !violations.authOperator && !violations.restoreOperator" ng-bind="violations.complaintOperator.operateTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
-						<span ng-if="violations.createTime && !violations.complaintOperator && !violations.authOperator && !violations.restoreOperator" ng-bind="violations.createTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
-					</td>
+					<td ng-bind="violations.updateTime | date: 'yyyy-MM-dd HH:mm:ss'">2017-05-09 10:28:30</td>
 					<td>
 						<span ng-if="violations.restoreOperator" ng-bind="violations.restoreOperator.name"></span>
 						<span ng-if="violations.authOperator && !violations.restoreOperator" ng-bind="violations.authOperator.name"></span>