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); } } 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; } 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()}
