diff --git a/code/web/task_schedule/src/views/DataManagement.vue b/code/web/task_schedule/src/views/DataManagement.vue
index b31b646..4d4b463 100644
--- a/code/web/task_schedule/src/views/DataManagement.vue
+++ b/code/web/task_schedule/src/views/DataManagement.vue
@@ -14,10 +14,19 @@
90俱乐部
+
+
+ 新增
+
+
+ 删除
+
+
XXX
+
+
+ 新增
+
+
+ 删除
+
+
@@ -113,4 +143,12 @@ export default {
.dishonor-wrapper {
flex-grow: 1;
}
+
+.toolbutton-wrapper {
+ text-align: left;
+ margin-bottom: 10px;
+ >*+* {
+ margin-left: 15px;
+ }
+}
diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/mybatis/mapper/RewardsMapper.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/mybatis/mapper/RewardsMapper.java
index d6186f3..ae853fe 100644
--- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/mybatis/mapper/RewardsMapper.java
+++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/mybatis/mapper/RewardsMapper.java
@@ -12,8 +12,13 @@ package com.cpic.xim.mybatis.mapper;
import java.util.ArrayList;
import com.cpic.xim.mybatis.pojo.RewardProject;
+import com.cpic.xim.mybatis.pojo.RewardGainer;
public interface RewardsMapper
{
public ArrayList queryRewardProjects();
+
+ public ArrayList queryRewardGainers();
+
+
}
diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/mybatis/pojo/RewardGainer.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/mybatis/pojo/RewardGainer.java
new file mode 100644
index 0000000..ad31fa4
--- /dev/null
+++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/mybatis/pojo/RewardGainer.java
@@ -0,0 +1,156 @@
+/*
+ * @Author: Kane
+ * @Date: 2023-09-07 15:18:46
+ * @LastEditors: Kane
+ * @FilePath: /desktop_archievement_backend/src/main/java/com/cpic/xim/mybatis/pojo/RewardGainer.java
+ * @Description: 获奖人对象
+ *
+ * Copyright (c) ${2022} by Kane, All Rights Reserved.
+ */
+package com.cpic.xim.mybatis.pojo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class RewardGainer
+{
+ public RewardGainer() {}
+
+ public RewardGainer( String acquiredDate, String callerName, String callerCode,
+ String rewardProjectCode, String rewardProjectName)
+ {
+ this.acquiredDate = acquiredDate;
+ this.callerName = callerName;
+ this.callerCode = callerCode;
+ this.rewardProjectCode = rewardProjectCode;
+ this.rewardProjectName = rewardProjectName;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "RewardGainer [acquiredDate=" + acquiredDate + ", callerName=" + callerName
+ + ", callerCode=" + callerCode + ", rewardProjectCode=" + rewardProjectCode
+ + ", rewardProjectName=" + rewardProjectName + "]";
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((acquiredDate == null) ? 0 : acquiredDate.hashCode());
+ result = prime * result + ((callerName == null) ? 0 : callerName.hashCode());
+ result = prime * result + ((callerCode == null) ? 0 : callerCode.hashCode());
+ result = prime * result + ((rewardProjectCode == null) ? 0 : rewardProjectCode.hashCode());
+ result = prime * result + ((rewardProjectName == null) ? 0 : rewardProjectName.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals( Object obj )
+ {
+ if ( this == obj )
+ return true;
+ if ( obj == null )
+ return false;
+ if ( getClass() != obj.getClass() )
+ return false;
+ RewardGainer other = (RewardGainer) obj;
+ if ( acquiredDate == null )
+ {
+ if ( other.acquiredDate != null )
+ return false;
+ } else if ( !acquiredDate.equals( other.acquiredDate ) )
+ return false;
+ if ( callerName == null )
+ {
+ if ( other.callerName != null )
+ return false;
+ } else if ( !callerName.equals( other.callerName ) )
+ return false;
+ if ( callerCode == null )
+ {
+ if ( other.callerCode != null )
+ return false;
+ } else if ( !callerCode.equals( other.callerCode ) )
+ return false;
+ if ( rewardProjectCode == null )
+ {
+ if ( other.rewardProjectCode != null )
+ return false;
+ } else if ( !rewardProjectCode.equals( other.rewardProjectCode ) )
+ return false;
+ if ( rewardProjectName == null )
+ {
+ if ( other.rewardProjectName != null )
+ return false;
+ } else if ( !rewardProjectName.equals( other.rewardProjectName ) )
+ return false;
+ return true;
+ }
+
+ public String getAcquiredDate()
+ {
+ return acquiredDate;
+ }
+
+ public void setAcquiredDate( String acquiredDate )
+ {
+ this.acquiredDate = acquiredDate;
+ }
+
+ public String getCallerName()
+ {
+ return callerName;
+ }
+
+ public void setCallerName( String callerName )
+ {
+ this.callerName = callerName;
+ }
+
+ public String getCallerCode()
+ {
+ return callerCode;
+ }
+
+ public void setCallerCode( String callerCode )
+ {
+ this.callerCode = callerCode;
+ }
+
+ public String getRewardProjectCode()
+ {
+ return rewardProjectCode;
+ }
+
+ public void setRewardProjectCode( String rewardProjectCode )
+ {
+ this.rewardProjectCode = rewardProjectCode;
+ }
+
+ public String getRewardProjectName()
+ {
+ return rewardProjectName;
+ }
+
+ public void setRewardProjectName( String rewardProjectName )
+ {
+ this.rewardProjectName = rewardProjectName;
+ }
+
+ @JsonProperty( "acquiredDate" )
+ private String acquiredDate;
+
+ @JsonProperty( "callerName" )
+ private String callerName;
+
+ @JsonProperty( "callerCode" )
+ private String callerCode;
+
+ @JsonProperty( "rewardProjectCode" )
+ private String rewardProjectCode;
+
+ @JsonProperty( "rewardProjectName" )
+ private String rewardProjectName;
+}
diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/QueryResult.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/QueryResponse.java
similarity index 91%
rename from code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/QueryResult.java
rename to code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/QueryResponse.java
index 99f7b6e..bb58b70 100644
--- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/QueryResult.java
+++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/QueryResponse.java
@@ -11,14 +11,14 @@ package com.cpic.xim.web.controllers;
import com.fasterxml.jackson.annotation.JsonProperty;
-public class QueryResult {
+public class QueryResponse {
- public QueryResult(boolean success, String message) {
+ public QueryResponse(boolean success, String message) {
this.success = success;
this.message = message;
}
- public QueryResult() {
+ public QueryResponse() {
this.success = false;
this.message = "";
}
@@ -53,7 +53,7 @@ public class QueryResult {
if (this == obj) return true;
if (obj == null) return false;
if (getClass() != obj.getClass()) return false;
- QueryResult other = (QueryResult) obj;
+ QueryResponse other = (QueryResponse) obj;
if (success != other.success) return false;
if (message == null) {
if (other.message != null) return false;
diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/account/TeleSalerQueryResult.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/account/TeleSalerQueryResult.java
index d40b5bf..fbc1282 100644
--- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/account/TeleSalerQueryResult.java
+++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/account/TeleSalerQueryResult.java
@@ -9,10 +9,10 @@
*/
package com.cpic.xim.web.controllers.account;
-import com.cpic.xim.web.controllers.QueryResult;
+import com.cpic.xim.web.controllers.QueryResponse;
import com.fasterxml.jackson.annotation.JsonProperty;
-public class TeleSalerQueryResult extends QueryResult
+public class TeleSalerQueryResult extends QueryResponse
{
public TeleSalerQueryResult()
diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/RankingList/RankingListResponse.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/RankingList/RankingListResponse.java
index 37b8539..f44e3eb 100644
--- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/RankingList/RankingListResponse.java
+++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/RankingList/RankingListResponse.java
@@ -11,10 +11,10 @@ package com.cpic.xim.web.controllers.archievement.RankingList;
import java.util.ArrayList;
import com.cpic.xim.utils.ranking.CallerRankingItem;
-import com.cpic.xim.web.controllers.QueryResult;
+import com.cpic.xim.web.controllers.QueryResponse;
import com.fasterxml.jackson.annotation.JsonProperty;
-public class RankingListResponse extends QueryResult
+public class RankingListResponse extends QueryResponse
{
public RankingListResponse()
{
diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/caller/CallerArchievementQueryResult.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/caller/CallerArchievementQueryResult.java
index b86f077..a5a36a7 100644
--- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/caller/CallerArchievementQueryResult.java
+++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/caller/CallerArchievementQueryResult.java
@@ -10,11 +10,11 @@
package com.cpic.xim.web.controllers.archievement.caller;
import com.cpic.xim.mybatis.pojo.MensualArchievementItem;
-import com.cpic.xim.web.controllers.QueryResult;
+import com.cpic.xim.web.controllers.QueryResponse;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.ArrayList;
-public class CallerArchievementQueryResult extends QueryResult
+public class CallerArchievementQueryResult extends QueryResponse
{
/**
*
diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/department/DepartmentArchievementQueryResult.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/department/DepartmentArchievementQueryResult.java
index c4a8a59..b24424d 100644
--- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/department/DepartmentArchievementQueryResult.java
+++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/department/DepartmentArchievementQueryResult.java
@@ -14,14 +14,14 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
import com.cpic.xim.mybatis.pojo.MensualArchievementItem;
-import com.cpic.xim.web.controllers.QueryResult;
+import com.cpic.xim.web.controllers.QueryResponse;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* 查询部门业绩返回结果。
* MensualArchievementList 每月业绩,要保证数据是按照月份排序。
*/
-public class DepartmentArchievementQueryResult extends QueryResult
+public class DepartmentArchievementQueryResult extends QueryResponse
{
public DepartmentArchievementQueryResult()
{
@@ -46,7 +46,8 @@ public class DepartmentArchievementQueryResult extends QueryResult
return mensualArchievementList;
}
- public void setMensualArchievementList( ArrayList mensualArchievementList )
+ public void setMensualArchievementList(
+ ArrayList mensualArchievementList )
{
this.mensualArchievementList = mensualArchievementList;
}
diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/rewards/RewardController.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/rewards/RewardController.java
index 72d335e..cd2d4a0 100644
--- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/rewards/RewardController.java
+++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/rewards/RewardController.java
@@ -63,4 +63,6 @@ public class RewardController
return response;
}
+
+
}
\ No newline at end of file
diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/rewards/RewardGainersResponse.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/rewards/RewardGainersResponse.java
new file mode 100644
index 0000000..5a7ee31
--- /dev/null
+++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/rewards/RewardGainersResponse.java
@@ -0,0 +1,47 @@
+/*
+ * @Author: Kane
+ * @Date: 2023-09-07 17:16:12
+ * @LastEditors: Kane
+ * @FilePath: /desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/rewards/RewardGainersResponse.java
+ * @Description:
+ *
+ * Copyright (c) ${2022} by Kane, All Rights Reserved.
+ */
+
+package com.cpic.xim.web.controllers.rewards;
+
+import com.cpic.xim.mybatis.pojo.RewardGainer;
+import com.cpic.xim.web.controllers.QueryResponse;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.ArrayList;
+
+public class RewardGainersResponse extends QueryResponse
+{
+ public RewardGainersResponse( boolean success, String message,
+ ArrayList gainerList)
+ {
+ super( success, message );
+
+ this.gainerList = gainerList;
+ }
+
+ public RewardGainersResponse()
+ {
+ super();
+
+ this.gainerList = null;
+ }
+
+ public ArrayList getGainerList()
+ {
+ return gainerList;
+ }
+
+ public void setGainerList( ArrayList gainerList )
+ {
+ this.gainerList = gainerList;
+ }
+
+ @JsonProperty( "gainerList" )
+ private ArrayList gainerList;
+}
diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/rewards/RewardProjectsResponse.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/rewards/RewardProjectsResponse.java
index 0fffd6d..5f4a8e3 100644
--- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/rewards/RewardProjectsResponse.java
+++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/rewards/RewardProjectsResponse.java
@@ -10,11 +10,11 @@
package com.cpic.xim.web.controllers.rewards;
import com.cpic.xim.mybatis.pojo.RewardProject;
-import com.cpic.xim.web.controllers.QueryResult;
+import com.cpic.xim.web.controllers.QueryResponse;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.ArrayList;
-public class RewardProjectsResponse extends QueryResult
+public class RewardProjectsResponse extends QueryResponse
{
public RewardProjectsResponse( boolean success, String message,
ArrayList rewardList)
diff --git a/code/后端/desktop_archievement_backend/src/main/resources/mybatis/mapper/RewardsMapper.xml b/code/后端/desktop_archievement_backend/src/main/resources/mybatis/mapper/RewardsMapper.xml
index 325e78d..237d0c2 100644
--- a/code/后端/desktop_archievement_backend/src/main/resources/mybatis/mapper/RewardsMapper.xml
+++ b/code/后端/desktop_archievement_backend/src/main/resources/mybatis/mapper/RewardsMapper.xml
@@ -8,4 +8,22 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/code/后端/desktop_archievement_backend/src/test/java/com/cpic/xim/DesktopArchievement/test/DesktopArchievementTest.java b/code/后端/desktop_archievement_backend/src/test/java/com/cpic/xim/DesktopArchievement/test/DesktopArchievementTest.java
index 36419fd..b43c342 100644
--- a/code/后端/desktop_archievement_backend/src/test/java/com/cpic/xim/DesktopArchievement/test/DesktopArchievementTest.java
+++ b/code/后端/desktop_archievement_backend/src/test/java/com/cpic/xim/DesktopArchievement/test/DesktopArchievementTest.java
@@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory;
import com.cpic.xim.mybatis.mapper.ArchievementMapper;
import com.cpic.xim.mybatis.mapper.RewardsMapper;
import com.cpic.xim.mybatis.pojo.MensualArchievementItem;
+import com.cpic.xim.mybatis.pojo.RewardGainer;
import com.cpic.xim.mybatis.pojo.RewardProject;
import com.cpic.xim.mybatis.utils.MybatisUtils;
import com.cpic.xim.utils.ranking.CallerRankingList;
@@ -127,12 +128,34 @@ public class DesktopArchievementTest
ArrayList rewards = mapper.queryRewardProjects();
System.out.println( rewards );
- assert( rewards.isEmpty() == false );
-
+ assert (rewards.isEmpty() == false);
+
}
catch ( IOException error )
{
- assert( false );
+ assert (false);
+ }
+ }
+
+ @Test
+ public void testQueryGainers()
+ {
+ SqlSession session = null;
+
+ try
+ {
+ session = MybatisUtils.getSqlSession();
+ RewardsMapper mapper = session.getMapper( RewardsMapper.class );
+
+ ArrayList gainers = mapper.queryRewardGainers();
+
+ System.out.println( gainers );
+
+ assert( gainers != null );
+ }
+ catch ( IOException error )
+ {
+ assert (false);
}
}
}