Merge remote-tracking branch 'origin/master'

hx-ehsd/src/main/java/com/fjhx/ehsd/entity/purchase/dto/EhsdPurchaseSelectDto.java

@@ -14,4 +14,23 @@ import lombok.Setter;
 @Setter
 public class EhsdPurchaseSelectDto extends BaseSelectDto {
 
+    /**
+     * 采购状态
+     */
+    private Integer purchaseStatus;
+
+    /**
+     * 到货状态
+     */
+    private Integer arrivalStatus;
+
+    /**
+     * 付款状态
+     */
+    private Integer payStatus;
+
+    /**
+     * 供应商名称
+     */
+    private String supplyName;
 }

hx-ehsd/src/main/java/com/fjhx/ehsd/entity/purchase/po/EhsdPurchase.java

@@ -114,6 +114,16 @@ public class EhsdPurchase extends BasePo {
     private Integer status;
 
     /**
+     * 付款状态 0未付款  10部分付款  20已付款
+     */
+    private Integer payStatus;
+
+    /**
+     * 到货状态 0未到货  10 部分到货  20已到货
+     */
+    private Integer arrivalStatus;
+
+    /**
      * 采购总金额
      */
     private BigDecimal amount;

hx-ehsd/src/main/java/com/fjhx/ehsd/entity/purchase/vo/EhsdPurchaseVo.java

@@ -14,4 +14,8 @@ import lombok.Setter;
 @Setter
 public class EhsdPurchaseVo extends EhsdPurchase {
 
+    /**
+     * 供应商名称
+     */
+    private String supplyName;
 }

hx-ehsd/src/main/java/com/fjhx/ehsd/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -1,9 +1,14 @@
 package com.fjhx.ehsd.service.purchase.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.ehsd.entity.purchase.po.EhsdPurchase;
 import com.fjhx.ehsd.mapper.purchase.EhsdPurchaseMapper;
 import com.fjhx.ehsd.service.purchase.EhsdPurchaseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.purchase.entity.purchase.po.Purchase;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.ehsd.entity.purchase.vo.EhsdPurchaseVo;
@@ -22,12 +27,30 @@ import cn.hutool.core.bean.BeanUtil;
  * @since 2023-05-17
  */
 @Service
+@DS(SourceConstant.EHSD)
 public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, EhsdPurchase> implements EhsdPurchaseService {
 
+    /**
+     * 分页
+     * @param dto
+     * @return
+     */
     @Override
     public Page<EhsdPurchaseVo> getPage(EhsdPurchaseSelectDto dto) {
         IWrapper<EhsdPurchase> wrapper = getWrapper();
-        wrapper.orderByDesc("ep", EhsdPurchase::getId);
+        wrapper.orderByDesc("t1", EhsdPurchase::getCreateTime);
+        if (ObjectUtils.isNotEmpty(dto.getPurchaseStatus())) {
+            wrapper.eq("t1", EhsdPurchase::getStatus, dto.getPurchaseStatus());
+        }
+        if (ObjectUtils.isNotEmpty(dto.getArrivalStatus())) {
+            wrapper.eq("t1", EhsdPurchase::getArrivalStatus, dto.getArrivalStatus());
+        }
+        if (ObjectUtils.isNotEmpty(dto.getPayStatus())) {
+            wrapper.eq("t1", EhsdPurchase::getPayStatus, dto.getPayStatus());
+        }
+        if (ObjectUtils.isNotEmpty(dto.getKeyword())) {
+            wrapper.keyword(dto.getKeyword(),new SqlField("t2.name"),new SqlField("t1.`code`"));
+        }
         Page<EhsdPurchaseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

hx-ehsd/src/main/resources/mapper/purchase/EhsdPurchaseMapper.xml

@@ -2,44 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.ehsd.mapper.purchase.EhsdPurchaseMapper">
     <select id="getPage" resultType="com.fjhx.ehsd.entity.purchase.vo.EhsdPurchaseVo">
-        select
-            ep.id,
-            ep.code,
-            ep.business_id,
-            ep.business_type,
-            ep.contract_template_id,
-            ep.sell_corporation_id,
-            ep.sell_contact_name,
-            ep.sell_contact_number,
-            ep.sell_country_id,
-            ep.sell_province_id,
-            ep.sell_city_id,
-            ep.sell_address,
-            ep.buy_corporation_id,
-            ep.buy_contact_name,
-            ep.buy_contact_number,
-            ep.buy_country_id,
-            ep.buy_province_id,
-            ep.buy_city_id,
-            ep.buy_address,
-            ep.buy_postal_code,
-            ep.status,
-            ep.amount,
-            ep.remark,
-            ep.currency,
-            ep.delivery_time,
-            ep.delivery_type,
-            ep.invoice_type,
-            ep.payment_method,
-            ep.warranty,
-            ep.process_instance_id,
-            ep.approved_date,
-            ep.create_user,
-            ep.user_name,
-            ep.create_time,
-            ep.update_user,
-            ep.update_time
-        from ehsd_purchase ep
+        SELECT
+            t1.*,
+            t2.`name` AS supplyName
+        FROM
+            ehsd_purchase t1
+                LEFT JOIN bytesailing_supply.supplier_info t2 ON t1.sell_corporation_id = t2.id
             ${ew.customSqlSegment}
     </select>
 

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -253,6 +253,11 @@ public class Contract extends BasePo {
     private String beneficiaryAccountNumber;
 
     /**
+     * 利润预算表备注
+     */
+    private String budgetRemark;
+
+    /**
      * 版本号
      */
     @TableField(fill = FieldFill.INSERT)

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -10,6 +10,14 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="getProfitBudgetPage" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
+        SELECT
+            t1.*
+        FROM
+            contract t1
+        ${ew.customSqlSegment}
+    </select>
+
     <select id="getNoPackContractByCustomerId" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
         SELECT
             *