src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -27,13 +27,13 @@ private String maintenancePlanTimeReq; @ApiModelProperty("计划保养日期") private LocalDateTime maintenancePlanTime; private String maintenancePlanTime; @ApiModelProperty("实际保养人") private String maintenanceActuallyName; @ApiModelProperty("实际保养日期") private LocalDateTime maintenanceActuallyTime; private String maintenanceActuallyTime; @ApiModelProperty("实际保养日期") private String maintenanceActuallyTimeReq; src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
@@ -64,6 +64,9 @@ public IPage<InspectionTaskDto> selectInspectionTaskList(Page<InspectionTask> page, InspectionTaskDto inspectionTaskDto) { LambdaQueryWrapper<InspectionTask> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.orderByDesc(InspectionTask::getCreateTime); if (StringUtils.isNotBlank(inspectionTaskDto.getTaskName())) { queryWrapper.like(InspectionTask::getTaskName, inspectionTaskDto.getTaskName()); } IPage<InspectionTask> entityPage = inspectionTaskMapper.selectPage(page, queryWrapper); // 无数据提前返回 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
@@ -1,5 +1,6 @@ package com.ruoyi.inspectiontask.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -47,7 +48,12 @@ @Override public IPage<TimingTaskDto> selectTimingTaskList(Page<TimingTask> page, TimingTask timingTask) { // 1. 先分页查询定时任务数据 IPage<TimingTask> taskPage = timingTaskMapper.selectPage(page, null); // 构建查询条件 LambdaQueryWrapper<TimingTask> queryWrapper = new LambdaQueryWrapper<>(); if (StringUtils.isNotBlank(timingTask.getTaskName())) { queryWrapper.like(TimingTask::getTaskName, timingTask.getTaskName()); } IPage<TimingTask> taskPage = timingTaskMapper.selectPage(page, queryWrapper); // 2. 如果没有数据，直接返回空分页 if (taskPage.getRecords().isEmpty()) { src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
@@ -8,6 +8,7 @@ import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord; import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerRecordService; import io.jsonwebtoken.lang.Collections; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; /** * @author :yys @@ -50,6 +52,14 @@ return AjaxResult.error(); } @DeleteMapping("/delete") @ApiOperation("计量器具台账记录-删除") @Log(title = "计量器具台账记录-删除", businessType = BusinessType.DELETE) public AjaxResult delete(@RequestBody List<Long> ids) { if(Collections.isEmpty(ids)) return AjaxResult.error("请选择要删除的数据"); return AjaxResult.success(measuringInstrumentLedgerRecordService.removeBatchByIds(ids)); } /** * 导出计量器具台账 */ src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -14,10 +14,7 @@ import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum; import com.ruoyi.common.enums.StockUnQualifiedRecordTypeEnum; import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper; import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut; import com.ruoyi.procurementrecord.utils.StockUtils; import com.ruoyi.production.controller.ProductWorkOrderController; import com.ruoyi.production.dto.ProductStructureDto; import com.ruoyi.production.dto.ProductionProductMainDto; import com.ruoyi.production.mapper.*; @@ -44,10 +41,8 @@ @Transactional(rollbackFor = Exception.class) public class ProductionProductMainServiceImpl extends ServiceImpl<ProductionProductMainMapper, ProductionProductMain> implements ProductionProductMainService { private final ProcurementRecordOutMapper procurementRecordOutMapper; private ProductionProductMainMapper productionProductMainMapper; private ProductWorkOrderController productWorkOrderController; private ProductWorkOrderMapper productWorkOrderMapper; @@ -56,7 +51,6 @@ private ProductionProductOutputMapper productionProductOutputMapper; private ProcessRouteItemMapper processRouteItemMapper; private ProductModelMapper productModelMapper; @@ -69,7 +63,6 @@ private QualityTestStandardParamMapper qualityTestStandardParamMapper; private QualityTestStandardBindingMapper qualityTestStandardBindingMapper; private QualityTestStandardMapper qualityTestStandardMapper; private QualityInspectParamMapper qualityInspectParamMapper; @@ -163,21 +156,8 @@ productionProductInput.setQuantity(productStructureDto.getUnitQuantity().multiply(dto.getQuantity())); productionProductInput.setProductMainId(productionProductMain.getId()); productionProductInputMapper.insert(productionProductInput); //对应的库存出库 DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyyMMdd"); LocalDate now = LocalDate.now(); ProcurementRecordOut procurementRecordOut1 = procurementRecordOutMapper.selectCode(dateFormat.format(now)); Long aLong = procurementRecordOut1 == null ? 1L : Long.valueOf(procurementRecordOut1.getCode().split("LS" + dateFormat.format(now))[1]); ProcurementRecordOut.ProcurementRecordOutBuilder procurementRecordOut = ProcurementRecordOut.builder() .procurementRecordStorageId(0) .code("LS" + dateFormat.format(now) + String.format("%03d", aLong + 1)) .salesLedgerProductId(productionProductMain.getId())//关联报工产出 .inboundBatches(aLong.equals(0L) ? "第1批次" : "第" + (aLong + 1) + "批次") .inboundNum(productionProductInput.getQuantity()) .type(4) .createBy(user.getNickName()) .productModelId(productModel1.getId()); procurementRecordOutMapper.insert(procurementRecordOut.build()); stockUtils.substractStock(productStructureDto.getProductModelId(), productionProductInput.getQuantity(), StockQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode(), productionProductMain.getId()); } /*新增报工产出表*/ ProductionProductOutput productionProductOutput = new ProductionProductOutput(); @@ -311,13 +291,13 @@ // 删除产出记录 productionProductOutputMapper.delete(new LambdaQueryWrapper<ProductionProductOutput>() .eq(ProductionProductOutput::getProductMainId, productionProductMain.getId())); /*删除投入*/ procurementRecordOutMapper.delete(new LambdaQueryWrapper<ProcurementRecordOut>() .eq(ProcurementRecordOut::getSalesLedgerProductId, productionProductMain.getId())); //删除入库 productionProductInputMapper.delete(new LambdaQueryWrapper<ProductionProductInput>() .eq(ProductionProductInput::getProductMainId, productionProductMain.getId())); //删除报废的入库记录 stockUtils.deleteStockRecord(productionProductMain.getId(), StockUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode()); //删除投入对应的出库记录 stockUtils.deleteStockRecord(productionProductMain.getId(), StockQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode()); // 删除主表 productionProductMainMapper.deleteById(productionProductMain.getId()); return true; src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -44,6 +44,10 @@ <if test="deviceMaintenanceDto.maintenanceActuallyTimeReq != null"> and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTimeReq},'%') </if> <if test="deviceMaintenanceDto.maintenanceActuallyTime != null"> and dm.maintenance_actually_time >= str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d') and dm.maintenance_actually_time < date_add(str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d'), interval 1 day) </if> </where> </select> <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto"> src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
@@ -40,10 +40,10 @@ <if test="req.status != null"> <choose> <when test="req.status == 1"> AND next_date >= DATE_FORMAT(now(),'%Y-%m-%d') AND most_date >= DATE_FORMAT(now(),'%Y-%m-%d') </when> <when test="req.status == 2"> AND next_date < DATE_FORMAT(now(),'%Y-%m-%d') AND most_date < DATE_FORMAT(now(),'%Y-%m-%d') </when> </choose> </if>
