cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
@@ -354,7 +354,7 @@ } // 添加批准人名称 if (detailsRecord.getRatifyUserId() != null) { User user = userMapper.selectById(SecurityUtils.getUserId().intValue()); User user = userMapper.selectById(detailsRecord.getRatifyUserId()); detailsRecord.setRatifyUserName(user.getName()); } return detailsRecord; inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -155,9 +155,21 @@ spotCheckQuarterItemMapper.updateById(spotCheckQuarterItem); } // 创建工时暂存 // 缓存样品id, 编号map // addWorkingHoursTemporary(userId, insSamples, ids, order); return 1; } /** * 创建工时暂存 * @param userId * @param insSamples * @param ids * @param order */ private void addWorkingHoursTemporary(Integer userId, List<InsSample> insSamples, List<Integer> ids, InsOrder order) { Map<Integer, String> sampleMap = insSamples.stream().collect(Collectors.toMap(InsSample::getId, InsSample::getSampleCode)); List<InsProduct> insProductList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery() .in(InsProduct::getInsSampleId, ids) @@ -189,8 +201,6 @@ return auxiliaryOutputWorkingHours; }).collect(Collectors.toList()); auxiliaryOutputWorkingHoursTemporaryService.saveBatch(outputWorkingHours); return 1; } public static String getWeek(String dayStr) { performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursLookDto.java
@@ -23,4 +23,11 @@ @ApiModelProperty("结束时间") private String endDate; @ApiModelProperty("辅助工时开始时间") private String assistBeginDate; @ApiModelProperty("辅助工时结束时间") private String assistEndDate; } performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOriginalHoursServiceImpl.java
@@ -226,10 +226,10 @@ DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String beginDate = previousMonth26th.atStartOfDay().format(outputFormatter); String endDate = currentMonth25th.atStartOfDay().format(outputFormatter); // dto.setBeginDate(beginDate + " 00:00:00"); // dto.setEndDate(endDate + " 23:59:59"); dto.setBeginDate(beginDate); dto.setEndDate(endDate); dto.setBeginDate(beginDate + " 00:00:00"); dto.setEndDate(endDate + " 23:59:59"); dto.setAssistBeginDate(beginDate); dto.setAssistEndDate(endDate); // 查询产量工时 performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
@@ -144,16 +144,16 @@ u.name userName, aowh.`check` userId, #{dto.month} month from (SELECT * FROM auxiliary_output_working_hours GROUP BY CASE WHEN man_hour_group IS NOT NULL AND man_hour_group != '' THEN man_hour_group ELSE id END , CASE WHEN man_hour_group IS NOT NULL AND man_hour_group != '' THEN order_id ELSE id END) aowh from (SELECT ao.*, ip.cable_tag FROM auxiliary_output_working_hours ao left join ins_product ip on ip.id = ao.ins_product_id GROUP BY CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ao.man_hour_group ELSE ao.id END, CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ao.sample_id ELSE ao.id END, CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ip.radius ELSE ao.id END, CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ip.cable_tag ELSE ao.id END, CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ao.order_id ELSE ao.id END) aowh left join user u on u.id = aowh.`check` where aowh.date_time between #{dto.beginDate} and #{dto.endDate} <if test="userIds !=null and userIds.size() > 0"> @@ -171,7 +171,7 @@ #{dto.month} month from auxiliary_working_hours_day awhd left join user u on u.id = awhd.name_user where awhd.date_time between #{dto.beginDate} and #{dto.endDate} where awhd.date_time between #{dto.assistBeginDate} and #{dto.assistEndDate} and awhd.state = '已批准' <if test="userIds !=null and userIds.size() > 0"> and awhd.name_user in
