修改报表接口

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/DetailJsonReq.java

@@ -4,6 +4,7 @@ import com.junmp.jyzb.api.bean.query.InventoryReq;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -19,7 +20,10 @@ public class DetailJsonReq {
     private BigDecimal price;
     //Epc类型（0固定资产1库存物资非固定资产）
     private Integer property;
+    private Integer maintenancePeriod;
+    private Integer warrantyPeriod;
+    private Date productionDate;
 
-    private List<InventoryReq> InfoList;
+//    private List<InventoryReq> InfoList;
 
 }

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

@@ -93,7 +93,7 @@ public class PubOrgController {
     //获取组织机构信息（区域编码）也可以复用获取单个组织机构的所有信息
     @PostMapping(path = "/getOneOrgInfo",name = "获取组织机构区域编码#enable")
     @ApiOperation("获取组织机构区域编码")
-    public ApiRes<PubOrg> getOneOrgInfo(@RequestBody @Validated(ValidationApi.detail.class)UpdateOrgReq req){
+    public ApiRes<PubOrg> getOneOrgInfo(@RequestBody UpdateOrgReq req){
         return ApiRes.success(pubOrgService.getOneOrgInfo(req));
     }
 

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

@@ -1120,8 +1120,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                             //实际出库或者入库数量大于实际数量，则对空数据进行增删改查
                             if (orderMain.getOrderType().equals("in")){ //入库
                                 Random random = new Random();
-                                for (InventoryReq inv:detailJsonReq.getInfoList()) {
-                                    String epc="000000"+DateTimeUtil.getCurrentDateTime().getTime()+random.nextInt(999999 - 100000 + 1) + 100000;
+                                for (int i=0;i<subNum;i++) {
+                                    String epc="000000"+DateTimeUtil.getCurrentDateTime().getTime()+(random.nextInt(999999 - 100000 + 1) + 100000);
                                     Inventory inventory = new Inventory();
                                     inventory.setEpc(epc);
                                     inventory.setLocationId(detailJsonReq.getLocationId());
@@ -1134,9 +1134,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                                     inventory.setState("normal");
                                     inventory.setBussinessState("normal");
                                     inventory.setCreateTime(DateTimeUtil.getCurrentDateTime());
-                                    inventory.setProductionDate(inv.getProductionDate());
-                                    inventory.setWarrantyPeriod(inv.getWarrantyPeriod());
-                                    inventory.setMaintenancePeriod(inv.getMaintenancePeriod());
+//                                    inventory.setProductionDate(inv.getProductionDate());
+//                                    inventory.setWarrantyPeriod(inv.getWarrantyPeriod());
+//                                    inventory.setMaintenancePeriod(inv.getMaintenancePeriod());
                                     inventory.setTypeName(uploadDetailReq.getTypeName());
                                     inventory.setSizeName(uploadDetailReq.getSizeName());
                                     inventory.setBussinessType(req.getBussinessType());

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

@@ -857,7 +857,15 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
 
     @Override
     public PubOrg getOneOrgInfo(UpdateOrgReq req) {
-        return PubOrgExist(req.getOrgId());
+        PubOrg pubOrg = new PubOrg();
+
+        if (ObjectUtil.isNotNull(req.getOrgId())){
+            pubOrg = PubOrgExist(req.getOrgId());
+        }
+        if (ObjectUtil.isNotNull(req.getOrgCode())){
+            pubOrg = getOne(new LambdaQueryWrapper<PubOrg>().eq(PubOrg::getOrgCode, req.getOrgCode()));
+        }
+        return pubOrg;
     }
 
 

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

 package com.junmp.jyzb.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -1069,11 +1070,17 @@ public class TjServiceImpl implements TjService {
         PubOrg pubOrg=new PubOrg();
         if (length<12){
 
-            pubOrg = pubOrgService.list(new LambdaQueryWrapper<PubOrg>().eq(PubOrg::getFindCode, req.getFindCode())
-                    .orderByAsc(PubOrg::getLevelFlag)).get(0);
+            List<PubOrg> list = pubOrgService.list(new LambdaQueryWrapper<PubOrg>().eq(PubOrg::getFindCode, req.getFindCode())
+                    .orderByAsc(PubOrg::getLevelFlag));
+            if (CollectionUtil.isNotEmpty(list)){
+                pubOrg=list.get(0);
+            }
         }else {
-            pubOrg = pubOrgService.list(new LambdaQueryWrapper<PubOrg>().eq(PubOrg::getOrgCode, req.getFindCode())
-                    .orderByAsc(PubOrg::getLevelFlag)).get(0);
+            List<PubOrg> list = pubOrgService.list(new LambdaQueryWrapper<PubOrg>().eq(PubOrg::getOrgCode, req.getFindCode())
+                    .orderByAsc(PubOrg::getLevelFlag));
+            if (CollectionUtil.isNotEmpty(list)){
+                pubOrg=list.get(0);
+            }
         }
         //将九大类查询出来并且存入返回对象中去
         List<String> typeNames = equipmentCountSummaryMapper.getTypeParentName();

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

@@ -221,23 +221,9 @@
     <select id="TjOrgPriceBySelf" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">
 
         SELECT
-        start_num,
-        start_price,
-        end_num,
-        end_price,
-        destory_num,
-        destory_price
-        org_code,
+        t1.start_num,t1.start_price,t2.end_num,t2.end_price,t2.end_num - t1.start_num AS add_num,
         t2.end_price - t1.start_price AS add_price, t2.destory_num,t2.destory_price,t2.org_id,t2.org_code,t2.org_name,t2.d_name
-        org_id,
-        d_name
-        FROM
-        pub_org
-        WHERE
-        org_id = #{orgId}
-        ) AS po
-        JOIN
-        (
+        FROM(
         SELECT
         COALESCE(SUM(COALESCE ( start_num, 0 )),0) AS start_num,
         COALESCE(SUM(COALESCE ( start_price, 0 )),0) AS start_price
@@ -260,7 +246,7 @@
                 size_name like CONCAT('%', #{item}, '%')
             </foreach>
         </if>
-        ) AS t2 ON 1=1
+        ) AS t1
         JOIN (
         (
         SELECT