From 72c01884f1d9f968b415fb3861ebb0dd00c63868 Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Fri, 5 Jul 2024 17:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9=E5=92=8C?=
=?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BusinessEnterpriseRelationalMapper.xml | 32 +++++-----
.../resources/mapper/scm/CwaccountMapper.xml | 45 ++++++++++++++
.../java/jnpf/mapper/CwaccountMapper.java | 8 +++
.../java/jnpf/mapper/CwsettlementMapper.java | 1 -
.../service/impl/CwaccountServiceImpl.java | 61 +++++++++++++------
.../jnpf/controller/CwaccountController.java | 2 +-
.../java/jnpf/entity/CwaccountEntity.java | 9 +++
.../model/cwaccount/CwaccountPagination.java | 3 +
.../src/views/extend/cwaccount/index.vue | 14 +++++
9 files changed, 138 insertions(+), 37 deletions(-)
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessEnterpriseRelationalMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessEnterpriseRelationalMapper.xml
index 69022b34..07f45659 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessEnterpriseRelationalMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessEnterpriseRelationalMapper.xml
@@ -26,30 +26,32 @@
FROM
(
SELECT
- COUNT( b.id ) AS avgPurchasePrice,
- IFNULL( SUM( Round( IF ( b.unit = '千克', b.net_weight / 1000, net_weight ), 3 )), 0 ) AS todayPurchasePrice
+ COUNT( a1.id ) AS avgPurchasePrice,-- 磅单采购数
+ IFNULL( SUM( Round( IF ( a2.unit = '千克', a2.net_weight / 1000, net_weight ), 3 )), 0 ) AS todayPurchasePrice
FROM
- jg_receipt_order a
- LEFT JOIN jg_delivery_voucher_relation b ON a.id = b.order_id
- AND b.f_delete_mark IS NULL
+ jg_voucher a1
+ LEFT JOIN jg_voucher_product a2 ON a1.id = a2.voucher_id
WHERE
- to_days( a.f_creator_time ) = to_days(
+ to_days( a1.f_creator_time ) = to_days(
now())
- AND a.f_delete_mark IS NULL
- AND a.receipt_type = '1'
+ AND a1.business_type = 1
+ AND a1.document_type = 1
+ AND a1.poundlist_time IS NOT NULL
+ AND a1.f_delete_mark IS NULL
) a,
(
SELECT
- IFNULL( SUM( Round( IF ( b.unit = '千克', b.net_weight / 1000, net_weight ), 3 )), 0 ) AS salesVolumeToday
+ IFNULL( SUM( Round( IF ( a2.unit = '千克', a2.net_weight / 1000, net_weight ), 3 )), 0 ) AS salesVolumeToday
FROM
- jg_delivery_order a
- LEFT JOIN jg_delivery_voucher_relation b ON a.id = b.order_id
- AND b.f_delete_mark IS NULL
+ jg_voucher a1
+ LEFT JOIN jg_voucher_product a2 ON a1.id = a2.voucher_id
WHERE
- to_days( a.f_creator_time ) = to_days(
+ to_days( a1.f_creator_time ) = to_days(
now())
- AND a.f_delete_mark IS NULL
- AND a.delivery_type = '2'
+ AND a1.business_type = 2
+ AND a1.document_type = 2
+ AND a1.poundlist_time IS NOT NULL
+ AND a1.f_delete_mark IS NULL
) b,
(
SELECT
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountMapper.xml
index 5e178ad9..19d4551b 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountMapper.xml
@@ -2,6 +2,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/CwaccountMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/CwaccountMapper.java
index 16fbd6b1..abc455ea 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/CwaccountMapper.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/CwaccountMapper.java
@@ -1,8 +1,13 @@
package jnpf.mapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.entity.CwaccountEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import jnpf.model.cwaccount.CwaccountPagination;
+import org.apache.ibatis.annotations.Param;
/**
* Cwaccount
@@ -13,4 +18,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface CwaccountMapper extends BaseMapper {
+ IPage queryCwaccount(@Param("page") Page page, @Param("cwaccountPagination") CwaccountPagination cwaccountPagination, @Param("ew") Wrapper cwaccountueryWrapper);
+
+
}
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/CwsettlementMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/CwsettlementMapper.java
index 09376bb6..04ecd13b 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/CwsettlementMapper.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/CwsettlementMapper.java
@@ -18,7 +18,6 @@ import org.apache.ibatis.annotations.Param;
*/
public interface CwsettlementMapper extends BaseMapper {
- //采购订单查询
IPage queryCwsettlement(@Param("page") Page page, @Param("cwsettlementPagination") CwsettlementPagination cwsettlementPagination, @Param("ew") Wrapper cwsettlementQueryWrapper);
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java
index ae28dc51..ac00b967 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java
@@ -30,6 +30,9 @@ import jnpf.util.*;
import java.util.*;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
+
+import javax.annotation.Resource;
+
/**
*
* Cwaccount
@@ -41,7 +44,7 @@ import jnpf.permission.entity.UserEntity;
@Service
public class CwaccountServiceImpl extends ServiceImpl implements CwaccountService{
@Autowired
- private GeneraterSwapUtil generaterSwapUtil;
+ private GeneraterSwapUtil2 generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@@ -56,6 +59,8 @@ public class CwaccountServiceImpl extends ServiceImpl getList(CwaccountPagination cwaccountPagination){
return getTypeList(cwaccountPagination,cwaccountPagination.getDataType());
@@ -349,13 +354,23 @@ public class CwaccountServiceImpl extends ServiceImpl 0){
cwaccountNum++;
- cwaccountQueryWrapper.lambda().in(CwaccountEntity::getContractCode,cwaccountPagination.getContractCodeList());
+ cwaccountQueryWrapper.in("a.contract_code",cwaccountPagination.getContractCodeList());
}
if(ObjectUtil.isNotEmpty(cwaccountPagination.getAccountState())){
cwaccountNum++;
- cwaccountQueryWrapper.lambda().eq(CwaccountEntity::getAccountState,cwaccountPagination.getAccountState());
+ cwaccountQueryWrapper.eq("a.account_state",cwaccountPagination.getAccountState());
}
if(cwaccountPagination.getExcludeIdList() != null && cwaccountPagination.getExcludeIdList().size() > 0){
cwaccountNum++;
- cwaccountQueryWrapper.lambda().notIn(CwaccountEntity::getId,cwaccountPagination.getExcludeIdList());
+ cwaccountQueryWrapper.notIn("a.id",cwaccountPagination.getExcludeIdList());
}
@@ -409,7 +424,7 @@ public class CwaccountServiceImpl extends ServiceImpl finalAllSuperIDlist = allSuperIDlist;
- cwaccountQueryWrapper.lambda().and(t->t.in(CwaccountEntity::getId, finalAllSuperIDlist));
+ cwaccountQueryWrapper.and(t->t.in("a.id", finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
@@ -490,14 +505,16 @@ public class CwaccountServiceImpl extends ServiceImpl finalAllRuleIDlist = allRuleIDlist;
- cwaccountQueryWrapper.lambda().and(t->t.in(CwaccountEntity::getId, finalAllRuleIDlist));
+ cwaccountQueryWrapper.and(t->t.in("a.id", finalAllRuleIDlist));
}
//假删除标志
- cwaccountQueryWrapper.lambda().isNull(CwaccountEntity::getDeleteMark);
-
+// cwaccountQueryWrapper.lambda().isNull(CwaccountEntity::getDeleteMark);
+ cwaccountQueryWrapper.isNull("a.f_delete_mark");
//排序
if(StringUtil.isEmpty(cwaccountPagination.getSidx())){
- cwaccountQueryWrapper.lambda().orderByDesc(CwaccountEntity::getCreatorTime);
+// cwaccountQueryWrapper.lambda().orderByDesc(CwaccountEntity::getCreatorTime);
+ cwaccountPagination.setSidx("a.f_creator_time");
+ cwaccountPagination.setSort("DESC");
}else{
try {
String sidx = cwaccountPagination.getSidx();
@@ -506,7 +523,9 @@ public class CwaccountServiceImpl extends ServiceImpl0 && AllIdList.size()>0) || total==0){
Page page=new Page<>(cwaccountPagination.getCurrentPage(), cwaccountPagination.getPageSize());
if("1".equals(cwaccountPagination.getQueryFlowTaskPass())){
- cwaccountQueryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");
+ cwaccountQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");
}
- IPage userIPage=this.page(page, cwaccountQueryWrapper);
+// IPage userIPage=this.page(page, cwaccountQueryWrapper);
+ IPage userIPage = cwaccountMapper.queryCwaccount(page,cwaccountPagination,cwaccountQueryWrapper);
+
return cwaccountPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List list = new ArrayList();
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwaccountController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwaccountController.java
index 8e7abf08..c346b8b6 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwaccountController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwaccountController.java
@@ -121,7 +121,7 @@ public class CwaccountController {
realList.add(cwaccountMap);
}
//数据转换
- realList = generaterSwapUtil.swapDataList(realList, CwaccountConstant.getFormData(), CwaccountConstant.getColumnData(), cwaccountPagination.getModuleId(),false);
+// realList = generaterSwapUtil.swapDataList(realList, CwaccountConstant.getFormData(), CwaccountConstant.getColumnData(), cwaccountPagination.getModuleId(),false);
//流程状态添加
for(Map vo:realList){
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountEntity.java
index d7db4c39..f42333de 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountEntity.java
@@ -70,4 +70,13 @@ public class CwaccountEntity {
private Integer version;
@TableField(value = "summary_type" , updateStrategy = FieldStrategy.IGNORED)
private String summaryType;
+
+ @TableField(exist = false)
+ private String realName;
+
+ @TableField(exist = false)
+ private String realNameA;
+
+ @TableField(exist = false)
+ private String settlementSum;
}
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountPagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountPagination.java
index 3489b845..1be709fb 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountPagination.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountPagination.java
@@ -51,4 +51,7 @@ public class CwaccountPagination extends Pagination {
private String queryFlowTaskPass;
@JsonProperty("preparationTime")
private Object preparationTime;
+
+ @JsonProperty("settlementSum")
+ private Object settlementSum;
}
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue
index 802fe93c..08e8799c 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue
@@ -27,6 +27,14 @@
+
+
+
+
+
+
+
+
@@ -109,6 +117,10 @@
+
+
+
+
@@ -238,6 +250,8 @@ export default {
accountSubjectName: undefined,
accountSubjectType: undefined,
preparationTime: undefined,
+ settlementSum: undefined,
+
},
treeProps: {
children: 'children',