增加“归属公司”数据列及高级检索条件

hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountRunningWaterSelectDto.java

@@ -70,4 +70,13 @@ public class AccountRunningWaterSelectDto extends BaseSelectDto {
      */
     private String remarks;
 
+    /**
+     * 交易开始时间
+     */
+    private String startTime;
+    /**
+     * 交易结束时间
+     */
+    private String stopTime;
+
 }

hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountRunningWaterVo.java

@@ -1,6 +1,5 @@
 package com.fjhx.account.entity.account.vo;
 
-import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
 import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
 import com.fjhx.account.entity.account.po.AccountRunningWater;
 import lombok.Getter;
@@ -73,4 +72,14 @@ public class AccountRunningWaterVo extends AccountRunningWater {
      * 收支类型
      */
     private String status;
+
+    /**
+     * 归属公司id
+     */
+    private Long corporationId;
+
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
 }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -17,6 +17,8 @@ import com.fjhx.account.mapper.account.AccountRunningWaterMapper;
 import com.fjhx.account.service.account.AccountRemainderService;
 import com.fjhx.account.service.account.AccountRunningWaterService;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.entity.corporation.po.Corporation;
+import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.item.util.excel.util.ExcelUtil;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
@@ -49,6 +51,8 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
 
     @Autowired
     private DictTenantDataService dictTenantDataService;
+    @Autowired
+    private CorporationService corporationService;
 
 
     @Override
@@ -67,15 +71,15 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         //交易开始金额
         wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginAmount()), "arw.amount", dto.getBeginAmount());
         //交易结束金额
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndAmount()), "arw.amount", dto.getEndAmount());
+        wrapper.le(ObjectUtil.isNotEmpty(dto.getEndAmount()), "arw.amount", dto.getEndAmount());
         //交易开始时间
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()), "arw.create_time", dto.getBeginTime());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getStartTime()), "arw.create_time", dto.getStartTime());
         //交易结束金额
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndTime()), "arw.create_time", dto.getEndTime());
+        wrapper.le(ObjectUtil.isNotEmpty(dto.getStopTime()), "arw.create_time", dto.getStopTime());
         //对方账户名称
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getName()), "arw.name", dto.getName());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getName()), "arw.name", dto.getName());
         //摘要
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getRemarks()), "arw.name", dto.getRemarks());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getRemarks()), "arw.name", dto.getRemarks());
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.and(wrapper1 -> wrapper1.like("arw.remarks", dto.getKeyword()).or().like("arw.name", dto.getKeyword()));
         }
@@ -89,12 +93,22 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         }
 
         Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<AccountRunningWaterVo> records = page.getRecords();
+        //赋值归属公司名称
+        corporationService.attributeAssign(records, AccountRunningWaterVo::getCorporationId, (item, corporation) -> {
+            item.setCorporationName(corporation.getName());
+        });
         return page;
     }
 
     @Override
     public AccountRunningWaterVo detail(Long id) {
         AccountRunningWaterVo result = baseMapper.getDetail(id);
+        //赋值归属公司名称
+        Corporation corporation = corporationService.getById(result.getCorporationId());
+        if (ObjectUtil.isNotEmpty(corporation)) {
+            result.setCorporationName(corporation.getName());
+        }
         return result;
     }
 

hx-account/src/main/resources/mapper/account/AccountRunningWaterMapper.xml

@@ -2,11 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.account.mapper.account.AccountRunningWaterMapper">
     <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
-        select
-            arw.*,
-            am.alias accountManagementName
+        select arw.*,
+               am.alias accountManagementName,
+               am.corporation_id
         from account_running_water arw
-                 left join  account_management am on arw.account_management_id = am.id
+                 left join account_management am on arw.account_management_id = am.id
             ${ew.customSqlSegment}
     </select>
     <select id="getDetail" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
@@ -27,10 +27,11 @@
             arw.create_time,
             arw.update_user,
             arw.update_time,
-            am.name accountManagementName
+            am.name accountManagementName,
+            am.corporation_id
         from account_running_water arw
-                 left join  account_management am on arw.account_management_id = am.id
-            where arw.id = #{id}
+                 left join account_management am on arw.account_management_id = am.id
+        where arw.id = #{id}
     </select>
     <select id="getList" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
         select

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/vo/ArrivalDetailVo.java

@@ -90,4 +90,10 @@ public class ArrivalDetailVo extends ArrivalDetail {
      * 货品编码
      */
     private String productCustomCode;
+
+    /**
+     * 定义 1产品 2物料
+     */
+    private Integer productDefinition;
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/impl/ArrivalDetailServiceImpl.java

@@ -19,8 +19,8 @@ import com.fjhx.purchase.mapper.arrival.ArrivalDetailMapper;
 import com.fjhx.purchase.service.arrival.ArrivalDetailService;
 import com.fjhx.purchase.service.quality.QualityDetailService;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -92,6 +92,7 @@ public class ArrivalDetailServiceImpl extends ServiceImpl<ArrivalDetailMapper, A
                 item.setProductName(product.getName());
                 item.setProductSpec(product.getSpec());
                 item.setProductCategoryId(product.getProductClassifyId());
+                item.setProductDefinition(product.getDefinition());
             });
 
             // 赋值产品分类名称