right1数据从统计表获取

etax-income-domain/src/main/java/com/sxc/etaxincome/domain/business/IMonitorManager.java

@@ -18,4 +18,6 @@ public interface IMonitorManager {
 
     List<AreaCodeStat> statAreaIncome(IncomeQueryCommon incomeQueryCommon);
 
+    List<AreaCodeStat> statAreaIncomeTop(IncomeQueryCommon incomeQueryCommon);
+
 }

etax-income-domain/src/main/java/com/sxc/etaxincome/domain/business/impl/MonitorManager.java

@@ -6,6 +6,7 @@ import com.sxc.etaxincome.domain.model.report.AreaCodeStat;
 import com.sxc.etaxincome.domain.support.ZoneProvider;
 import com.sxc.etaxincome.entity.FinCountReport;
 import com.sxc.etaxincome.service.IFinRealLogService;
+import com.sxc.etaxincome.service.IFinCountReportService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,8 @@ public class MonitorManager implements IMonitorManager {
 
     @Autowired
     private IFinRealLogService finRealLogService;
+    @Autowired
+    private IFinCountReportService finCountReportService;
 
     @Override
     public List<AreaCodeStat> statAreaIncome(IncomeQueryCommon incomeQueryCommon) {
@@ -43,4 +46,17 @@ public class MonitorManager implements IMonitorManager {
         return areaCodeStatList;
     }
 
+    @Override
+    public List<AreaCodeStat> statAreaIncomeTop(IncomeQueryCommon incomeQueryCommon) {
+        List<FinCountReport> countReportList = finCountReportService.statAreaIncomeTop(incomeQueryCommon);
+
+        List<AreaCodeStat> areaCodeStatList = Lists.newArrayList();
+        countReportList.stream().forEach(e -> {
+            areaCodeStatList.add(AreaCodeStat.builder().areaCode(e.getZoneCode())
+                    .name(ZoneProvider.getZoneNameByCode(e.getZoneCode()))
+                    .taxnoCount(Long.valueOf(e.getTaxnoNum())).requsetCount(Long.valueOf(e.getTotalNum())).build());
+        });
+        return areaCodeStatList;
+    }
+
 }

etax-income-domain/src/main/java/com/sxc/etaxincome/domain/command/analysis/AreaGroupCommand.java

@@ -25,6 +25,6 @@ public class AreaGroupCommand implements IAnalysisCommand {
                 .startDateTime(LocalDateTime.parse(DateProvider.getLongDateTimeHead(analysisCriteria.getStartDateTime()), DateTimeFormatter.ofPattern(DateUtils.YMDHMS_DASH)))
                 .endDateTime(LocalDateTime.parse(DateProvider.getLongDateTimeTail(analysisCriteria.getEndDateTime()), DateTimeFormatter.ofPattern(DateUtils.YMDHMS_DASH)))
                 .build();
-        return JSONUtil.toString(monitorManager.statAreaIncome(incomeQueryCommon));
+        return JSONUtil.toString(monitorManager.statAreaIncomeTop(incomeQueryCommon));
     }
 }

etax-income-mapper/src/main/java/com/sxc/etaxincome/mapper/FinCountReportMapper.java

@@ -21,4 +21,6 @@ public interface FinCountReportMapper extends BaseMapper<FinCountReport> {
 
     List<IncomeInvoiceStatResult> queryReportListByUser(IncomeQueryCommon incomeQueryCommon);
 
+    List<FinCountReport> statAreaIncomeTop(IncomeQueryCommon incomeQueryCommon);
+
 }

etax-income-mapper/src/main/resources/mapper/FinCountReportMapper.xml

@@ -42,5 +42,24 @@
             ]]>
         GROUP BY user_name
     </select>
-
+    <select id="statAreaIncomeTop" resultType="com.sxc.etaxincome.entity.FinCountReport" parameterType="com.sxc.etaxincome.criteria.IncomeQueryCommon">
+        SELECT
+        user_name,
+        zone_code,
+        sum( taxno_num ) AS taxno_num,
+        sum( face_num ) AS face_num,
+        sum( fail_num ) AS fail_num,
+        sum( success_num ) AS success_num,
+        sum( total_num ) AS total_num
+        FROM
+        fin_count_report
+        WHERE
+        user_name = #{userName}
+        AND count_type = 'hour'
+        <![CDATA[
+            AND count_date >= #{startDateTime}
+            AND count_date <= #{endDateTime}
+        ]]>
+        GROUP BY zone_code
+    </select>
 </mapper>

etax-income-server/src/main/webapp/jxIndex.html

@@ -445,15 +445,15 @@
                                     </select>
                                 </div>
                             </div>
-                            <label class="col-sm-2 control-label text-right">开始时间:</label>
-                            <div class="col-sm-3">
+                            <label class="col-sm-2 control-label text-right">开始:</label>
+                            <div class="col-sm-4">
                                 <input type="text" class="form-control" id="incomeSuccessBarStartDateTime"
                                        onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',startDate:'%y-%M-%d 00:00:00'})"
                                        placeholder="点击选择开始时间"/>
                             </div>
 
-                            <label class="col-sm-2 control-label text-right">结束时间:</label>
-                            <div class="col-sm-3">
+                            <label class="col-sm-2 control-label text-right">结束:</label>
+                            <div class="col-sm-4">
                                 <input type="text" class="form-control" id="incomeSuccessBarEndDateTime"
                                        onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',startDate:'%y-%M-%d 23:59:59'})"
                                        placeholder="点击选择结束时间"/>

etax-income-service/src/main/java/com/sxc/etaxincome/service/IFinCountReportService.java

@@ -21,4 +21,6 @@ public interface IFinCountReportService extends IService<FinCountReport> {
     List<IncomeInvoiceStatResult> queryReportListByDate(IncomeQueryCommon incomeQueryCommon);
     List<IncomeInvoiceStatResult> queryReportListByUser(IncomeQueryCommon incomeQueryCommon);
 
+    List<FinCountReport> statAreaIncomeTop(IncomeQueryCommon incomeQueryCommon);;
+
 }

etax-income-service/src/main/java/com/sxc/etaxincome/service/impl/FinCountReportServiceImpl.java

@@ -41,5 +41,8 @@ public class FinCountReportServiceImpl extends ServiceImpl<FinCountReportMapper,
     public List<IncomeInvoiceStatResult> queryReportListByUser(IncomeQueryCommon incomeQueryCommon) {
         return this.getBaseMapper().queryReportListByUser(incomeQueryCommon);
     }
-
+    @Override
+    public List<FinCountReport> statAreaIncomeTop(IncomeQueryCommon incomeQueryCommon) {
+        return this.getBaseMapper().statAreaIncomeTop(incomeQueryCommon);
+    }
 }