From 38ec1c7d6c72b910822f986a4307a1726dd13271 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 29 Jul 2023 01:13:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=BF=9B=E5=BA=A6!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archievement/DepartmentArchievement.java | 30 ++++++++++++------- .../DepartmentArchievementQueryResult.java | 11 +++---- .../mybatis/mapper/ArchievementMapper.xml | 2 +- .../test/DesktopArchievementTest.java | 20 +++++++++++-- 4 files changed, 44 insertions(+), 19 deletions(-) diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/archievement/DepartmentArchievement.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/archievement/DepartmentArchievement.java index 0935d84..e7518f2 100644 --- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/archievement/DepartmentArchievement.java +++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/archievement/DepartmentArchievement.java @@ -42,7 +42,7 @@ public class DepartmentArchievement public DepartmentArchievement() { this.totalArchievement = 0; - this.mensualArchievementList = new ArrayList<>(); + this.mensualArchievementList = null; this.insuranceRenewalRate = ""; this.attachingRate = ""; this.departmentCode = ""; @@ -57,7 +57,7 @@ public class DepartmentArchievement * @param attachingRate 车非渗透率 */ public DepartmentArchievement( String departmentCode, long totalArchievement, - List mensualArchievementList, String insuranceRenewalRate, String attachingRate) + ArrayList mensualArchievementList, String insuranceRenewalRate, String attachingRate) { this.departmentCode = departmentCode; this.totalArchievement = totalArchievement; @@ -66,6 +66,12 @@ public class DepartmentArchievement this.attachingRate = attachingRate; } + /** + * 静态方法，用于根据部门代码，查询部门业绩，生成一个 DepartmentArchievement 对象。 + * @param departmentCode 部门代码 + * @return + * @throws IOException + */ public static DepartmentArchievement getDepartmentArchievement( String departmentCode ) throws IOException { @@ -83,14 +89,17 @@ public class DepartmentArchievement mapper.getDepartmentArchievement(params); - String totalArchievement = (String)params.get("a_total"); + Integer totalArchievement = (Integer)params.get("a_total"); String attachingRate = (String)params.get("a_attaching_rate"); String renewalRate = (String)params.get("a_renewal_rate"); - List mensual = (List)params.get("a_mensual_cur"); - - archievement = new DepartmentArchievement(departmentCode, 0, mensual, renewalRate, attachingRate); - + ArrayList mensual = (ArrayList)params.get("a_mensual_cur"); + archievement = new DepartmentArchievement( + departmentCode, + totalArchievement.intValue(), + mensual, + renewalRate, + attachingRate); } catch ( IOException error ) { @@ -101,7 +110,6 @@ public class DepartmentArchievement throw error; } - return archievement; } @@ -204,12 +212,12 @@ public class DepartmentArchievement this.totalArchievement = totalArchievement; } - public List getMensualArchievementList() + public ArrayList getMensualArchievementList() { return mensualArchievementList; } - public void setMensualArchievementList( List mensualArchievementList ) + public void setMensualArchievementList( ArrayList mensualArchievementList ) { this.mensualArchievementList = mensualArchievementList; } @@ -253,7 +261,7 @@ public class DepartmentArchievement // 每月业绩列表 // 要保证数据是按照月份排序。 @JsonProperty( "mensual_archievement_list" ) - private List mensualArchievementList; + private ArrayList mensualArchievementList; @JsonProperty( "insurance_renewal_rate" ) private String insuranceRenewalRate; // 续保率 diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/DepartmentArchievementQueryResult.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/DepartmentArchievementQueryResult.java index ed9a272..7a631f2 100644 --- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/DepartmentArchievementQueryResult.java +++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/DepartmentArchievementQueryResult.java @@ -10,7 +10,8 @@ package com.cpic.xim.web.controllers.archievement; -import java.util.LinkedList; +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; @@ -24,7 +25,7 @@ public class DepartmentArchievementQueryResult extends QueryResult { DepartmentArchievementQueryResult() { - mensualArchievementList = new LinkedList(); + mensualArchievementList = new ArrayList(); advanceRewardGainers = new Vector(); leadingRewardGainers = new Vector(); backwardList = new Vector(); @@ -40,12 +41,12 @@ public class DepartmentArchievementQueryResult extends QueryResult this.totalArchievement = totalArchievement; } - public LinkedList getMensualArchievementList() + public List getMensualArchievementList() { return mensualArchievementList; } - public void setMensualArchievementList( LinkedList mensualArchievementList ) + public void setMensualArchievementList( ArrayList mensualArchievementList ) { this.mensualArchievementList = mensualArchievementList; } @@ -121,7 +122,7 @@ public class DepartmentArchievementQueryResult extends QueryResult // 每月业绩列表 // 要保证数据是按照月份排序。 @JsonProperty( "mensual_archievement_list" ) - private LinkedList mensualArchievementList; + private ArrayList mensualArchievementList; @JsonProperty( "insurance_renewal_rate" ) private String insuranceRenewalRate; // 续保率 diff --git a/code/后端/desktop_archievement_backend/src/main/resources/mybatis/mapper/ArchievementMapper.xml b/code/后端/desktop_archievement_backend/src/main/resources/mybatis/mapper/ArchievementMapper.xml index c16ad05..d5b6943 100644 --- a/code/后端/desktop_archievement_backend/src/main/resources/mybatis/mapper/ArchievementMapper.xml +++ b/code/后端/desktop_archievement_backend/src/main/resources/mybatis/mapper/ArchievementMapper.xml @@ -6,7 +6,7 @@ #{a_department_code, mode=IN, jdbcType=VARCHAR}, #{a_attaching_rate, mode=OUT, jdbcType=VARCHAR}, #{a_renewal_rate, mode=OUT, jdbcType=VARCHAR}, - #{a_total, mode=OUT, jdbcType=VARCHAR}, + #{a_total, mode=OUT, jdbcType=INTEGER, javaType=Integer}, #{a_mensual_cur, mode=OUT, jdbcType=CURSOR, resultMap=MensualArchievementMapper}) 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 1d775a0..daeaafd 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 @@ -26,7 +26,7 @@ import com.cpic.xim.mybatis.mapper.ArchievementMapper; import com.cpic.xim.mybatis.pojo.MensualArchievementItem; import com.cpic.xim.utils.ranking.CallerRankingList; - +import com.cpic.xim.utils.archievement.DepartmentArchievement; @SuppressWarnings( "all" ) public class DesktopArchievementTest @@ -72,7 +72,8 @@ public class DesktopArchievementTest mapper.getDepartmentArchievement( params ); - mensual = (List)params.get("a_mensual_cur"); + mensual = (ArrayList) params.get( "a_mensual_cur" ); + Integer total = (Integer) params.get( "a_total" ); System.out.println( params.toString() ); System.out.println( mensual.toString() ); @@ -84,4 +85,19 @@ public class DesktopArchievementTest assert (false); } } + + @Test + public void testDepartmentArchievement2() + { + try + { + DepartmentArchievement arch = DepartmentArchievement.getDepartmentArchievement( "QDI" ); + + System.out.println( arch.toString() ); + } + catch ( IOException error ) + { + assert (false); + } + } }