src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
@@ -25,7 +25,7 @@ */ @RestController @Api(tags = "计量器具台账记录") @RequestMapping("Record") @RequestMapping("/measuringInstrumentLedgerRecord") public class MeasuringInstrumentLedgerRecordController extends BaseController { @Autowired src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
@@ -67,7 +67,7 @@ @Override public int addOrUpdate(SafeTraining safeTraining) { if (ObjectUtils.isNull(safeTraining.getId())) { String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd")); String datePrefix ="KC-"+ LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd")); // 查询今日已存在的最大课程编号 QueryWrapper<SafeTraining> queryWrapper = new QueryWrapper<>(); queryWrapper.likeRight("course_code", datePrefix) @@ -87,7 +87,7 @@ } } // 生成完整的课程编号 String no = "KC-" + String.format("%s%03d", datePrefix, sequenceNumber); String no = String.format("%s%03d", datePrefix, sequenceNumber); safeTraining.setCourseCode(no); } //根据时间判断培训状态 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -173,6 +173,14 @@ product.setTempNoInvoiceNum(product.getNoInvoiceNum()); product.setRegister(SecurityUtils.getLoginUser().getUser().getNickName()); product.setRegisterDate(LocalDateTime.now()); // 发货信息 ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>() .eq(ShippingInfo::getSalesLedgerProductId, product.getId()) .orderByDesc(ShippingInfo::getCreateTime) .last("limit 1")); if(shippingInfo != null){ product.setShippingStatus(shippingInfo.getStatus()); } } // 3.查询上传文件 @@ -542,7 +550,7 @@ } // 删除发货台账记录 List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>() .eq(ShippingInfo::getSalesLedgerId, idList)); .in(ShippingInfo::getSalesLedgerId, idList)); if(CollectionUtils.isNotEmpty(shippingInfos)){ shippingInfoServiceImpl.delete(shippingInfos.stream().map(ShippingInfo::getId).collect(Collectors.toList())); } src/main/resources/mapper/safe/SafeTrainingMapper.xml
@@ -38,6 +38,7 @@ left join safe_training_details std on std.safe_training_id = st.id left join sys_user su on st.assessment_user_id = su.user_id where st.state = #{c.state} GROUP BY st.id <if test="c.placeTraining != null and c.placeTraining != ''"> and st.place_training like concat('%', #{c.placeTraining}, '%') </if>
