流水添加权限过滤

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

@@ -89,4 +89,6 @@ public class AccountRunningWaterSelectDto extends BaseSelectDto {
      * 是否汇算
      */
     private Integer isSettleAccounts;
+
+    private Long companyId;
 }

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountRunningWater.java

@@ -115,4 +115,9 @@ public class AccountRunningWater extends BasePo {
      */
     private BigDecimal amountCny;
 
+    /**
+     * 归属公司id
+     */
+    private Long companyId;
+
 }

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

@@ -20,6 +20,7 @@ import com.fjhx.account.service.account.AccountDeptRunningWaterService;
 import com.fjhx.common.constant.SourceConstant;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -179,8 +180,9 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
                    accountRunningWaterVo.setIncomeAmount(new BigDecimal(0));
                    accountRunningWaterVo.setExpenditureAmount(new BigDecimal(0));
                    accountRunningWaterVo.setBalanceAmount(new BigDecimal(0));
-                   accountRunningWaterVo.setTime(month);
-                   accountRunningWaterVoList.add(accountRunningWaterVo);
+                    accountRunningWaterVo.setTime(month);
+                    accountRunningWaterVo.setCompanyId(SecurityUtils.getCompanyId());
+                    accountRunningWaterVoList.add(accountRunningWaterVo);
                 }
             }else {
                 Map<String, List<AccountRunningWaterVo>> waterMap = accountRunningWaterVoList.stream()
@@ -188,12 +190,14 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
 
                 for (String month : months) {//判断这个月份中是否有这个数据，如果没有则赋值为0
                     List<AccountRunningWaterVo> accountRunningWaterVos1 = waterMap.get(month);
-                    if (ObjectUtil.isEmpty(accountRunningWaterVos1)){
+                    if (ObjectUtil.isEmpty(accountRunningWaterVos1)) {
                         AccountRunningWaterVo accountRunningWaterVo = new AccountRunningWaterVo();
                         accountRunningWaterVo.setIncomeAmount(new BigDecimal(0));
                         accountRunningWaterVo.setExpenditureAmount(new BigDecimal(0));
                         accountRunningWaterVo.setBalanceAmount(new BigDecimal(0));
                         accountRunningWaterVo.setTime(month);
+                        accountRunningWaterVo.setCompanyId(SecurityUtils.getCompanyId());
+
                         accountRunningWaterVoList.add(accountRunningWaterVo);
                     }
                 }

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

@@ -23,6 +23,7 @@ import com.fjhx.file.utils.ObsFileUtil;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -255,6 +256,8 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
     private void addAccountRunningWater(AccountPaymentDto accountPaymentDto, AccountPaymentRecords accountPaymentRecords) {
 
         AccountRunningWater accountRunningWater = new AccountRunningWater();
+        accountRunningWater.setCompanyId(SecurityUtils.getCompanyId());
+
         accountRunningWater.setAccountManagementId(accountPaymentRecords.getAccountManagementId());
         //打款的状态都是支出
         accountRunningWater.setStatus("20");

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

@@ -32,6 +32,7 @@ import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -126,8 +127,17 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
             }
         }
 
+        //权限过滤：生产备料-子公司看自己的,总公司看全部
+        Long companyId = SecurityUtils.getCompanyId();
+        if (!Objects.equals(companyId, 100L)) {
+            wrapper.eq("arw.company_id", companyId);
+        } else {
+            wrapper.eq("arw.company_id", dto.getCompanyId());
+        }
+
         return wrapper;
     }
