Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

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

 package com.junmp.jyzb.api.bean.dto.TjDto;
 
+import com.junmp.v2.db.api.page.PageResult;
 import lombok.Data;
 
 import java.util.List;
@@ -19,5 +20,7 @@ public class FinalTjOrgEqsDto {
 //    合计销毁数
     private Integer destructionNumber;
 //    每个组织机构的装备数
-    private List<TjOrgEqsDto> tjOrgEqsDto;
+//    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/TjOrgEqsReq.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 TjOrgEqsReq {
+public class TjOrgEqsReq extends BaseRequest {
     //组织机构
     private Long orgId;
     List<String> typeIdsList;

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-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/bean/req/UpdateStocktakeReq.java

@@ -34,7 +34,7 @@ public class UpdateStocktakeReq extends BaseRequest {
     /**
      * 组织机构id
      */
-    @NotNull(message = "仓库id不能为空",groups = {add.class,edit.class})
+    @NotNull(message = "组织机构id不能为空",groups = {add.class,edit.class})
     private Long orgId;
 
 

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/EquipmentSizeController.java

@@ -82,11 +82,11 @@ public class EquipmentSizeController {
         return ApiRes.success(equipmentSizeService.getByTypeIds(req));
     }
 
-    @PostMapping("/selectByTypeIds")
-    @ApiOperation("/根据装备类型返回装备所有装备子集")
-    public ApiRes<List<String>> selectByTypeIds(@RequestBody QueryEquipmentSizeReq req ){
-        return ApiRes.success(equipmentSizeService.selectByTypeIds(req.getTypeIdsList()));
-    }
+//    @PostMapping("/selectByTypeIds")
+//    @ApiOperation("/根据装备类型返回装备所有装备子集")
+//    public ApiRes<List<String>> selectByTypeIds(@RequestBody QueryEquipmentSizeReq req ){
+//        return ApiRes.success(equipmentSizeService.selectByTypeIds(req.getTypeIdsList()));
+//    }
 
 
 }

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

@@ -10,6 +10,7 @@ import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
 import com.junmp.jyzb.service.TjService;
 import com.junmp.v2.common.bean.response.ApiRes;
+import com.junmp.v2.db.api.page.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -31,39 +32,85 @@ public class TjController {
    private TjService tjService;
 
     /**
+     * ------------------------------------装备统计报表--------------------------------------------
+     */
+
+    /**
      * 根据组织机构统计装备的报表数据（外层数据）
      */
     @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<List<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<List<TjOrgEqsDto>> test(@RequestBody InventoryReq req){
+    @PostMapping("/test")
+    public ApiRes<FinalTjOrgEqsDto> test(@RequestBody TjOrgEqsReq req){
         return ApiRes.success(tjService.test(req));
     }
+
+
+//    @PostMapping("test")
+//    public ApiRes<List<TjOrgEqsDto>> test(@RequestBody InventoryReq req){
+//        return ApiRes.success(tjService.test(req));
+//    }
 }

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

@@ -57,7 +57,10 @@ public interface InventorySummaryMapper  extends BaseMapper<InventorySummary> {
     //获取合计
     FinalTjOrgEqsDto getSumByViewOrgeqsSum();
 
-    List<InventorySumDto> TjOrgEqsDetail(@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);
 
 
     List<InventorySumDto> selectTotalNum(@Param("orgId") Long orgId,@Param("list") List<Object[]> searchCriteria );

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/EquipmentSizeService.java

@@ -29,6 +29,6 @@ public interface EquipmentSizeService extends IService<EquipmentSize> {
     //根据typeId返回号型名称
     List<String> getByTypeIds(QueryEquipmentSizeReq req);
 
-    //根据
-    List<String> selectByTypeIds(List<String> typeIdsList);
+    //根据typeId拿到装备typeIds
+//    List<String> selectByTypeIds(List<String> typeIdsList);
 }

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

@@ -8,6 +8,7 @@ import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
 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;
 
 import java.util.List;
 
@@ -15,14 +16,22 @@ public interface TjService {
 
     List<TjOrgEqsDto> showOrgEqsList(InventoryReq req);
 
-    List<TjOrgEqsDto> test(InventoryReq req);
+//    List<TjOrgEqsDto> test(InventoryReq req);
+    FinalTjOrgEqsDto test(TjOrgEqsReq req);
 
     //装备统计报表
-    FinalTjOrgEqsDto TjOrgEqs(TjOrgEqsReq req);
+    PageResult<TjOrgEqsDto> TjOrgEqs(TjOrgEqsReq req);
 
-    List<InventorySumDto> TjOrgEqsDetail(TjOrgEqsReq req);
+
+    PageResult<InventorySumDto> TjOrgEqsDetailPage(TjOrgEqsReq req);
+    List<InventorySumDto> TjOrgEqsDetailList(TjOrgEqsReq req);
     //财务统计报表
-    FinalTjOrgPriceDto TjOrgPrice(TjOrgPriceReq req);
+    PageResult<TjOrgPriceDto> TjOrgPrice(TjOrgPriceReq req);
+
+    PageResult<TjOrgPriceDto> TjOrgPriceDetailPage(TjOrgPriceReq req);
+    List<TjOrgPriceDto> TjOrgPriceDetailList(TjOrgPriceReq req);
+
+    FinalTjOrgEqsDto TjOrgEqsSum(TjOrgEqsReq req);
 
-    List<TjOrgPriceDto> TjOrgPriceDetail(TjOrgPriceReq 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/OrderMainServiceImpl.java

@@ -24,6 +24,7 @@ import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.jyzb.utils.RabbitMQSendMsg;
 import com.junmp.jyzb.utils.RedisUtils;
+import com.junmp.v2.auth.api.LoginUserApi;
 import com.junmp.v2.auth.api.bean.login.LoginUser;
 import com.junmp.v2.auth.api.context.LoginContext;
 import com.junmp.v2.common.bean.response.ApiRes;
@@ -130,6 +131,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     private PolicemanService policemanService;
 
     @Resource
+    private SysUserService sysUserService;
+
+    @Resource
     private InventorySummaryMapper inventorySummaryMapper;
     @Autowired
     private RabbitMQSendMsg MQ;
@@ -186,10 +190,21 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         //通过遍历批量保存详细信息
         String s="";
         if (req.getOrderType().equals("in")){
-            s=s+req.getBussinessType()+"入库单：";
+            Long dictId = sysDictService.getOne(new LambdaQueryWrapper<SysDict>()
+                    .eq(SysDict::getDictCode, "bussiness_type")).getDictId();
+            String itemText = sysDictItemService.getOne(new LambdaQueryWrapper<SysDictItem>()
+                    .eq(SysDictItem::getDictId, dictId)
+                    .eq(SysDictItem::getItemValue, req.getBussinessType())).getItemText();
+            s=s+itemText+"单：";
         }else {
-            s=s+req.getBussinessType()+"出库单：";
+            Long dictId = sysDictService.getOne(new LambdaQueryWrapper<SysDict>()
+                    .eq(SysDict::getDictCode, "out_type")).getDictId();
+            String itemText = sysDictItemService.getOne(new LambdaQueryWrapper<SysDictItem>()
+                    .eq(SysDictItem::getDictId, dictId)
+                    .eq(SysDictItem::getItemValue, req.getBussinessType())).getItemText();
+            s=s+itemText+"单：";
         }
+
         for (UpdateOrderDetailReq listReq:req.getDetailList()) {
             OrderDetail detail=new OrderDetail();
             BeanPlusUtil.copyProperties(listReq, detail);
@@ -210,7 +225,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 }
             }
             //添加日志记录
-            s=s+listReq.getWarehouseName()+"预计数量："+listReq.getTypeName()+"【"+listReq.getSizeName()+"】"+listReq.getPlanNum()+"/";
+            s=s+listReq.getWarehouseName()+"【"+listReq.getTypeName()+"--"+listReq.getSizeName()+"】预计数量："+listReq.getPlanNum()+"/";
             detailList.add(detail);
         }
         orderDetailService.saveBatch(detailList);
@@ -332,7 +347,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
     //纪录日志
     private boolean addOrderLog(UpdateOrderReq req,String orderId,String orderCode,String s){
-        LoginUser StartUser= LoginContext.getContext().getLoginUser();
+//        LoginUser StartUser= LoginContext.getContext().getLoginUser();
+//        StartUser.
+
         //判断日志中是否存在，如果存在直接替换
         OrderLog createOrder = orderLogService.getOne(new LambdaQueryWrapper<OrderLog>()
                 .eq(OrderLog::getOrderId, req.getId())
@@ -346,8 +363,12 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             orderLog.setOrderCode(orderCode);
             orderLog.setBussinessType(req.getBussinessType());
             orderLog.setOrderType(req.getOrderType());
+            if (ObjectUtil.isNotNull(req.getStartOrgUserName())){
+                orderLog.setCreateUser(req.getStartOrgUserName());
+            }else {
+                orderLog.setCreateUser(req.getEndOrgUserName());
+            }
             orderLog.setProcessType("careteOrder");
-            orderLog.setCreateUser(String.valueOf(StartUser.getUserId()));
             if (req.getOrderType().equals("in")){
                 orderLog.setOrgId(req.getEndOrgId());
                 orderLog.setOrgName(req.getEndOrgName());
@@ -359,7 +380,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
             a=orderLogService.save(orderLog);
         }else{//直接替换
-            createOrder.setHistoryMsg(JSON.toJSONString(req.getDetailList()));
+            createOrder.setHistoryMsg(s);
             createOrder.setUpdateTime(DateTimeUtil.getCurrentDateTime());
             a=orderLogService.updateById(createOrder);
         }
@@ -913,6 +934,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     //将修改内容存储记录（历史操作，数量，单据，价格，组织机构）
     //创建记账操作记录并且记录到数据表order_log中
     public boolean saveAccountingLog (UpdateOrderReq req,String s,Integer updateQuantity){
+
         OrderLog orderLog = new OrderLog();
         BeanPlusUtil.copyProperties(req,orderLog);
         orderLog.setId(UUID.randomUUID().toString());
@@ -929,6 +951,15 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             orderLog.setOrgName(req.getStartOrgName());
         }
         orderLog.setOrderId(req.getId());
+        String userId="";
+        if (ObjectUtil.isNotNull(req.getUserId())){
+            userId=req.getUserId();
+        }else {
+            LoginUser loginUser = LoginContext.getContext().getLoginUser();
+            userId=loginUser.getUserId().toString();
+        }
+        SysUser sysUser = sysUserService.getById(userId);
+        orderLog.setCreateUser(sysUser.getNickName());
         orderLog.setCreateUser(req.getUserId());
         orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
         orderLog.setProcessType("accounting");

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/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/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

@@ -425,6 +425,7 @@
             type_name,
             size_name,
             type_id,
+            size_id,
             (
             sum( CASE WHEN `base_inventory_summary`.`location_type` = 0 THEN `base_inventory_summary`.`stock_number` ELSE 0 END ) +
             sum( CASE WHEN `base_inventory_summary`.`location_type` = 0 THEN `base_inventory_summary`.`outbound_number` ELSE 0 END ) +
@@ -439,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}, '%')
@@ -454,18 +455,61 @@
         GROUP BY
             type_id,
             type_name,
-            size_name
+            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">
         <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>
     </select>
+    <select id="TjOrgEqsDetailSum" resultType="java.lang.Integer">
+        select count(*) from (
+        SELECT
+        type_name,
+        size_name,
+        type_id,
+        (
+        sum( CASE WHEN `base_inventory_summary`.`location_type` = 0 THEN `base_inventory_summary`.`stock_number` ELSE 0 END ) +
+        sum( CASE WHEN `base_inventory_summary`.`location_type` = 0 THEN `base_inventory_summary`.`outbound_number` ELSE 0 END ) +
+        sum( CASE WHEN `base_inventory_summary`.`location_type` = 0 THEN `base_inventory_summary`.`destruction_number` ELSE 0 END )
+        ) AS total_number,
+        sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 0 ) THEN `base_inventory_summary`.`stock_number` ELSE 0 END ) AS `ck_stock_number`,
+        sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 0 ) THEN `base_inventory_summary`.`outbound_number` ELSE 0 END ) AS `ck_outbound_number`,
+        sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 0 ) THEN `base_inventory_summary`.`destruction_number` ELSE 0 END ) AS `destruction_number`,
+        sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 1 ) THEN `base_inventory_summary`.`stock_number` ELSE 0 END ) AS `djg_stock_number`,
+        sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 1 ) THEN `base_inventory_summary`.`outbound_number` ELSE 0 END ) AS `djg_outbound_number`
+        FROM
+        base_inventory_summary
+        WHERE
+        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
+        type_id,
+        type_name,
+        size_name
+        ORDER BY type_id
+                             ) as t
+    </select>
 
 </mapper>
\ No newline at end of file

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) {