src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
@@ -31,7 +31,7 @@ * 出入库时间 */ // @Excel(name = "出库时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDateTime createTime; private String timeStr; src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
@@ -16,6 +16,7 @@ import com.ruoyi.project.system.mapper.SysUserMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -24,6 +25,7 @@ import java.text.DateFormat; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.List; import java.util.stream.Collectors; @@ -54,7 +56,15 @@ procurementRecordOutLambdaQueryWrapper.ge(ProcurementRecordOut::getCreateTime, now) // 大于等于当天 .lt(ProcurementRecordOut::getCreateTime, now.plusDays(1)); // 小于明天 Long aLong1 = procurementRecordOutMapper.selectCount(procurementRecordOutLambdaQueryWrapper); // 2. 定义日期格式(必须与字符串格式完全匹配) DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); LocalDateTime localDateTime = null; // 3. 转换:String → LocalDate → LocalDateTime(补充0点时间) if(StringUtils.isNotEmpty(procurementRecordOutAdd.getTime())){ LocalDate localDate = LocalDate.parse(procurementRecordOutAdd.getTime(), formatter); // 获取当前时分秒 LocalTime localTime = LocalTime.now(); localDateTime = localDate.atTime(localTime);} // 查询采购出库数量 LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>(); procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getProcurementRecordStorageId, procurementRecordOutAdd.getId()); @@ -65,7 +75,7 @@ .salesLedgerProductId(procurementRecordOutAdd.getSalesLedgerProductId()) .inboundBatches(aLong.equals(0L) ? "第1批次" : "第"+ (aLong + 1) + "批次") .inboundNum(new BigDecimal(procurementRecordOutAdd.getQuantity())) .createTime(LocalDateTime.now()) .createTime(localDateTime == null ? LocalDateTime.now() : localDateTime) .createUser(Long.valueOf(procurementRecordOutAdd.getUserId())) .createBy(sysUser.getNickName()) .updateUser(Long.valueOf(procurementRecordOutAdd.getUserId())) src/main/resources/application.yml
@@ -1,4 +1,4 @@ # Spring配置 spring: profiles: active: demo active: dev src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -61,6 +61,7 @@ and t1.create_time like concat('%',#{req.timeStr},'%') </if> </where> order by t1.create_time desc </select> <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto"> select @@ -136,6 +137,7 @@ </if> </where> group by t3.supplier_name,t2.product_category,t2.specification_model order by t1.create_time desc </select> <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy"> select src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -30,6 +30,7 @@ and t1.create_time like concat('%',#{req.timeStr},'%') </if> </where> order by t1.create_time desc </select> <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto"> select src/main/resources/mapper/purchase/ProductRecordMapper.xml
@@ -42,6 +42,7 @@ <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''"> and tr.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%') </if> order by pr.created_at desc </select> <select id="getProductRecordById" resultType="com.ruoyi.purchase.dto.ProductRecordDto"> SELECT src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -82,6 +82,6 @@ AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d') </if> </where> order by entry_date desc order by execution_date desc </select> </mapper>