jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
@@ -58,6 +58,12 @@ @Excel(name = "出站时间") private Date outboundTime; @TableField(exist = false) private String startTime; @TableField(exist = false) private String endTime; /** 入站是否合格 */ @Excel(name = "入站是否合格") private String inRsSign; jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
@@ -75,6 +75,14 @@ { List<DaPassingStationVO> result = new ArrayList<>(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime startTime = LocalDate.now().atStartOfDay(); LocalDateTime endTime = LocalDate.now().plusDays(1).atStartOfDay(); String s1 = startTime.format(formatter); String s2 = endTime.format(formatter); daPassingStationCollection.setStartTime(s1); daPassingStationCollection.setEndTime(s2); List<DaPassingStationCollection> list = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection); //筛除节拍为空的数据 list = list.stream().filter(x -> StringUtils.isNotEmpty(x.getBeatTime())).collect(Collectors.toList()); jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
@@ -79,7 +79,7 @@ <if test="finalAssemblyOfflineTime != null and finalAssemblyOfflineTime != ''"> and final_assembly_offline_time = #{finalAssemblyOfflineTime}</if> <if test="cvtLaunchTime != null and cvtLaunchTime != ''"> and cvt_launch_time = #{cvtLaunchTime}</if> <if test="cvtOfflineTime != null and cvtOfflineTime != ''"> and cvt_offline_time = #{cvtOfflineTime}</if> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> and cvt_offline_time between #{startTime} and #{endTime}</if> </where> </select> jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml
@@ -45,7 +45,7 @@ <if test="outboundTime != null "> and outbound_time = #{outboundTime}</if> <if test="outRsSign != null "> and out_rs_sign = #{outRsSign}</if> <if test="outRsSign != null "> and out_rs_sign = #{outRsSign}</if> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> and outbound_time between #{startTime} and #{endTime}</if> </where> </select>