+
     @Override
     public Page<AccountRunningWaterVo> getPage(AccountRunningWaterSelectDto dto) {
         QueryWrapper<Object> wrapper = getPageWrapper(dto);
@@ -435,6 +445,8 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         //如果手续费不为0生成手续费
         if (ObjectUtil.isNotEmpty(dto.getCommissionAmount()) && dto.getCommissionAmount().compareTo(BigDecimal.ZERO) != 0) {
             AccountRunningWater commissionAccountRunningWater = new AccountRunningWater();
+            commissionAccountRunningWater.setCompanyId(SecurityUtils.getCompanyId());
+
             commissionAccountRunningWater.setStatus("20");
             commissionAccountRunningWater.setType("50");//内部转账
             commissionAccountRunningWater.setRemarks(dto.getRemarks());
@@ -452,6 +464,8 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
 
         //生成收入流水
         AccountRunningWater inAccountRunningWater = new AccountRunningWater();
+        inAccountRunningWater.setCompanyId(SecurityUtils.getCompanyId());
+
         inAccountRunningWater.setStatus("10");
         inAccountRunningWater.setType("50");//内部转账
         inAccountRunningWater.setRemarks(dto.getRemarks());
@@ -548,6 +562,9 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
 
         //只修改以下字段
         AccountRunningWater newAccountRunningWater = new AccountRunningWater();
+
+        newAccountRunningWater.setCompanyId(SecurityUtils.getCompanyId());
+
         newAccountRunningWater.setId(oldAccountRunningWater.getId());
         newAccountRunningWater.setRate(rate);
         newAccountRunningWater.setAmountCny(amountCny);

hx-admin/pom.xml

@@ -70,6 +70,11 @@
         </dependency>
 
         <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-iot</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>

hx-purchase/src/main/java/com/fjhx/purchase/flow/SubscribeFlow.java

@@ -76,6 +76,8 @@ public class SubscribeFlow extends FlowDelegate {
             subscribeDetailService.saveBatch(subscribeDetails);
         }
 
+        submitData.put("code", subscribe.getCode());
+
         return subscribe.getId();
     }
 

hx-purchase/src/main/java/com/fjhx/purchase/service/refund/impl/RefundServiceImpl.java

@@ -20,6 +20,7 @@ import com.fjhx.purchase.service.refund.RefundService;
 import com.fjhx.supply.entity.supplier.po.SupplierInfo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
@@ -146,16 +147,19 @@ public class RefundServiceImpl extends ServiceImpl<RefundMapper, Refund> impleme
         BigDecimal newAmount = refundDto.getReceiptAmount();
         List<AccountRunningWater> accountRunningWaters = accountRunningWaterService.list(Wrappers.<AccountRunningWater>query().lambda().select(AccountRunningWater::getAmount).eq(AccountRunningWater::getBusinessId,refund.getId()));
         BigDecimal sumAmount = accountRunningWaters.stream().map(AccountRunningWater::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-        if(ObjectUtils.isNotEmpty(sumAmount)){
-            if((sumAmount.add(newAmount)).compareTo(refund.getAmount())>-1){//已退款
+        if (ObjectUtils.isNotEmpty(sumAmount)) {
+            if ((sumAmount.add(newAmount)).compareTo(refund.getAmount()) > -1) {//已退款
                 refund.setRefundStatus(RefundEnum.RE_20.getKey());
-            }else{//部分退款
+            } else {//部分退款
                 refund.setRefundStatus(RefundEnum.RE_10.getKey());
             }
         }
         this.updateById(refund);
         //添加一条资金流水
         AccountRunningWater accountRunningWater = new AccountRunningWater();
+
+        accountRunningWater.setCompanyId(SecurityUtils.getCompanyId());
+
         accountRunningWater.setAccountManagementId(refundDto.getReceiptAccountManagementId());
         accountRunningWater.setStatus("10");// 收入
         accountRunningWater.setBusinessId(refund.getId());

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

@@ -1,46 +1,24 @@
 package com.fjhx.sale.flow;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.fjhx.account.service.account.AccountRunningWaterService;
-import com.fjhx.area.utils.CustomizeAreaUtil;
-import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.common.enums.CodingRuleEnum;
-import com.fjhx.common.enums.FlowStatusEnum1;
-import com.fjhx.common.service.coding.CodingRuleService;
-import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.sale.entity.claim.po.Claim;
 import com.fjhx.sale.entity.claim.po.ClaimContract;
-import com.fjhx.sale.entity.contract.dto.ContractDto;
-import com.fjhx.sale.entity.contract.po.Contract;
-import com.fjhx.sale.entity.contract.po.ContractProduct;
-import com.fjhx.sale.entity.contract.po.ContractProject;
-import com.fjhx.sale.entity.contract.po.ContractShipment;
 import com.fjhx.sale.service.claim.ClaimContractService;
 import com.fjhx.sale.service.claim.ClaimService;
-import com.fjhx.sale.service.contract.ContractProductService;
-import com.fjhx.sale.service.contract.ContractProjectService;
-import com.fjhx.sale.service.contract.ContractService;
-import com.fjhx.sale.service.contract.ContractShipmentService;
-import com.ruoyi.common.annotation.LogicIgnore;
-import com.ruoyi.common.core.domain.BasePo;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -101,6 +79,8 @@ public class ClaimDelFlow extends FlowDelegate {
         claimContractService.remove(Wrappers.<ClaimContract>query().lambda().in(ClaimContract::getClaimId, claimIds));
         //更新流水数据为认领状态---已认领金额还原
         AccountRunningWater water = new AccountRunningWater();
+        water.setCompanyId(SecurityUtils.getCompanyId());
+
         water.setId(businessId);
         water.setIsClaim(0);//未认领状态
         water.setClaimAmount(BigDecimal.ZERO);

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -134,6 +134,8 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
         claimContractService.remove(Wrappers.<ClaimContract>query().lambda().in(ClaimContract::getClaimId, claimIds));
         //更新流水数据为认领状态---已认领金额还原
         AccountRunningWater water = new AccountRunningWater();
+        water.setCompanyId(SecurityUtils.getCompanyId());
+
         water.setId(id);
         water.setIsClaim(0);//未认领状态
         water.setClaimAmount(BigDecimal.ZERO);

pom.xml

@@ -24,6 +24,7 @@
         <module>hx-sale</module>
         <module>hx-form</module>
         <module>hx-jushuitan</module>
+        <module>hx-iot</module>
     </modules>
 
     <properties>
@@ -107,6 +108,11 @@
                 <artifactId>hx-jushuitan</artifactId>
                 <version>${hx.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>hx-iot</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>