同步svn代码

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/controller/StoreScanController.java

@@ -181,7 +181,6 @@ public class StoreScanController {
         if (null == storeScanDTO.getScanAddress() ) {
             throw new RRException("门店扫码详细地址不能为空!");
         }
-
         // 扫码出库
         ExecuteResult<StoreScanOutDTO> result = this.storeScanRemote.storeScanOutTyres(storeScanDTO);
         return R.ok().put("data",result);

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/service/client/impl/ConfigBannerServiceClientImpl.java

@@ -160,16 +160,9 @@ public class ConfigBannerServiceClientImpl extends BaseServiceClient<ConfigBanne
         return bannerList;
     }
 
-    /**
-     * 查询品牌列表
-     * @return
-     */
-    @Override
-    public List<ConfigBannerDto> getBrandList() {
-        Map<String,Object> queryMap = new HashMap<>();
-        List<ConfigBannerDto> bannerDtoList = this.queryList(queryMap);
-        return bannerDtoList;
-    }
+
+
+
     public List<ConfigBannerDto> selectAgentBanner(List<Zkotg901Dto> list) {
         List<ConfigBanner> agentBannerList = new ArrayList<>();
         for (Zkotg901Dto zkotg901Dto : list) {

sailun-allsteel-common/src/main/java/io/platform/base/vo/StoreTaskStatisticsVO.java

@@ -0,0 +1,77 @@
+package io.platform.base.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * TODO
+ *
+ * 1.门店任务量统计VO显示
+ * @author shanxin
+ * @version 1.0
+ * @date 2020/11/18 11:05
+ */
+@Data
+public class StoreTaskStatisticsVO implements Serializable {
+
+    private static final long serialVersionUID = 5454155825314635342L;
+
+
+    /**
+     * 品牌
+     */
+    private String brand;
+
+    /**
+     * 季度
+     */
+    private String quarter;
+
+    /**
+     * 任务量
+     */
+    private Long taskNum;
+
+
+    /**
+     * 月度完成量
+     */
+    private Long monthCompleteNum;
+
+    /**
+     * 月度未完成量
+     */
+    private Long monthNotCompleteNum;
+
+
+    /**
+     * 月度完成占比
+     */
+    private String monthProportion;
+
+
+    /**
+     * 季度完成量
+     */
+    private Long quarterCompleteNum;
+
+
+    /**
+     * 季度未完成量
+     */
+    private Long quarterNotCompleteNum;
+
+
+    /**
+     * 月度完成占比
+     */
+    private String quarterProportion;
+
+
+
+
+
+
+
+}