新增使用次数统计报表接口，修改盘库申请单bug，修改其他bug

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/FinalTjCountDto.java

+package com.junmp.jyzb.api.bean.dto.TjDto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+public class FinalTjCountDto implements Serializable {
+
+    /**
+     * 使用次数
+     */
+    private Integer useCount;
+
+    /**
+     * 维修次数
+     */
+    private Integer fixCount;
+
+    /**
+     * 装备总数
+     */
+    private Integer number;
+}
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/TjCountDto.java

+package com.junmp.jyzb.api.bean.dto.TjDto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+public class TjCountDto implements Serializable {
+
+
+    /**
+     * 组织机构id
+     */
+    private Long orgId;
+
+    /**
+     * 组织机构编码
+     */
+    private String orgCode;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 父id
+     */
+    private Integer parentId;
+
+    /**
+     * 组织机构简称
+     */
+    private String dName;
+
+    /**
+     * 使用次数
+     */
+    private Integer useCount;
+
+    /**
+     * 维修次数
+     */
+    private Integer fixCount;
+
+    /**
+     * 号型id
+     */
+    private String sizeId;
+
+    /**
+     * 号型名称
+     */
+    private String sizeName;
+
+    /**
+     * 类型id
+     */
+    private String typeId;
+
+    /**
+     * 类型名称
+     */
+    private String typeName;
+
+    /**
+     * 装备总数
+     */
+    private Integer number;
+
+}
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjCountReq.java

+package com.junmp.jyzb.api.bean.query.TjReq;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+@Data
+public class TjCountReq extends BaseRequest {
+    //组织机构
+    private Long orgId;
+    private List<String> typeIdsList;
+    private List<String> sizeNameList;
+    private Integer year;
+}
\ No newline at end of file

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

@@ -43,7 +43,7 @@ public class UpdateInventoryReq   {
 
     private String rules;
 
-    private String ExamineState;
+    private String examineState;
 
 }
 

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

 package com.junmp.jyzb.controller;
 
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
-import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgEqsDto;
-import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgPriceDto;
-import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto;
-import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto;
+import com.junmp.jyzb.api.bean.dto.TjDto.*;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
+import com.junmp.jyzb.api.bean.query.TjReq.TjCountReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
 import com.junmp.jyzb.service.TjService;
