From 9ba5a2a253535df55ba7e630f5f29adf45c6e9c9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 17 十月 2025 08:55:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java | 12 ++++++------
ruoyi-system/src/main/java/com/ruoyi/system/vo/ClinicProcurementReportVO.java | 4 ++++
ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml | 24 ------------------------
3 files changed, 10 insertions(+), 30 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
index e74112d..8679750 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
@@ -709,7 +709,7 @@
procurementReportClinicExport.setProcurementGoodsNum(sum);
}
if(Objects.nonNull(procurementReportClinicExport.getPayTime())){
- String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(procurementReportClinicExport.getPayTime());
+ String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(DateUtils.localDateTimeToDate(procurementReportClinicExport.getPayTime()));
procurementReportClinicExport.setPayTimeStr(payTimeStr);
}
}
@@ -724,7 +724,7 @@
}
for (ProcurementReportSupplierExport procurementReportSupplierExport : list) {
if(Objects.nonNull(procurementReportSupplierExport.getPayTime())){
- String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(procurementReportSupplierExport.getPayTime());
+ String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(DateUtils.localDateTimeToDate(procurementReportSupplierExport.getPayTime()));
procurementReportSupplierExport.setPayTimeStr(payTimeStr);
}
}
@@ -739,7 +739,7 @@
}
for (ProcurementReportPlatformExport procurementReportPlatformExport : list) {
if(Objects.nonNull(procurementReportPlatformExport.getPayTime())){
- String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(procurementReportPlatformExport.getPayTime());
+ String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(DateUtils.localDateTimeToDate(procurementReportPlatformExport.getPayTime()));
procurementReportPlatformExport.setPayTimeStr(payTimeStr);
}
}
@@ -762,7 +762,7 @@
}
for (PlatformLedgerReportExport platformLedgerReportExport : list) {
if(Objects.nonNull(platformLedgerReportExport.getPayTime())){
- String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(platformLedgerReportExport.getPayTime());
+ String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(DateUtils.localDateTimeToDate(platformLedgerReportExport.getPayTime()));
platformLedgerReportExport.setPayTimeStr(payTimeStr);
}
}
@@ -945,7 +945,7 @@
branchPerformanceReportVO.setPerformance(commissions.stream().map(TErpProcurementCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add));
}
if(Objects.nonNull(branchPerformanceReportVO.getPayTime())){
- String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(branchPerformanceReportVO.getPayTime());
+ String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(DateUtils.localDateTimeToDate(branchPerformanceReportVO.getPayTime()));
branchPerformanceReportVO.setPayTimeStr(payTimeStr);
}
}
@@ -1018,7 +1018,7 @@
salespersonPerformanceReportVO.setPerformance(commissions.stream().map(TErpProcurementCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add));
}
if(Objects.nonNull(salespersonPerformanceReportVO.getPayTime())){
- String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(salespersonPerformanceReportVO.getPayTime());
+ String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(DateUtils.localDateTimeToDate(salespersonPerformanceReportVO.getPayTime()));
salespersonPerformanceReportVO.setPayTimeStr(payTimeStr);
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ClinicProcurementReportVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ClinicProcurementReportVO.java
index 1d3ac34..06d8b17 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ClinicProcurementReportVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ClinicProcurementReportVO.java
@@ -16,4 +16,8 @@
private String supplierName;
@ApiModelProperty(value = "采购诊所")
private String clinicName;
+ @ApiModelProperty(value = "管理员")
+ private String personChargeName;
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml
index a9225c2..60f4678 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml
@@ -519,12 +519,6 @@
#{item}
</foreach>
</if>
- <if test="query.personChargeName != null and query.personChargeName != ''">
- and tep.person_charge_name like concat('%',#{query.personChargeName},'%')
- </if>
- <if test="query.phone != null and query.phone != ''">
- and tep.phone like concat('%',#{query.phone},'%')
- </if>
AND tep.status in (3,4,5)
AND tep.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
@@ -563,12 +557,6 @@
#{item}
</foreach>
</if>
- <if test="query.personChargeName != null and query.personChargeName != ''">
- and tep.person_charge_name like concat('%',#{query.personChargeName},'%')
- </if>
- <if test="query.phone != null and query.phone != ''">
- and tep.phone like concat('%',#{query.phone},'%')
- </if>
AND tep.status in (3,4,5)
AND tep.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
@@ -605,12 +593,6 @@
<foreach item="item" collection="query.clinicIds" separator="," open="(" close=")" index="">
#{item}
</foreach>
- </if>
- <if test="query.personChargeName != null and query.personChargeName != ''">
- and tep.person_charge_name like concat('%',#{query.personChargeName},'%')
- </if>
- <if test="query.phone != null and query.phone != ''">
- and tep.phone like concat('%',#{query.phone},'%')
</if>
AND tep.status in (3,4,5)
AND tep.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
@@ -650,12 +632,6 @@
<foreach item="item" collection="query.clinicIds" separator="," open="(" close=")" index="">
#{item}
</foreach>
- </if>
- <if test="query.personChargeName != null and query.personChargeName != ''">
- and tep.person_charge_name like concat('%',#{query.personChargeName},'%')
- </if>
- <if test="query.phone != null and query.phone != ''">
- and tep.phone like concat('%',#{query.phone},'%')
</if>
AND tep.status in (3,4,5)
AND tep.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
--
Gitblit v1.7.1