BUG修护，增加产品类型统计API

hx-item/src/main/java/com/fjhx/item/controller/product/ProductInfoController.java

@@ -206,5 +206,13 @@ public class ProductInfoController {
         return productInfoService.productRanking(productInfoDto);
     }
 
+    /**
+     * 产品类型统计
+     */
+    @GetMapping("/statisticsProduct")
+    public Map<String,Object> statisticsProduct() {
+        return productInfoService.statisticsProduct();
+    }
+
 
 }

hx-item/src/main/java/com/fjhx/item/mapper/product/ProductInfoMapper.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -54,4 +55,10 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfo> {
      * 客户产品库
      */
     Page<ProductInfoVo> getCustomerProductList(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProductInfo> wrapper);
+
+    /**
+     * 产品统计
+     * @return
+     */
+    Map<String,Object> statisticsProduct();
 }

hx-item/src/main/java/com/fjhx/item/service/product/ProductInfoService.java

@@ -143,5 +143,11 @@ public interface ProductInfoService extends BaseService<ProductInfo> {
      */
     Page<ProductInfoVo> productRanking(ProductInfoSelectDto productInfoDto);
 
+    /**
+     * 产品统计
+     * @return
+     */
+    Map<String,Object> statisticsProduct();
+
 
 }

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -719,6 +719,15 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         return productInfoVos;
     }
 
+    /**
+     * 产品统计
+     * @return
+     */
+    @Override
+    public Map<String, Object> statisticsProduct() {
+        return baseMapper.statisticsProduct();
+    }
+
 
     //根据字典编码获取字典的数据
     private List<DictTenantDataVo> getDict(String code) {

hx-item/src/main/resources/mapper/product/ProductInfoMapper.xml

@@ -105,4 +105,18 @@
                  LEFT JOIN bytesailing_customer.customer c ON json_unquote(pi.ehsd_json -> '$.customerId') = c.id
             ${ew.customSqlSegment}
     </select>
+
+    <select id="statisticsProduct" resultType="java.util.Map">
+        SELECT
+            `type` AS `type`,
+            count( 1 ) AS count
+        FROM
+            product_info
+        WHERE `type` IS NOT NULL
+          AND `type` != "null"
+          AND `type` != ""
+          AND definition = 1
+        GROUP BY
+            `type`
+    </select>
 </mapper>

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractProductVo.java

@@ -95,4 +95,9 @@ public class ContractProductVo extends ContractProduct {
      * 订单类型
      */
     private String orderType;
+
+    /**
+     * 合同到账时间
+     */
+    private String claimTime;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/sample/po/Sample.java

@@ -1,6 +1,7 @@
 package com.fjhx.sale.entity.sample.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fjhx.file.entity.ObsFile;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableField;
 
@@ -224,6 +225,12 @@ public class Sample extends BasePo {
      */
     private String versions;
 
+
+    /**
+     * 附件列表
+     */
+    @TableField(exist = false)
+    private List<ObsFile> fileList;
     /**
      * 样品单产品列表
      */

hx-sale/src/main/java/com/fjhx/sale/flow/SampleFlow.java

@@ -86,6 +86,7 @@ public class SampleFlow extends FlowDelegate {
             }
             sampleShipmentService.saveBatch(sampleShipmentList);
         }
+        ObsFileUtil.saveFile(sample.getFileList(),sample.getId());
         return sample.getId();
 
     }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductServiceImpl.java

@@ -66,7 +66,7 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
     public Page<ContractProductVo> getPage(ContractProductSelectDto dto) {
         IWrapper<ContractProduct> wrapper = getWrapper();
         wrapper.orderByDesc("t1", ContractProduct::getCreateTime);
-        wrapper.between("t2", Contract::getStatus, FlowStatusEnum.DRAFT.getKey(),FlowStatusEnum.CANCELLATION.getKey()-1);
+        wrapper.between("t2", Contract::getStatus, FlowStatusEnum.PASS.getKey(),FlowStatusEnum.CANCELLATION.getKey()-1);
         wrapper.gt("t1",ContractProduct::getExpendQuantity,BigDecimal.ZERO);
         if(StringUtils.isNotEmpty(dto.getKeyword())){
             wrapper.keyword(dto.getKeyword(),new SqlField("t2.`code`"),new SqlField("t2.`user_name`"));
@@ -114,6 +114,11 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
         return list;
     }
 
+    /**
+     * 交接单
+     * @param dto
+     * @return
+     */
     @Override
     public Page<ContractProductVo> getEHSDPage(ContractProductSelectDto dto) {
         IWrapper<ContractProduct> wrapper = getWrapper();

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -100,7 +100,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     public Page<ContractVo> getPage(ContractSelectDto dto) {
         IWrapper<Contract> wrapper = getWrapper();
         wrapper.orderByDesc("t1",Contract::getCreateTime);
-        wrapper.between("t1",Contract::getStatus, FlowStatusEnum.PASS.getKey(),FlowStatusEnum.CANCELLATION.getKey()-1);
+        wrapper.between("t1",Contract::getStatus, FlowStatusEnum.DRAFT.getKey(),FlowStatusEnum.CANCELLATION.getKey()-1);
         if(StringUtils.isNotEmpty(dto.getStatus())){
             wrapper.eq("t1",Contract::getStatus,dto.getStatus());
         }