@@ -91,7 +89,29 @@ public class TjController {
     /**
      * --------------------------------------使用统计报表-------------------------------------------
      */
+//财务统计报表
+    @PostMapping("/TjOrgCount")
+    @ApiOperation("/财务统计报表")
+    public ApiRes<PageResult<TjCountDto>> TjOrgCount(@RequestBody TjCountReq req){
+        return ApiRes.success(tjService.TjOrgCount(req));
+    }
+    @PostMapping("/TjOrgCountSum")
+    @ApiOperation("/财务统计报表汇总")
+    public ApiRes<FinalTjCountDto> TjOrgCountSum(@RequestBody TjCountReq req){
+        return ApiRes.success(tjService.TjOrgCountSum(req));
+    }
 
+    //财务统计报表（点击+后里面的数据）
+    @PostMapping("/TjOrgCountDetailPage")
+    @ApiOperation("/查询组织机构下的财务统计明细")
+    public ApiRes<PageResult<TjCountDto>> TjOrgPriceDetailPage(@RequestBody TjCountReq req){
+        return ApiRes.success(tjService.TjOrgCountDetailPage(req));
+    }
+    @PostMapping("/TjOrgCountDetailList")
+    @ApiOperation("/查询组织机构下的财务统计明细")
+    public ApiRes<List<TjCountDto>> TjOrgCountDetailList(@RequestBody TjCountReq req){
+        return ApiRes.success(tjService.TjOrgCountDetailList(req));
+    }
 
     /**
      * --------------------------------------人员统计报表-------------------------------------------

jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentCountSummary.java

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * @TableName vie_equipment_count_summary
+ */
+@TableName(value ="vie_equipment_count_summary")
+@Data
+public class EquipmentCountSummary implements Serializable {
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 
+     */
+    @TableField(value = "valuekey")
+    private String valuekey;
+
+    /**
+     * 组织机构id
+     */
+    @TableField(value = "org_id_int")
+    private Long orgId;
+
+    /**
+     * 组织机构编码
+     */
+    @TableField(value = "org_code")
+    private String orgCode;
+
+    /**
+     * 组织机构名称
+     */
+    @TableField(value = "org_name")
+    private String orgName;
+
+    /**
+     * 父id
+     */
+    @TableField(value = "parent_id")
+    private Integer parentId;
+
+    /**
+     * 组织机构简称
+     */
+    @TableField(value = "org_name_short")
+    private String orgNameShort;
+
+    /**
+     * 统计类型（年year，月month）
+     */
+    @TableField(value = "sum_type")
+    private String sumType;
+
+    /**
+     * 年
+     */
+    @TableField(value = "year")
+    private Integer year;
+
+    /**
+     * 月
+     */
+    @TableField(value = "month")
+    private Integer month;
+
+    /**
+     * 使用次数
+     */
+    @TableField(value = "use_count")
+    private Integer useCount;
+
+    /**
+     * 维修次数
+     */
+    @TableField(value = "fix_count")
+    private Integer fixCount;
+
+    /**
+     * 号型id
+     */
+    @TableField(value = "size_id")
+    private String sizeId;
+
+    /**
+     * 号型名称
+     */
+    @TableField(value = "size_name")
+    private String sizeName;
+
+    /**
+     * 类型id
+     */
+    @TableField(value = "type_id")
+    private String typeId;
+
+    /**
+     * 类型名称
+     */
+    @TableField(value = "type_name")
+    private String typeName;
+
+    /**
+     * 装备总数
+     */
+    @TableField(value = "number")
+    private Integer number;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/entity/InventorySummary.java

@@ -170,6 +170,12 @@ public class InventorySummary implements Serializable {
     @TableField("near_broken_number")
     private Integer nearBrokenNumber;
 
+    @TableField("use_count")
+    private Integer useCount;
+
+    @TableField("fix_count")
+    private Integer fixCount;
+
     /**
      * 使用中数量（领用和借用）
      */

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentCountSummaryMapper.java

+package com.junmp.jyzb.mapper;
+
+import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjCountDto;
+import com.junmp.jyzb.api.bean.dto.TjDto.TjCountDto;
+import com.junmp.jyzb.entity.EquipmentCountSummary;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【vie_equipment_count_summary】的数据库操作Mapper
+* @createDate 2023-12-14 14:41:35
+* @Entity com.junmp.jyzb.entity.EquipmentCountSummary
+*/
+public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSummary> {
+
+    void addInfo();
+
+    List<TjCountDto> TjOrgCount(@Param("orgId") Long orgId,
+                                @Param("typeIdsList") List<String> typeIdsList,
+                                @Param("sizeNameList") List<String> sizeNameList,
+                                @Param("year")Integer year);
+
+    FinalTjCountDto TjOrgCountSum(@Param("orgId") Long orgId,
+                                  @Param("typeIdsList") List<String> typeIdsList,
+                                  @Param("sizeNameList") List<String> sizeNameList,
+                                  @Param("year")Integer year);
+
+    int TjOrgCountDetailSum(@Param("orgId")Long orgId,
+                            @Param("year") Integer year,
+                            @Param("typeIdsList") List<String> typeIdsList,
+                            @Param("sizeNameList") List<String> sizeNameList);
+
+    List<TjCountDto> TjOrgCountDetail(@Param("orgId")Long orgId,
+                                      @Param("year") Integer year,
+                                      @Param("typeIdsList") List<String> typeIdsList,
+                                      @Param("sizeNameList") List<String> sizeNameList,
+                                      @Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize);
+}
+
+
+
+

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java

@@ -57,7 +57,9 @@ public interface InventorySummaryMapper  extends BaseMapper<InventorySummary> {
     //获取合计
     FinalTjOrgEqsDto getSumByViewOrgeqsSum();
 
-    int TjOrgEqsDetailSum(@Param("orgId") Long orgId, @Param("typeIdsList") List<String> typeIdsList, @Param("sizeNameList") List<String> sizeNameList);
+    int TjOrgEqsDetailSum(@Param("orgId") Long orgId,
+                          @Param("typeIdsList") List<String> typeIdsList,
+                          @Param("sizeNameList") List<String> sizeNameList);
     List<InventorySumDto> TjOrgEqsDetail(@Param("orgId") Long orgId, @Param("typeIdsList") List<String> typeIdsList,
                                          @Param("sizeNameList") List<String> sizeNameList,
                                          @Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize);

jyzb-biz/src/main/java/com/junmp/jyzb/service/InventorySummaryService.java

@@ -48,4 +48,9 @@ public interface InventorySummaryService extends IService<InventorySummary> {
     boolean insertToSummary();
 
     List<InventorySumDto> selectTotalNum(SelectTotalNumReq req);
+
+    /**
+     * 更新使用次数和维修次数
+     */
+    void updateCount();
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/TjService.java

 package com.junmp.jyzb.service;
 
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
-import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgEqsDto;
-import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgPriceDto;
-import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto;
-import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto;
+import com.junmp.jyzb.api.bean.dto.TjDto.*;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
+import com.junmp.jyzb.api.bean.query.TjReq.TjCountReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
 import com.junmp.v2.db.api.page.PageResult;
@@ -34,4 +32,12 @@ public interface TjService {
     FinalTjOrgEqsDto TjOrgEqsSum(TjOrgEqsReq req);
 
     FinalTjOrgPriceDto TjOrgPriceSum(TjOrgPriceReq req);
+
+    PageResult<TjCountDto> TjOrgCount(TjCountReq req);
+
+    FinalTjCountDto TjOrgCountSum(TjCountReq req);
+
+    PageResult<TjCountDto> TjOrgCountDetailPage(TjCountReq req);
+
+    List<TjCountDto> TjOrgCountDetailList(TjCountReq req);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java

@@ -109,10 +109,13 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
 
                 String assigns= FlowInstanceService.GetNextAssign(ProcessInstanceId);//这里需要手动更新审核人信息
                 BI.setCurrentAssign(assigns);
-                updateById(BI);
+//                updateById(BI);
 
             }
-            this.save(BI);
+
+            updateById(BI);
+
+
             return BI.getId();
         }
         else
@@ -157,8 +160,10 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
                 BI.setCurrentAssign(assigns);
                 updateById(BI);
 
+            }else {
+
+                this.save(BI);
             }
-            this.save(BI);
             return BI.getId();}
 
     }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java

@@ -2,6 +2,7 @@ package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
@@ -14,6 +15,7 @@ import com.junmp.jyzb.api.bean.req.CabinetInOutRecordsReq;
 import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
 import com.junmp.jyzb.entity.*;
+import com.junmp.jyzb.mapper.EquipmentCountSummaryMapper;
 import com.junmp.jyzb.mapper.PriceSumSummaryMapper;
 import com.junmp.jyzb.service.*;
 import com.junmp.v2.common.exception.base.ServiceException;
@@ -72,6 +74,9 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
     @Resource
     private PriceSumSummaryMapper PriceSumSummaryMapper;
 
+    @Resource
+    private EquipmentCountSummaryMapper equipmentCountSummaryMapper;
+
     @Override
     public void MonthStartSum() {
         PriceSumSummaryMapper.MonthStart();
@@ -335,6 +340,17 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         return inventorySumDtoList;
     }
 
+    /**
+     * 更新使用次数和维修次数
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateCount() {
+        LambdaUpdateWrapper<InventorySummary> eq = new LambdaUpdateWrapper<InventorySummary>().set(InventorySummary::getUseCount,0).set(InventorySummary::getFixCount,0);
+        update(eq);
+        equipmentCountSummaryMapper.addInfo();
+    }
+
 
     private LambdaQueryWrapper<InventorySummary> createWrapper(InventorySumReq req) {
         LambdaQueryWrapper<InventorySummary> wrapper = new LambdaQueryWrapper<>();

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java

@@ -5,11 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.junmp.jyzb.api.bean.dto.EqsSumDto;
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
 import com.junmp.jyzb.api.bean.dto.OrgDto;
-import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgEqsDto;
-import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgPriceDto;
-import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto;
-import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto;
+import com.junmp.jyzb.api.bean.dto.TjDto.*;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
+import com.junmp.jyzb.api.bean.query.TjReq.TjCountReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
 import com.junmp.jyzb.entity.PubOrg;
@@ -46,6 +44,9 @@ public class TjServiceImpl implements TjService {
     @Resource
     private PriceSumSummaryMapper priceSumSummaryMapper;
 
+    @Resource
+    private EquipmentCountSummaryMapper equipmentCountSummaryMapper;
+
 
     //装备统计报表
     @Override
@@ -268,6 +269,8 @@ public class TjServiceImpl implements TjService {
         }
 
     }
+
+
     //查看财务统计详情
     @Override
     public PageResult<TjOrgPriceDto> TjOrgPriceDetailPage(TjOrgPriceReq req) {
@@ -292,8 +295,6 @@ public class TjServiceImpl implements TjService {
     }
 
 
-
-
     public <T> Comparator<T> createOrgComparator() {
         return (org1,org2) ->{
 
@@ -348,4 +349,57 @@ public class TjServiceImpl implements TjService {
             }
         };
     }
+
+    @Override
+    public PageResult<TjCountDto> TjOrgCount(TjCountReq req) {
+        List<TjCountDto> tjCountDtoList=equipmentCountSummaryMapper.TjOrgCount(req.getOrgId(),
+                req.getTypeIdsList(),req.getSizeNameList(),req.getYear());
+        //对组织机构进行排序
+        Comparator<TjCountDto> orgComparator = createOrgComparator();
+        Collections.sort(tjCountDtoList, orgComparator);
+        Page<TjCountDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
+            req.setPageNo(1L);
+            req.setPageSize(10L);
+        }
+        long startIndex = (req.getPageNo() - 1) * req.getPageSize();
+        long endIndex = Math.min(startIndex + req.getPageSize(), tjCountDtoList.size());
+        List<TjCountDto> subList = tjCountDtoList.subList((int) startIndex, (int)endIndex);
+        page.setTotal(tjCountDtoList.size());
+        page.setRecords(subList);
+        return PageResultFactory.createPageResult(page);
+    }
+
+    @Override
+    public FinalTjCountDto TjOrgCountSum(TjCountReq req) {
+        FinalTjCountDto finalTjCountDto=equipmentCountSummaryMapper.TjOrgCountSum(req.getOrgId(),req.getSizeNameList(),
+                req.getTypeIdsList(), req.getYear());
+        if (ObjectUtil.isNotNull(finalTjCountDto)) {
+            return finalTjCountDto;
+        }else {
+            return new FinalTjCountDto();
+        }
+    }
+
+    @Override
+    public PageResult<TjCountDto> TjOrgCountDetailPage(TjCountReq req) {
+        int size = equipmentCountSummaryMapper.TjOrgCountDetailSum(req.getOrgId(),req.getYear(),req.getTypeIdsList(),req.getSizeNameList());
+        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
+            req.setPageNo(1L);
+            req.setPageSize(10L);
+        }
+        Page<TjCountDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+        List<TjCountDto> returnList=equipmentCountSummaryMapper.TjOrgCountDetail(req.getOrgId(),req.getYear(),
+                req.getTypeIdsList(),req.getSizeNameList(),(req.getPageNo()-1)* req.getPageSize(),req.getPageSize());
+        page.setTotal(size);
+        page.setRecords(returnList);
+        return PageResultFactory.createPageResult(page);
+    }
+
+    @Override
+    public List<TjCountDto> TjOrgCountDetailList(TjCountReq req) {
+        List<TjCountDto> returnList=equipmentCountSummaryMapper.TjOrgCountDetail(req.getOrgId(),req.getYear(),
+                req.getTypeIdsList(),req.getSizeNameList(),null,null);
+        return returnList;
+    }
  }

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

 package com.junmp.jyzb.task;
 
+import com.junmp.jyzb.mapper.EquipmentCountSummaryMapper;
+import com.junmp.jyzb.service.InventorySummaryService;
 import com.junmp.v2.job.api.JobAction;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+
 @Slf4j
 @Component
 public class EquipmentCountAction implements JobAction {
-
+    private InventorySummaryService inventorySummaryService;
     @Override
     public void action() {
-
+        inventorySummaryService.updateCount();
     }
 }