yangjunfeng 1 year ago
parent
commit
2ddda75836

+ 5 - 0
hnls-admin/pom.xml

@@ -44,5 +44,10 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.3.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-oauth</artifactId>
+            <version>1.0.3</version>
+        </dependency>
     </dependencies>
 </project>

+ 1 - 1
hnls-gis/src/main/java/com/tofly/xrtygis/callCenterMapper/PltCalllist1000Mapper.java

@@ -107,7 +107,7 @@ public interface PltCalllist1000Mapper extends BaseMapper<PltCalllist1000> {
 
     Page<Map> missedCall(Page page,@Param("emp") String emp, @Param("tel") String tel);
 
-    Map<String, BigDecimal> getUserScoreInfo(@Param("start") Date start, @Param("end") Date end, @Param("userName") String userName);
+    Map<String, Double> getUserScoreInfo(@Param("start") Date start, @Param("end") Date end, @Param("userName") String userName);
 
     List<Map<String,Object>> viewNewHotLineCountByMonth(WisdomDisplayDto wisdomDisplayDto);
 

+ 1 - 1
hnls-gis/src/main/java/com/tofly/xrtygis/controller/callCenter/StatisController.java

@@ -52,7 +52,7 @@ public class StatisController {
 
     @GetMapping("/getUserScoreInfo")
     @ApiOperation(value = "获取对应用户满意度信息及排名")
-    public Map<String, BigDecimal> getUserScoreInfo(Date start,Date end,String userName) {
+    public Map<String, Double> getUserScoreInfo(Date start,Date end,String userName) {
         return pltCalllist1000Service.getUserScoreInfo(start,end, userName);
     }
 

+ 4 - 4
hnls-gis/src/main/java/com/tofly/xrtygis/entity/vo/IndividualRankingVo.java

@@ -16,12 +16,12 @@ public class IndividualRankingVo {
      * 好评率
      */
     @ApiModelProperty("好评率")
-    private BigDecimal favorableRate;
+    private Double favorableRate;
     /**
      * 个人排行
      */
     @ApiModelProperty("个人排行")
-    private BigDecimal individualRanking;
+    private Double individualRanking;
     /**
      * 呼入数
      */
@@ -36,10 +36,10 @@ public class IndividualRankingVo {
      * 派单数
      */
     @ApiModelProperty("派单数")
-    private BigDecimal sendSingular;
+    private Double sendSingular;
     /**
      * 回访数
      */
     @ApiModelProperty("回访数")
-    private BigDecimal numberVisit;
+    private Double numberVisit;
 }

+ 1 - 1
hnls-gis/src/main/java/com/tofly/xrtygis/service/callCenter/service/PltCalllist1000Service.java

@@ -77,7 +77,7 @@ public interface PltCalllist1000Service extends IService<PltCalllist1000> {
      * @return map
      */
     Map<String, Long> getCallCount(String userName);
-    Map<String, BigDecimal> getUserScoreInfo(Date start, Date end, String userName);
+    Map<String, Double> getUserScoreInfo(Date start, Date end, String userName);
 //    Object getSatisfaction(Satisfaction satisfaction);
 
     String listenRecordFile(String connectionId, HttpServletResponse response);

+ 1 - 1
hnls-gis/src/main/java/com/tofly/xrtygis/service/callCenter/service/impl/PltCalllist1000ServiceImpl.java

@@ -330,7 +330,7 @@ public class PltCalllist1000ServiceImpl extends ServiceImpl<PltCalllist1000Mappe
     }
 
     @Override
-    public Map<String, BigDecimal> getUserScoreInfo( Date start,Date end,String userName) {
+    public Map<String, Double> getUserScoreInfo( Date start,Date end,String userName) {
         return baseMapper.getUserScoreInfo(start,end,userName);
     }
 

+ 7 - 7
hnls-gis/src/main/java/com/tofly/xrtygis/service/impl/WarnServiceImpl.java

@@ -403,15 +403,15 @@ public class WarnServiceImpl extends ServiceImpl<WarnMapper, Warn> implements Wa
     public IndividualRankingVo getIndividualRanking(Date startTime, Date endTime, String userName, Long userId) {
         IndividualRankingVo rankingVo = new IndividualRankingVo();
         BigDecimal zero1 = BigDecimal.ZERO;
-        Map<String, BigDecimal> userScoreInfo = pltCalllist1000Mapper.getUserScoreInfo(startTime, endTime, userName);
+        Map<String, Double> userScoreInfo = pltCalllist1000Mapper.getUserScoreInfo(startTime, endTime, userName);
         if (null!= userScoreInfo && userScoreInfo.size() != 0) {
-            BigDecimal favorableRate = userScoreInfo.get("favorablerate")==null?BigDecimal.ZERO:userScoreInfo.get("favorablerate");
-            BigDecimal rownum = userScoreInfo.get("rownum") == null ? BigDecimal.ZERO : userScoreInfo.get("rownum");
+            Double favorableRate = userScoreInfo.get("favorablerate")==null ? 0.0:userScoreInfo.get("favorablerate");
+            Double rownum = userScoreInfo.get("rownum") == null ? 0.0:userScoreInfo.get("rownum");
             rankingVo.setFavorableRate(favorableRate);
             rankingVo.setIndividualRanking(rownum);
         }else {
-            rankingVo.setFavorableRate(zero1);
-            rankingVo.setIndividualRanking(zero1);
+            rankingVo.setFavorableRate(0.0);
+            rankingVo.setIndividualRanking(0.0);
         }
 
         Map<String, Long> callCount = pltCalllist1000Mapper.getCallCount(startTime,endTime,userName);
@@ -427,8 +427,8 @@ public class WarnServiceImpl extends ServiceImpl<WarnMapper, Warn> implements Wa
             rankingVo.setSendSingular(individualRankingThree.getSendSingular());
             rankingVo.setNumberVisit(individualRankingThree.getNumberVisit());
         } else {
-            rankingVo.setSendSingular(zero1);
-            rankingVo.setNumberVisit(zero1);
+            rankingVo.setSendSingular(0.0);
+            rankingVo.setNumberVisit(0.0);
         }
 
         return rankingVo;

+ 1 - 1
pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tofly</groupId>
         <artifactId>tofly-webParent</artifactId>
-        <version>1.0.3</version>
+        <version>1.0.0</version>
     </parent>
     <modules>
         <module>hnls-admin</module>