Merge remote-tracking branch 'origin/dev' into dev

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/vo/FileInfoEncryptVO.java

@@ -0,0 +1,20 @@
+package com.sckw.core.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author lfdc
+ * @description 文件上传返回vo
+ * @date 2023-07-04 09:07:08
+ */
+@Data
+public class FileInfoEncryptVO implements Serializable {
+
+    /**
+     * 文件加密key
+     */
+    private String fileMd5;
+
+}

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/dubbo/TransportStatisticsService.java

@@ -10,13 +10,21 @@ package com.sckw.transport.api.dubbo;
  */
 public interface TransportStatisticsService {
     /**
-     * 统计承运接单
+     * 统计承运订单
      *
      * @param topEntId
      * @return
      */
     Integer statisticsLogistics(Long topEntId);
 
+    /**
+     * 统计托运订单
+     *
+     * @param topEntId
+     * @return
+     */
+    Integer statisticsLogisticsByConsign(Long topEntId);
+
     /**
      * 统计调度派车
      *

sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java

@@ -158,7 +158,7 @@ public class FileApiController {
      * @param file
      * @return
      */
-    @RequestMapping(value = "/uploadFileEncrypt", method = RequestMethod.POST)
+    @RequestMapping(value = "/uploadFileEncrypt", method = RequestMethod.POST,produces = "application/json")
     public HttpResult uploadFileEncrypt(@NotNull @RequestParam("file") MultipartFile file) {
         try {
             return fileService.uploadFileEncrypt(file);

sckw-modules/sckw-file/src/main/java/com/sckw/file/model/param/FileImageParam.java

@@ -35,7 +35,7 @@ public class FileImageParam {
     private boolean isLessen;
 
     /**
-     * 是否缩放展示
+     * 缩放比例
      */
     private String lessenRatio;
 }

sckw-modules/sckw-file/src/main/java/com/sckw/file/service/FileService.java

@@ -8,6 +8,7 @@ import com.sckw.core.common.enums.StringConstant;
 import com.sckw.core.common.enums.enums.FileDisposeLayoutEnum;
 import com.sckw.core.common.enums.enums.FileEnum;
 import com.sckw.core.model.file.FileInfo;
+import com.sckw.core.model.vo.FileInfoEncryptVO;
 import com.sckw.core.model.vo.FileInfoVO;
 import com.sckw.core.utils.FileUtils;
 import com.sckw.core.utils.IdWorker;
@@ -353,10 +354,10 @@ public class FileService {
         insertFile(returnFileInfo, isImage);
         /**存储到加密属性文件信息*/
         String fileMd5 = returnFileInfo.getFileMd5();
-        String filePath = returnFileInfo.getFilePath();
-        FileInfoVO vo = new FileInfoVO();
+//        String filePath = returnFileInfo.getFilePath();
+        FileInfoEncryptVO vo = new FileInfoEncryptVO();
         vo.setFileMd5(fileMd5);
-        vo.setFilePath(filePath);
+//        vo.setFilePath(filePath);
 //        insertFileEncrypt(fileMd5, filePath, FileEnum.FILE_STORE_TYPE_OSS, isImage);
         return HttpResult.ok(vo);
     }
@@ -407,11 +408,11 @@ public class FileService {
         insertFile(returnFileInfo, isImage);
         /**存储到加密属性文件信息*/
         String fileMd5 = returnFileInfo.getFileMd5();
-        String filePath = returnFileInfo.getFilePath();
+//        String filePath = returnFileInfo.getFilePath();
 //        insertFileEncrypt(fileMd5, filePath, FileEnum.FILE_STORE_TYPE_OSS, isImage);
-        FileInfoVO vo = new FileInfoVO();
+        FileInfoEncryptVO vo = new FileInfoEncryptVO();
         vo.setFileMd5(fileMd5);
-        vo.setFilePath(filePath);
+//        vo.setFilePath(filePath);
         return HttpResult.ok(Status.SUCCESS.getCode(), "", vo);
     }
 
@@ -452,6 +453,6 @@ public class FileService {
                         + FileDisposeLayoutEnum.OSS_ABBREVIATE_RIGHT.getParameter() + fileWidth;
             }
         }
-        return HttpResult.ok(returnImageAddress);
+        return HttpResult.ok("",returnImageAddress);
     }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -357,7 +357,7 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
 
     List<Long> statisticsLogistics(@Param("topEntId") Long topEntId);
 
-    Integer statisticsLogisticsByTopEntIdAndOrderStatus(@Param("topEntId") Long topEntId, @Param("orderList") List<Integer> orderList);
+    Integer statisticsLogisticsByTopEntIdAndOrderStatus(@Param("topEntId") Long topEntId, @Param("orderList") List<Integer> orderList,@Param("unitType") String unitType);
 
     /**
      * @param statusList 单据状态集合

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportStatisticsServiceImpl.java

@@ -99,7 +99,26 @@ public class TransportStatisticsServiceImpl implements TransportStatisticsServic
         orderList.add(LogisticsOrderEnum.HAVE_FINISHED.getCode());
         orderList.add(LogisticsOrderEnum.HAVE_RECONCILED.getCode());
         orderList.add(LogisticsOrderEnum.HAVE_ALREADY_SETTLED.getCode());
-        Integer count = logisticsOrderMapper.statisticsLogisticsByTopEntIdAndOrderStatus(topEntId, orderList);
+        Integer count = logisticsOrderMapper.statisticsLogisticsByTopEntIdAndOrderStatus(topEntId, orderList,"2");
+        return count;
+    }
+
+    /**
+     * 统计托运订单数量
+     *
+     * @param topEntId 集团企业id
+     * @return
+     */
+    @Override
+    public Integer statisticsLogisticsByConsign(Long topEntId) {
+        //统计维度
+        List<Integer> orderList = new ArrayList<>();
+        orderList.add(LogisticsOrderEnum.WAIT_DELIVERY.getCode());
+        orderList.add(LogisticsOrderEnum.IN_TRANSIT.getCode());
+        orderList.add(LogisticsOrderEnum.HAVE_FINISHED.getCode());
+        orderList.add(LogisticsOrderEnum.HAVE_RECONCILED.getCode());
+        orderList.add(LogisticsOrderEnum.HAVE_ALREADY_SETTLED.getCode());
+        Integer count = logisticsOrderMapper.statisticsLogisticsByTopEntIdAndOrderStatus(topEntId, orderList,"1");
         return count;
     }
 }

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -1897,6 +1897,7 @@
         <if test="topEntId != null and topEntId != ''">
             AND ( b.ent_id = #{topEntId} OR b.top_ent_id = #{topEntId} )
         </if>
+        AND b.unit_type=#{unitType}
         And a.status in
         <foreach collection="orderList" open="(" close=")" separator="," item="item">
             #{item}