修改报表接口

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

@@ -20,7 +20,7 @@ public class FinalTjOrgEqsDto {
 //    合计销毁数
     private Integer destructionNumber;
 //    每个组织机构的装备数
-    private List<TjOrgEqsDto> tjOrgEqsDto;
-
-    private PageResult<TjOrgEqsDto> tjOrgEqsDtoPage;
+//    private List<TjOrgEqsDto> tjOrgEqsDto;
+//
+//    private PageResult<TjOrgEqsDto> tjOrgEqsDtoPage;
 }

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

 package com.junmp.jyzb.api.bean.dto.TjDto;
 
+import com.junmp.v2.db.api.page.PageResult;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -15,10 +16,14 @@ public class FinalTjOrgPriceDto {
     private Integer endNum;
     //   合计年末金额
     private BigDecimal endPrice;
+    private BigDecimal addPrice;
+    private BigDecimal destoryPrice;
     //   合计本年度新增数量
     private Integer addNum;
     //   合计本年度销毁数量
     private Integer destoryNum;
     //   组织机构装备新增情况list
-    private List<TjOrgPriceDto> tjOrgPriceDto;
+//    private List<TjOrgPriceDto> tjOrgPriceDto;
+//
+//    private PageResult<TjOrgPriceDto> tjOrgPriceDtoPage;
 }

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

