添加报表

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateReassignmentReq.java

@@ -110,7 +110,7 @@ public class UpdateReassignmentReq extends BaseRequest {
     private BigDecimal price;
 
     /**
-     * 类型（调入警员0，调出警员1）
+     * 类型（调入警员assign，调出警员reassign）
      */
     private String reassignmentType;
 

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/PolicemanExceptionEnum.java

@@ -36,7 +36,7 @@ public enum PolicemanExceptionEnum implements IExceptionEnum {
     /**
      * 该警员已经在审核流中，请勿重复操作
      */
-    POLICE_IS_IN_EXAMINE(CommonConstant.DEFAULT_USER_ERROR_CODE,"该警员已经在审核流中或已经调走，请勿重复操作")
+    POLICE_IS_IN_EXAMINE(CommonConstant.DEFAULT_USER_ERROR_CODE,"该警员已经在审核流中或已经调岗完成，请勿重复操作")
     ;
     /**
      * 错误编码

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java

@@ -4,13 +4,20 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.AES;
 import com.junmp.jyzb.api.bean.query.DbAccessReq;
+import com.junmp.jyzb.api.bean.query.PolicemanReq;
 import com.junmp.jyzb.api.bean.vo.AuthAccessVo;
+import com.junmp.jyzb.utils.FileUtil;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.apache.commons.compress.utils.IOUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URL;
 
 /**
  * <pre>
@@ -49,4 +56,13 @@ public class PublicController {
         }
 
     }
+
+//    @PostMapping("/downloadPhoto")
+//    @ApiOperation("/下载图片并返回图片内容信息")
+//    public ApiRes<byte[]> downloadPhoto (@RequestBody PolicemanReq req)throws Exception{
+//        byte[] bytes = FileUtil.fileToByte(req.getPhoto());
+//
+//        return ApiRes.success(bytes);
+//    }
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/controller/TjController.java

@@ -32,6 +32,10 @@ public class TjController {
    private TjService tjService;
 
     /**
+     * ------------------------------------装备统计报表--------------------------------------------
+     */
+
+    /**
      * 根据组织机构统计装备的报表数据（外层数据）
      */
     @PostMapping("/TjOrgEqs")
@@ -56,6 +60,10 @@ public class TjController {
         return ApiRes.success(tjService.TjOrgEqsDetailList(req));
     }
 
+    /**
+     *-------------------------------------财务统计报表------------------------------------------
+     */
+
     //财务统计报表
     @PostMapping("/TjOrgPrice")
     @ApiOperation("/财务统计报表")
@@ -79,6 +87,22 @@ public class TjController {
     public ApiRes<List<TjOrgPriceDto>> TjOrgPriceDetailList(@RequestBody TjOrgPriceReq req){
         return ApiRes.success(tjService.TjOrgPriceDetailList(req));
     }
+
+    /**
+     * --------------------------------------使用统计报表-------------------------------------------
+     */
+
+
+    /**
+     * --------------------------------------人员统计报表-------------------------------------------
+     */
+
+    /**
+     * --------------------------------------温湿度记录-------------------------------------------
+     */
+
+
+
     @PostMapping("/test")
     public ApiRes<FinalTjOrgEqsDto> test(@RequestBody TjOrgEqsReq req){
         return ApiRes.success(tjService.test(req));

jyzb-biz/src/main/java/com/junmp/jyzb/task/EquipmentCountAction.java

+package com.junmp.jyzb.task;
+
+import com.junmp.v2.job.api.JobAction;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class EquipmentCountAction implements JobAction {
+
+    @Override
+    public void action() {
+
+    }
+}

jyzb-biz/src/main/java/com/junmp/jyzb/utils/FileUtil.java

+package com.junmp.jyzb.utils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+
+public class FileUtil {
+
+    private static final int CACHE_SIZE = 1024;
+
+    /**
+     * 文件转换为二进制数组
+     * @param filePath
+     * @return
+     * @throws Exception
+     */
+    public static byte[] fileToByte(String filePath) throws Exception {
+        byte[] data = new byte[0];
+        File file = new File(filePath);
+        System.out.println("file.canRead() = " + file.canRead());
+        if (file.exists()) {
+            FileInputStream in = new FileInputStream(file);
+            ByteArrayOutputStream out = new ByteArrayOutputStream(2048);
+            byte[] cache = new byte[CACHE_SIZE];
+            int nRead = 0;
+            while ((nRead = in.read(cache)) != -1) {
+                out.write(cache, 0, nRead);
+                out.flush();
+            }
+            out.close();
+            in.close();
+            data = out.toByteArray();
+        }
+        return data;
+    }
+}

jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml

@@ -466,8 +466,8 @@
     <select id="selectTotalNum" resultType="com.junmp.jyzb.api.bean.dto.InventorySumDto">
         <foreach collection="list" item="item" separator="union all">
         SELECT COALESCE(SUM(stock_number), 0) as stock_number,
-               COALESCE(size_id,${item[0]}) as size_id ,
-               COALESCE( type_id,'${item[1]}') as type_id
+               COALESCE(type_id,${item[0]}) as type_id ,
+               COALESCE( size_id,'${item[1]}') as size_id
         FROM base_inventory_summary
         WHERE org_id_int = #{orgId} and (type_id = ${item[0]} AND size_id = '${item[1]}')
         </foreach>