@@ -18,6 +18,10 @@ public class TjOrgEqsDto {
      * 组织机构编码
      */
     private String orgCode;
+    /**
+     * 组织机构简称
+     */
+    private String dName;
 
     /**
      * 上层组织机构id

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

@@ -19,6 +19,8 @@ public class TjOrgPriceDto {
      */
     private String orgCode;
 
+    private String dName;
+
     /**
      * 上层组织机构id
      */
@@ -34,8 +36,10 @@ public class TjOrgPriceDto {
     private BigDecimal endPrice;
     //   本年度新增数量
     private Integer addNum;
+    private BigDecimal addPrice;
     //   本年度销毁数量
     private Integer destoryNum;
+    private BigDecimal destoryPrice;
 
     private String sizeId;
     private String sizeName;

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

 package com.junmp.jyzb.api.bean.query.TjReq;
 
+import com.junmp.v2.common.bean.request.BaseRequest;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class TjOrgPriceReq {
+public class TjOrgPriceReq extends BaseRequest {
     //组织机构
     private Long orgId;
     //类型idList

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

@@ -36,28 +36,48 @@ public class TjController {
      */
     @PostMapping("/TjOrgEqs")
     @ApiOperation("/装备统计报表")
-    public ApiRes<FinalTjOrgEqsDto> TjOrgEqs(@RequestBody TjOrgEqsReq req){
+    public ApiRes<PageResult<TjOrgEqsDto>> TjOrgEqs(@RequestBody TjOrgEqsReq req){
         return ApiRes.success(tjService.TjOrgEqs(req));
     }
+    @PostMapping("/TjOrgEqsSum")
+    @ApiOperation("/装备统计报表汇总")
+    public ApiRes<FinalTjOrgEqsDto> TjOrgEqsSum(@RequestBody TjOrgEqsReq req){
+        return ApiRes.success(tjService.TjOrgEqsSum(req));
+    }
     //装备统计报表（点击+后里面的数据）
-    @PostMapping("/TjOrgEqsDetail")
-    @ApiOperation("/根据添加查询组织机构下的装备统计")
-    public ApiRes<PageResult<InventorySumDto>> TjOrgEqsDetail(@RequestBody TjOrgEqsReq req){
-        return ApiRes.success(tjService.TjOrgEqsDetail(req));
+    @PostMapping("/TjOrgEqsDetailPage")
+    @ApiOperation("/查询组织机构下的装备统计明细分页")
+    public ApiRes<PageResult<InventorySumDto>> TjOrgEqsDetailPage(@RequestBody TjOrgEqsReq req){
+        return ApiRes.success(tjService.TjOrgEqsDetailPage(req));
+    }
+    @PostMapping("/TjOrgEqsDetailList")
+    @ApiOperation("/查询组织机构下的装备统计明细列表")
+    public ApiRes<List<InventorySumDto>> TjOrgEqsDetailList(@RequestBody TjOrgEqsReq req){
+        return ApiRes.success(tjService.TjOrgEqsDetailList(req));
     }
 
     //财务统计报表
     @PostMapping("/TjOrgPrice")
     @ApiOperation("/财务统计报表")
-    public ApiRes<FinalTjOrgPriceDto> TjOrgPrice(@RequestBody TjOrgPriceReq req){
+    public ApiRes<PageResult<TjOrgPriceDto>> TjOrgPrice(@RequestBody TjOrgPriceReq req){
         return ApiRes.success(tjService.TjOrgPrice(req));
     }
+    @PostMapping("/TjOrgPriceSum")
+    @ApiOperation("/财务统计报表汇总")
+    public ApiRes<FinalTjOrgPriceDto> TjOrgPriceSum(@RequestBody TjOrgPriceReq req){
+        return ApiRes.success(tjService.TjOrgPriceSum(req));
+    }
 
     //财务统计报表（点击+后里面的数据）
-    @PostMapping("/TjOrgPriceDetail")
-    @ApiOperation("/根据添加查询组织机构下的财务统计")
-    public ApiRes<List<TjOrgPriceDto>> TjOrgPriceDetail(@RequestBody TjOrgPriceReq req){
-        return ApiRes.success(tjService.TjOrgPriceDetail(req));
+    @PostMapping("/TjOrgPriceDetailPage")
+    @ApiOperation("/查询组织机构下的财务统计明细")
+    public ApiRes<PageResult<TjOrgPriceDto>> TjOrgPriceDetailPage(@RequestBody TjOrgPriceReq req){
+        return ApiRes.success(tjService.TjOrgPriceDetailPage(req));
+    }
+    @PostMapping("/TjOrgPriceDetailList")
+    @ApiOperation("/查询组织机构下的财务统计明细")
+    public ApiRes<List<TjOrgPriceDto>> TjOrgPriceDetailList(@RequestBody TjOrgPriceReq req){
+        return ApiRes.success(tjService.TjOrgPriceDetailList(req));
     }
     @PostMapping("/test")
     public ApiRes<FinalTjOrgEqsDto> test(@RequestBody TjOrgEqsReq req){

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

 package com.junmp.jyzb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgPriceDto;
 import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto;
 import com.junmp.jyzb.entity.PriceSumSummary;
 import org.apache.ibatis.annotations.Mapper;
@@ -35,5 +36,15 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> {
     List<TjOrgPriceDto> TjOrgPriceDetail(@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);
+
+    int TjOrgPriceDetailSum(@Param("orgId") Long orgId,
+                            @Param("year") Integer year,
+                            @Param("typeIdsList")List<String> typeIdsList,
+                            @Param("sizeNameList") List<String> sizeNameList);
+
+    FinalTjOrgPriceDto TjOrgPriceSum(@Param("orgId") Long orgId,@Param("year") Integer year,
+                                     @Param("typeIdsList") List<String> typeIdsList,
                                      @Param("sizeNameList") List<String> sizeNameList);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/OutInLogsReceiver.java

@@ -19,7 +19,7 @@ public class OutInLogsReceiver {
     @Resource
     private LogSummaryService logSummaryService;
 
-    @RabbitListener(queues = "orderResult")//监听队列名
+    @RabbitListener(queues = "11111")//监听队列名
     private void a(String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
 
         try {

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

@@ -20,12 +20,18 @@ public interface TjService {
     FinalTjOrgEqsDto test(TjOrgEqsReq req);
 
     //装备统计报表
-    FinalTjOrgEqsDto TjOrgEqs(TjOrgEqsReq req);
+    PageResult<TjOrgEqsDto> TjOrgEqs(TjOrgEqsReq req);
 
 
-    PageResult<InventorySumDto> TjOrgEqsDetail(TjOrgEqsReq req);
+    PageResult<InventorySumDto> TjOrgEqsDetailPage(TjOrgEqsReq req);
+    List<InventorySumDto> TjOrgEqsDetailList(TjOrgEqsReq req);
     //财务统计报表
-    FinalTjOrgPriceDto TjOrgPrice(TjOrgPriceReq req);
+    PageResult<TjOrgPriceDto> TjOrgPrice(TjOrgPriceReq req);
 
-    List<TjOrgPriceDto> TjOrgPriceDetail(TjOrgPriceReq req);
+    PageResult<TjOrgPriceDto> TjOrgPriceDetailPage(TjOrgPriceReq req);
+    List<TjOrgPriceDto> TjOrgPriceDetailList(TjOrgPriceReq req);
+
+    FinalTjOrgEqsDto TjOrgEqsSum(TjOrgEqsReq req);
+
+    FinalTjOrgPriceDto TjOrgPriceSum(TjOrgPriceReq req);
 }

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

@@ -325,7 +325,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     public boolean BatchEditingInvsInfo(BatchEditingInvsReq req) {
         //查询inventory表中数据，对响应数据进行修改
         //判断是对整一类的装备进行修改还是说对个别几个装备进行批量修改
-        if (req.getInventoryIdList().size()!=0){
+//        if (req.getInventoryIdList().size()!=0){
             List<Inventory> list = list(new LambdaQueryWrapper<Inventory>().in(Inventory::getId, req.getInventoryIdList()));
             if (list.size()==0){
                 throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
@@ -340,25 +340,23 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
                     }
                     return inventory;
                 }).collect(Collectors.toList());
-                updateBatchById(collect);
-                //修改汇总信息
-                return setInventorySummary(req);
-            }
-        }else {
-            List<Inventory> list = list(createWrapper(req));
-            //直接将一类的数据进行修改
-            List<Inventory> collect = list.stream().map(inventory -> {
-                BeanPlusUtil.copyProperties(req, inventory);
-                if (ObjectUtil.isNotNull(req.getShelfColumns()) && !req.getShelfColumns().toString().trim().isEmpty()
-                        && ObjectUtil.isNotNull(req.getShelfRanges()) && !req.getShelfRanges().toString().trim().isEmpty()
-                        && ObjectUtil.isNotNull(req.getShelfRows()) && !req.getShelfRows().toString().trim().isEmpty()) {
-                    inventory.setShelfLocation(req.getShelfRanges() + "/" + req.getShelfColumns() + "/" + req.getShelfRows());
-                }
-                return inventory;
-            }).collect(Collectors.toList());
-            updateBatchById(collect);
-            return setInventorySummary(req);
+                return updateBatchById(collect);
             }
+//        }
+//        else {
+//            List<Inventory> list = list(createWrapper(req));
+//            //直接将一类的数据进行修改
+//            List<Inventory> collect = list.stream().map(inventory -> {
+//                BeanPlusUtil.copyProperties(req, inventory);
+//                if (ObjectUtil.isNotNull(req.getShelfColumns()) && !req.getShelfColumns().toString().trim().isEmpty()
+//                        && ObjectUtil.isNotNull(req.getShelfRanges()) && !req.getShelfRanges().toString().trim().isEmpty()
+//                        && ObjectUtil.isNotNull(req.getShelfRows()) && !req.getShelfRows().toString().trim().isEmpty()) {
+//                    inventory.setShelfLocation(req.getShelfRanges() + "/" + req.getShelfColumns() + "/" + req.getShelfRows());
+//                }
+//                return inventory;
+//            }).collect(Collectors.toList());
+//            return updateBatchById(collect);
+//        }
     }
 
 
@@ -367,13 +365,13 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     public boolean setInventorySummary(BatchEditingInvsReq req){
         //查询字典表中的临近报废天数
         SysDictItem sysDictItem = sysDictItemService.getOne(new LambdaQueryWrapper<SysDictItem>()
-                .eq(SysDictItem::getItemText, "brokenNumber"));
+                .eq(SysDictItem::getItemText, "nearBrokenNumber"));
         //如果配置找不到，那就默认设置为15天为临近报废（如果装备的质保期小于15天了，就是为临近报废）
-        Integer brokenNumberDays;
+        Integer nearBrokenNumberDays;
         if (ObjectUtil.isNotNull(sysDictItem)){
-            brokenNumberDays=15;
+            nearBrokenNumberDays=15;
         }else {
-            brokenNumberDays=Integer.parseInt(sysDictItem.getItemValue());
+            nearBrokenNumberDays=Integer.parseInt(sysDictItem.getItemValue());
         }
         //先将其删除再全部重新添加计算
         List<InventorySummary> list = inventorySummaryService.list(new LambdaQueryWrapper<InventorySummary>()
@@ -382,7 +380,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
                 .eq(ObjectUtil.isNotNull(req.getSizeId()),InventorySummary::getSizeId,req.getSizeId())
                 .eq(ObjectUtil.isNotNull(req.getTypeId()),InventorySummary::getTypeId,req.getTypeId()));
         boolean b = inventorySummaryService.removeBatchByIds(list);
-        boolean a = inventoryMapper.insertInventorySummary(req,brokenNumberDays);
+        boolean a = inventoryMapper.insertInventorySummary(req,nearBrokenNumberDays);
         return (a && b);
     }
 

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

@@ -125,7 +125,7 @@ public class TjServiceImpl implements TjService {
 //    }
 
     @Override
-    public FinalTjOrgEqsDto TjOrgEqs(TjOrgEqsReq req) {
+    public PageResult<TjOrgEqsDto> TjOrgEqs(TjOrgEqsReq req) {
         //我得先将typeid传递的最下层的装备idlist拿到
 //        List<String> typeIdsList = equipmentSizeService.selectByTypeIds(req.getTypeIdsList());
 //        List<String> sizeNameList = req.getSizeNameList();
@@ -142,7 +142,7 @@ public class TjServiceImpl implements TjService {
         if (!ObjectUtil.isEmpty(req.getSizeNameList()) && req.getSizeNameList().size()>0){
             sql+="and size_name in (";
             for (String sizeName:req.getSizeNameList()) {
-                sql+=sizeName+",";
+                sql+="'"+sizeName+"',";
             }
             sql = sql.substring(0, sql.length() - 1);
             sql+=")";
@@ -158,80 +158,142 @@ public class TjServiceImpl implements TjService {
         Comparator<TjOrgEqsDto> orgComparator = createOrgComparator();
         Collections.sort(tjOrgEqsDtoList, orgComparator);
 
-        //在内存foreach还是去数据库再去查询一次
-        FinalTjOrgEqsDto finalTjOrgEqsDto=inventorySummaryMapper.getSumByViewOrgeqsSum();
         if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
             req.setPageNo(1L);
             req.setPageSize(10L);
         }
         Page<TjOrgEqsDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
-        List<TjOrgEqsDto> subList = tjOrgEqsDtoList.subList((int) ((req.getPageNo()-1)*req.getPageSize()), req.getPageSize().intValue());
+        long startIndex = (req.getPageNo() - 1) * req.getPageSize();
+        long endIndex = Math.min(startIndex + req.getPageSize(), tjOrgEqsDtoList.size());
+        List<TjOrgEqsDto> subList = tjOrgEqsDtoList.subList((int)startIndex, (int)endIndex);
+//        List<TjOrgEqsDto> subList = tjOrgEqsDtoList.subList((int) ((req.getPageNo()-1)*req.getPageSize()), req.getPageSize().intValue());
         page.setRecords(subList);
         page.setTotal(tjOrgEqsDtoList.size());
-        finalTjOrgEqsDto.setTjOrgEqsDtoPage(PageResultFactory.createPageResult(page));
 //        finalTjOrgEqsDto.setTjOrgEqsDto(tjOrgEqsDtoList);
+        return PageResultFactory.createPageResult(page);
+    }
+
+    @Override
+    public FinalTjOrgEqsDto TjOrgEqsSum(TjOrgEqsReq req) {
+        //将前端传递的值进行处理并且执行存储过程
+        String sql="and (org_id="+req.getOrgId()+" or org_parent_id = "+req.getOrgId()+")";
+        if (!ObjectUtil.isEmpty(req.getTypeIdsList()) && req.getTypeIdsList().size()>0){
+            sql+="and type_id in (";
+            for (String typeId:req.getTypeIdsList()) {
+                sql+=typeId+",";
+            }
+            sql = sql.substring(0, sql.length() - 1);
+            sql+=")";
+        }
+        if (!ObjectUtil.isEmpty(req.getSizeNameList()) && req.getSizeNameList().size()>0){
+            sql+="and size_name in (";
+            for (String sizeName:req.getSizeNameList()) {
+                sql+="'"+sizeName+"',";
+            }
+            sql = sql.substring(0, sql.length() - 1);
+            sql+=")";
+        }
+        System.out.println("sql = " + sql);
+        //执行存储过程
+        inventorySummaryMapper.useViewOrgeqs(sql);
+        //在内存foreach还是去数据库再去查询一次
+        FinalTjOrgEqsDto finalTjOrgEqsDto=inventorySummaryMapper.getSumByViewOrgeqsSum();
+        if (ObjectUtil.isNotNull(finalTjOrgEqsDto)) {
             return finalTjOrgEqsDto;
+        }else {
+            return new FinalTjOrgEqsDto();
         }
 
+    }
+
+
+
     //查看装备统计详情
     @Override
-    public PageResult<InventorySumDto> TjOrgEqsDetail(TjOrgEqsReq req) {
+    public PageResult<InventorySumDto> TjOrgEqsDetailPage(TjOrgEqsReq req) {
         int size = inventorySummaryMapper.TjOrgEqsDetailSum(req.getOrgId(), req.getTypeIdsList(), req.getSizeNameList());
         if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
             req.setPageNo(1L);
             req.setPageSize(10L);
         }
         Page<InventorySumDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
-        List<InventorySumDto> returnList=inventorySummaryMapper.TjOrgEqsDetail(req.getOrgId(),req.getTypeIdsList(),req.getSizeNameList(),req.getPageNo(),req.getPageSize());
+        List<InventorySumDto> returnList=inventorySummaryMapper.TjOrgEqsDetail(req.getOrgId(),req.getTypeIdsList(),
+                req.getSizeNameList(),(req.getPageNo()-1)* req.getPageSize(),req.getPageSize());
         page.setTotal(size);
         page.setRecords(returnList);
         return PageResultFactory.createPageResult(page);
     }
 
+    //查看装备统计详情
+    @Override
+    public List<InventorySumDto> TjOrgEqsDetailList(TjOrgEqsReq req) {
+        List<InventorySumDto> returnList=inventorySummaryMapper.TjOrgEqsDetail(req.getOrgId(),req.getTypeIdsList(),
+                req.getSizeNameList(),null,null);
+        return returnList;
+    }
+
     //财务统计报表
     @Override
-    public FinalTjOrgPriceDto TjOrgPrice(TjOrgPriceReq req) {
-        //获取所有最下层的typeId
-//        List<String> typeIdsList = equipmentSizeService.selectByTypeIds(req.getTypeIdsList());
-//        List<String> sizeNameList = req.getSizeNameList();
+    public PageResult<TjOrgPriceDto> TjOrgPrice(TjOrgPriceReq req) {
         //根据条件查询财务汇总表
-        List<TjOrgPriceDto> tjOrgPriceDtoList=priceSumSummaryMapper.TjOrgPrice(req.getOrgId(), req.getYear(), req.getTypeIdsList(),req.getSizeNameList());
+        List<TjOrgPriceDto> tjOrgPriceDtoList=priceSumSummaryMapper.TjOrgPrice(req.getOrgId(), req.getYear(),
+                req.getTypeIdsList(),req.getSizeNameList());
         //对组织机构进行排序
         Comparator<TjOrgPriceDto> orgComparator = createOrgComparator();
         Collections.sort(tjOrgPriceDtoList, orgComparator);
-        FinalTjOrgPriceDto finalTjOrgPriceDto = new FinalTjOrgPriceDto();
-        finalTjOrgPriceDto.setTjOrgPriceDto(tjOrgPriceDtoList);
-        //遍历查询到的信息并且得到汇总信息
-        Integer addNum=0;
-        Integer endNum=0;
-        Integer destoryNum=0;
-        BigDecimal startPrice=BigDecimal.ZERO;
-        BigDecimal endPrice=BigDecimal.ZERO;
-        for (TjOrgPriceDto tjOrgPriceDto:tjOrgPriceDtoList) {
-            addNum+=tjOrgPriceDto.getAddNum();
-            endNum+=tjOrgPriceDto.getEndNum();
-            destoryNum+= tjOrgPriceDto.getDestoryNum();
-            startPrice.add(tjOrgPriceDto.getStartPrice());
-            endPrice.add(tjOrgPriceDto.getEndPrice());
-        }
-        finalTjOrgPriceDto.setAddNum(addNum);
-        finalTjOrgPriceDto.setStartPrice(startPrice);
-        finalTjOrgPriceDto.setEndNum(endNum);
-        finalTjOrgPriceDto.setEndPrice(endPrice);
-        finalTjOrgPriceDto.setDestoryNum(destoryNum);
+        Page<TjOrgPriceDto> 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(), tjOrgPriceDtoList.size());
+        List<TjOrgPriceDto> subList = tjOrgPriceDtoList.subList((int) startIndex, (int)endIndex);
+//        List<TjOrgPriceDto> subList = tjOrgPriceDtoList.subList((int) ((req.getPageNo()-1)*req.getPageSize()), req.getPageSize().intValue());
+        page.setTotal(tjOrgPriceDtoList.size());
+        page.setRecords(subList);
+        return PageResultFactory.createPageResult(page);
+    }
+
+    @Override
+    public FinalTjOrgPriceDto TjOrgPriceSum(TjOrgPriceReq req) {
+
+        FinalTjOrgPriceDto finalTjOrgPriceDto= priceSumSummaryMapper.TjOrgPriceSum(req.getOrgId(), req.getYear(),
+                req.getTypeIdsList(),req.getSizeNameList());
+        if (ObjectUtil.isNotNull(finalTjOrgPriceDto)) {
+
             return finalTjOrgPriceDto;
+        }else {
+            return new FinalTjOrgPriceDto();
         }
 
+    }
     //查看财务统计详情
     @Override
-    public List<TjOrgPriceDto> TjOrgPriceDetail(TjOrgPriceReq req) {
-//        List<String> typeIdsList = equipmentSizeService.selectByTypeIds(req.getTypeIdsList());
-//        List<String> sizeNameList = req.getSizeNameList();
-        List<TjOrgPriceDto> tjOrgPriceDtoList=priceSumSummaryMapper.TjOrgPriceDetail(req.getOrgId(),req.getYear(),req.getTypeIdsList(),req.getSizeNameList());
-        return tjOrgPriceDtoList;
+    public PageResult<TjOrgPriceDto> TjOrgPriceDetailPage(TjOrgPriceReq req) {
+        int size = priceSumSummaryMapper.TjOrgPriceDetailSum(req.getOrgId(),req.getYear(),req.getTypeIdsList(),req.getSizeNameList());
+        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
+            req.setPageNo(1L);
+            req.setPageSize(10L);
+        }
+        Page<TjOrgPriceDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+        List<TjOrgPriceDto> returnList=priceSumSummaryMapper.TjOrgPriceDetail(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<TjOrgPriceDto> TjOrgPriceDetailList(TjOrgPriceReq req) {
+        List<TjOrgPriceDto> returnList=priceSumSummaryMapper.TjOrgPriceDetail(req.getOrgId(),req.getYear(),
+                req.getTypeIdsList(),req.getSizeNameList(),null,null);
+        return returnList;
     }
 
 
+
+
     public <T> Comparator<T> createOrgComparator() {
         return (org1,org2) ->{
 

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

@@ -54,7 +54,7 @@ public class InvExpireMsg implements JobAction {
         //除去销毁出库数
         wrapper.eq(Inventory::getTermState, 0);
         wrapper.ne(Inventory::getState,"destory");
-        //获取未超期的物资数量
+
         long termCount= inventoryService.count(wrapper);
         List<Inventory> list=new ArrayList<>();
         if (termCount>0) {

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

@@ -440,13 +440,13 @@
             base_inventory_summary
         WHERE
         org_id_int = #{orgId}
-        <if test="typeIdsList!=null and !typeIdsList.size() > 0">
+        <if test="typeIdsList!=null and typeIdsList.size() > 0">
             AND type_id IN
             <foreach collection="typeIdsList " item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
-        <if test="sizeNameList!=null and !sizeNameList.size() > 0">
+        <if test="sizeNameList!=null and sizeNameList.size() > 0">
             AND
             <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
                 size_name like CONCAT('%', #{item}, '%')
@@ -458,7 +458,9 @@
             size_name,
             size_id
         ORDER BY type_id
+        <if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
             limit #{pageNo},#{pageSize}
+        </if>
     </select>
 
     <select id="selectTotalNum" resultType="com.junmp.jyzb.api.bean.dto.InventorySumDto">
@@ -490,13 +492,13 @@
         base_inventory_summary
         WHERE
         org_id_int = #{orgId}
-        <if test="typeIdsList!=null and !typeIdsList.size() > 0">
+        <if test="typeIdsList!=null and typeIdsList.size() > 0">
             AND type_id IN
             <foreach collection="typeIdsList " item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
-        <if test="sizeNameList!=null and !sizeNameList.size() > 0">
+        <if test="sizeNameList!=null and sizeNameList.size() > 0">
             AND
             <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
                 size_name like CONCAT('%', #{item}, '%')

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

@@ -29,10 +29,65 @@
         {call UpdatePriceSummary()}
     </select>
     <select id="TjOrgPrice" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">
+        select org_id_int as org_id,org_code,org_name,org_name_short as d_name,
+               sum(start_num) as start_num,sum(start_price) as start_price,
+               sum(end_num) as end_num,sum(end_price) as end_price,
+               sum(add_num) as add_num,sum(destory_num) as destory_num,
+               sum(add_price) as add_price,sum(destory_price) as destory_price
+        FROM vie_price_sum_summary
+        where `year`= #{year} and (org_id_int=#{orgId} or parent_id=#{orgId})
+        <if test="typeIdsList!=null and typeIdsList.size() > 0">
+            and type_id in
+            <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="sizeNameList!=null and sizeNameList.size() > 0">
+            AND
+            <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
+                size_name like CONCAT('%', #{item}, '%')
+            </foreach>
+        </if>
+        GROUP BY org_id,org_code,org_name,d_name
+    </select>
+
+    <select id="TjOrgPriceDetail" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">
+        select org_id_int as org_id,org_code,org_name,type_id,type_name,size_id,size_name,
+        sum(start_num) as start_num,sum(start_price) as start_price,
+        sum(end_num) as end_num,sum(end_price) as end_price,
+        sum(add_num) as add_num,sum(destory_num) as destory_num,
+        sum(add_price) as add_price,sum(destory_price) as destory_price
+        FROM vie_price_sum_summary
+        where `year`= #{year} and org_id_int=#{orgId}
+        <if test="typeIdsList!=null and typeIdsList.size() > 0">
+            and type_id in
+            <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="sizeNameList!=null and sizeNameList.size() > 0">
+            AND
+            <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
+                size_name like CONCAT('%', #{item}, '%')
+            </foreach>
+        </if>
+        GROUP BY org_id,org_code,org_name,type_id,type_name,size_id,size_name
+        ORDER BY type_id
+        <if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
+            limit #{pageNo},#{pageSize}
+        </if>
+
+    </select>
+    <select id="TjOrgPriceSum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgPriceDto">
+        select sum(t.start_num) as start_num,sum(t.start_price) as start_price,
+        sum(t.end_num) as end_num,sum(t.end_price) as end_price,
+        sum(t.add_num) as add_num,sum(t.destory_num) as destory_num,
+        sum(t.add_price) as add_price,sum(t.destory_price) as destory_price FROM (
             select org_id_int as org_id,org_code,org_name,
             sum(start_num) as start_num,sum(start_price) as start_price,
             sum(end_num) as end_num,sum(end_price) as end_price,
-               sum(add_num) as add_num,sum(destory_num) asdestory_num
+            sum(add_num) as add_num,sum(destory_num) as destory_num,
+            sum(add_price) as add_price,sum(destory_price) as destory_price
             FROM vie_price_sum_summary
             where `year`= #{year} and (org_id_int=#{orgId} or parent_id=#{orgId})
             <if test="typeIdsList!=null and typeIdsList.size() > 0">
@@ -48,12 +103,15 @@
                 </foreach>
             </if>
             GROUP BY org_id,org_code,org_name
+        ) as t
     </select>
-    <select id="TjOrgPriceDetail" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">
+    <select id="TjOrgPriceDetailSum" resultType="java.lang.Integer">
+        select count(*) from (
         select org_id_int as org_id,org_code,org_name,type_id,type_name,
         sum(start_num) as start_num,sum(start_price) as start_price,
         sum(end_num) as end_num,sum(end_price) as end_price,
-               sum(add_num) as add_num,sum(destory_num) asdestory_num
+        sum(add_num) as add_num,sum(destory_num) as destory_num,
+        sum(add_price) as add_price,sum(destory_price) as destory_price
         FROM vie_price_sum_summary
         where `year`= #{year} and org_id_int=#{orgId}
         <if test="typeIdsList!=null and typeIdsList.size() > 0">
@@ -70,5 +128,7 @@
         </if>
         GROUP BY org_id,org_code,org_name,type_id,type_name
         ORDER BY type_id
+                             ) as t
     </select>
+
 </mapper>
\ No newline at end of file

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -133,6 +133,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
             if (StringUtils.isNotBlank(comments)) {
                 taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", comments);
+            }else {
+                //默认同意
+                taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", "同意");
             }
             if (attachments != null && attachments.size() > 0) {
                 for (AttachmentDTO attachment : attachments) {
@@ -226,6 +229,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             runtimeService.setVariables(task.getProcessInstanceId(), map);
             if (StringUtils.isNotBlank(comments)) {
                 taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", comments);
+            }else {
+                //默认拒绝
+                taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", "拒绝");
             }
             if (attachments != null && attachments.size() > 0) {
                 for (AttachmentDTO attachment : attachments) {
@@ -316,6 +322,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         runtimeService.setVariables(task.getProcessInstanceId(),map);
         if(StringUtils.isNotBlank(comments)){
             taskService.addComment(task.getId(),task.getProcessInstanceId(),"opinion",comments);
+        }else {
+            taskService.addComment(task.getId(),task.getProcessInstanceId(),"opinion","撤销");
         }
         if(attachments!=null && attachments.size()>0){
             for (AttachmentDTO attachment : attachments) {