Skip to content

H
hzsomms
Commit 06942fdb authored by hkl's avatar hkl
Browse files
Options

feat:1.pc端维修记录调整

parent 3ee2cf8a
Hide whitespace changes
Inline Side-by-side
Showing with 621 additions and 54 deletions
jeecg-module-system/src/main/java/org/jeecg/codegenerate/CodeGenerate.java
View file @ 06942fdb
......@@ -13,7 +13,7 @@ import java.util.HashMap;
import java.util.Map;
public class CodeGenerate {
public static String url = "jdbc:mysql://47.94.207.62:3306/hzgw?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull";
public static String url = "jdbc:mysql://47.94.207.62:3306/hzgw2?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull";
public static String username = "root";
public static String password = "superAdmin&321";
......@@ -25,11 +25,11 @@ public class CodeGenerate {
String outputDir = projectPath + "\\jeecg-module-system\\src\\main\\java\\";
// 模块名
String moduleName = "checkData";
String moduleName = "maintenanceWork";
// 表名
String[] tables = {
"t_djt_movement_additive_info_unit_device_map",
"t_mw_work_batch_detail_modify",
};
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/controller/WorkBatchController.java
View file @ 06942fdb
......@@ -9,12 +9,19 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.maintenanceWork.dto.*;
import org.jeecg.modules.maintenanceWork.entity.WorkBatch;
import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetail;
import org.jeecg.modules.maintenanceWork.service.IWorkBatchService;
import org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailModifyVO;
import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailService;
import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailModifyService;
import org.jeecg.modules.maintenanceWork.vo.WorkUnitDeviceModifyVO;
import org.springframework.web.bind.annotation.*;
import org.jeecg.common.system.base.controller.JeecgController;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
......@@ -30,6 +37,12 @@ import java.util.Map;
@Api(tags = "维修作业管理-作业计划批次管理")
public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchService> {
@Resource
private IWorkBatchDetailService workBatchDetailService;
@Resource
private IWorkBatchDetailModifyService workBatchDetailModifyService;
@AutoLog(value = "维修作业管理-作业计划批次管理-分页列表查询")
@ApiOperation(value = "维修作业管理-作业计划批次管理-分页列表查询", notes = "维修作业管理-作业计划批次管理-分页列表查询")
@GetMapping(value = "/listRecord")
......@@ -91,4 +104,22 @@ public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchSe
}
@AutoLog(value = "维修作业管理-作业计划批次管理-获取整改")
@ApiOperation(value = "维修作业管理-作业计划批次管理-获取整改", notes = "维修作业-维修作业批列表-获取设备列表")
@GetMapping(value = "/getUnitDeviceModify")
public Result<WorkUnitDeviceModifyVO> getUnitDeviceModify(String workBatchDetailId) {
WorkBatchDetail workBatchDetail = workBatchDetailService.getById(workBatchDetailId);
WorkUnitDeviceModifyVO vo = new WorkUnitDeviceModifyVO();
vo.setWorkBatchDetailId(workBatchDetail.getId());
vo.setReformRemark(workBatchDetail.getReformRemark());
List<WorkBatchDetailModifyVO> detailList = workBatchDetailModifyService.getUnitDeviceModify(workBatchDetailId);
vo.setDetailList(detailList);
return Result.ok(vo);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetail.java
View file @ 06942fdb
......@@ -105,7 +105,19 @@ public class WorkBatchDetail implements Serializable {
@TableField("unit_score")
private BigDecimal unitScore;
@ApiModelProperty("备注")
@ApiModelProperty("作业状态 0-未作业 9-已作业")
@TableField("work_status")
private Integer workStatus;
@ApiModelProperty("病害里程")
@TableField("disease_mileage")
private BigDecimal diseaseMileage;
@ApiModelProperty("整改备注")
@TableField("reform_remark")
private String reformRemark;
@ApiModelProperty("维修建议")
@TableField("remark")
private String remark;
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetailModify.java 0 → 100644
View file @ 06942fdb
package org.jeecg.modules.maintenanceWork.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态几何尺寸对应得里程相关信息详情表
* </p>
*
* @author hkl
* @since 2023-09-14
*/
@Getter
@Setter
@TableName("t_mw_work_batch_detail_modify")
@ApiModel(value = "WorkBatchDetailModify对象", description = "动静态几何尺寸对应得里程相关信息详情表")
public class WorkBatchDetailModify implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("作业计划批次id")
@TableField("work_batch_id")
private String workBatchId;
@ApiModelProperty("作业计划批次code")
@TableField("work_batch_code")
private String workBatchCode;
@ApiModelProperty("作业计划详情id")
@TableField("work_batch_detail_id")
private String workBatchDetailId;
@ApiModelProperty("单元设备id")
@TableField("unit_id")
private String unitId;
@ApiModelProperty("单元设备code")
@TableField("unit_code")
private String unitCode;
@ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
@TableField("unit_type")
private Integer unitType;
@ApiModelProperty("设备单元类型名称")
@TableField("unit_type_name")
private String unitTypeName;
@ApiModelProperty("设备编号")
@TableField("unit_device_code")
private String unitDeviceCode;
@ApiModelProperty("设备单元起始里程")
@TableField("unit_start_mileage")
private BigDecimal unitStartMileage;
@ApiModelProperty("设备单元中心里程")
@TableField("unit_center_mileage")
private BigDecimal unitCenterMileage;
@ApiModelProperty("设备单元结束里程")
@TableField("unit_end_mileage")
private BigDecimal unitEndMileage;
@ApiModelProperty("测点")
@TableField("measure_point")
private Integer measurePoint;
@ApiModelProperty("轨距")
@TableField("track_gauge")
private String trackGauge;
@ApiModelProperty("水平")
@TableField("level")
private String level;
@ApiModelProperty("三角坑")
@TableField("triangular_pit")
private String triangularPit;
@ApiModelProperty("方向")
@TableField("direction")
private String direction;
@ApiModelProperty("高低")
@TableField("height")
private String height;
@ApiModelProperty("结构")
@TableField("structure")
private String structure;
@ApiModelProperty("整改")
@TableField("rectification")
private String rectification;
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/WorkBatchDetailModifyMapper.java 0 → 100644
View file @ 06942fdb
package org.jeecg.modules.maintenanceWork.mapper;
import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailModify;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailModifyVO;
import java.util.List;
/**
* <p>
* 动静态几何尺寸对应得里程相关信息详情表 Mapper 接口
* </p>
*
* @author hkl
* @since 2023-09-14
*/
public interface WorkBatchDetailModifyMapper extends BaseMapper<WorkBatchDetailModify> {
List<WorkBatchDetailModifyVO> getUnitDeviceModify(String workBatchDetailId);
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailMapper.xml
View file @ 06942fdb
......@@ -22,27 +22,4 @@
FROM t_mw_work_batch_detail t1
WHERE t1.work_batch_id = #{workBatchId}
</select>
<select id="caseReportWorkBatchDetail"
resultType="org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchDetailVO">
SELECT t1.id,
t1.work_batch_id,
t1.work_batch_code,
t1.analysis_batch_unit_device_id,
t1.unit_id,
t1.unit_code,
t1.unit_type,
t1.unit_type_name,
t1.unit_device_code,
t1.unit_start_mileage,
t1.unit_center_mileage,
t1.unit_end_mileage,
t1.unit_score_level,
t1.unit_score_level_str,
t1.unit_score,
t1.remark
FROM t_mw_work_batch_detail t1
WHERE t1.work_batch_id = #{workBatchId}
AND t1.unit_id = #{unitId}
</select>
</mapper>
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailModifyMapper.xml 0 → 100644
View file @ 06942fdb
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailModifyMapper">
<select id="getUnitDeviceModify" resultType="org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailModifyVO">
SELECT
t1.id,
t1.work_batch_id,
t1.work_batch_code,
t1.work_batch_detail_id,
t1.unit_id,
t1.unit_code,
t1.unit_type,
t1.unit_type_name,
t1.unit_device_code,
t1.unit_start_mileage,
t1.unit_center_mileage,
t1.unit_end_mileage,
t1.measure_point,
t1.track_gauge,
t1.LEVEL,
t1.triangular_pit,
t1.direction,
t1.height,
t1.structure,
t1.rectification
FROM
t_mw_work_batch_detail_modify t1 WHERE t1.work_batch_detail_id = #{workBatchDetailId}
</select>
</mapper>
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchMapper.xml
View file @ 06942fdb
......@@ -112,6 +112,7 @@
</select>
<select id="caseReportWorkBatch" resultType="org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchVO">
SELECT
t1.workBatchDetailId,
t1.unit_id,
t2.id workBatchId,
t2.create_by,
......@@ -132,7 +133,7 @@
t2.work_status,
t2.del_flag
FROM
( SELECT work_batch_id, unit_id, unit_type FROM t_mw_work_batch_detail WHERE unit_id = #{dto.unitId} AND unit_type = #{dto.unitType} ) t1
( SELECT work_batch_id, unit_id, unit_type,id as workBatchDetailId FROM t_mw_work_batch_detail WHERE unit_id = #{dto.unitId} AND unit_type = #{dto.unitType} ) t1
LEFT JOIN t_mw_work_batch t2 ON t1.work_batch_id = t2.id AND t2.del_flag = '0'
ORDER BY t2.create_time
</select>
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/other/WorkBatchDetailModifyDTO.java 0 → 100644
View file @ 06942fdb
package org.jeecg.modules.maintenanceWork.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态几何尺寸对应得里程相关信息详情表
* </p>
*
* @author hkl
* @since 2023-09-14
*/
@Getter
@Setter
@ApiModel(value = "WorkBatchDetailModify对象", description = "动静态几何尺寸对应得里程相关信息详情表")
public class WorkBatchDetailModifyDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建日期")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("作业计划批次id")
private String workBatchId;
@ApiModelProperty("作业计划批次code")
private String workBatchCode;
@ApiModelProperty("作业计划详情id")
private String workBatchDetailId;
@ApiModelProperty("单元设备id")
private String unitId;
@ApiModelProperty("单元设备code")
private String unitCode;
@ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
private Integer unitType;
@ApiModelProperty("设备单元类型名称")
private String unitTypeName;
@ApiModelProperty("设备编号")
private String unitDeviceCode;
@ApiModelProperty("设备单元起始里程")
private BigDecimal unitStartMileage;
@ApiModelProperty("设备单元中心里程")
private BigDecimal unitCenterMileage;
@ApiModelProperty("设备单元结束里程")
private BigDecimal unitEndMileage;
@ApiModelProperty("测点")
private Integer measurePoint;
@ApiModelProperty("轨距")
private String trackGauge;
@ApiModelProperty("水平")
private String level;
@ApiModelProperty("三角坑")
private String triangularPit;
@ApiModelProperty("方向")
private String direction;
@ApiModelProperty("高低")
private String height;
@ApiModelProperty("结构")
private String structure;
@ApiModelProperty("整改")
private String rectification;
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/other/WorkBatchDetailModifyVO.java 0 → 100644
View file @ 06942fdb
package org.jeecg.modules.maintenanceWork.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态几何尺寸对应得里程相关信息详情表
* </p>
*
* @author hkl
* @since 2023-09-14
*/
@Getter
@Setter
@ApiModel(value = "WorkBatchDetailModify对象", description = "动静态几何尺寸对应得里程相关信息详情表")
public class WorkBatchDetailModifyVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("作业计划批次id")
@TableField("work_batch_id")
private String workBatchId;
@ApiModelProperty("作业计划批次code")
@TableField("work_batch_code")
private String workBatchCode;
@ApiModelProperty("作业计划详情id")
@TableField("work_batch_detail_id")
private String workBatchDetailId;
@ApiModelProperty("单元设备id")
@TableField("unit_id")
private String unitId;
@ApiModelProperty("单元设备code")
@TableField("unit_code")
private String unitCode;
@ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
@TableField("unit_type")
private Integer unitType;
@ApiModelProperty("设备单元类型名称")
@TableField("unit_type_name")
private String unitTypeName;
@ApiModelProperty("设备编号")
@TableField("unit_device_code")
private String unitDeviceCode;
@ApiModelProperty("设备单元起始里程")
@TableField("unit_start_mileage")
private BigDecimal unitStartMileage;
@ApiModelProperty("设备单元中心里程")
@TableField("unit_center_mileage")
private BigDecimal unitCenterMileage;
@ApiModelProperty("设备单元结束里程")
@TableField("unit_end_mileage")
private BigDecimal unitEndMileage;
@ApiModelProperty("测点")
@TableField("measure_point")
private Integer measurePoint;
@ApiModelProperty("轨距")
@TableField("track_gauge")
private String trackGauge;
@ApiModelProperty("水平")
@TableField("level")
private String level;
@ApiModelProperty("三角坑")
@TableField("triangular_pit")
private String triangularPit;
@ApiModelProperty("方向")
@TableField("direction")
private String direction;
@ApiModelProperty("高低")
@TableField("height")
private String height;
@ApiModelProperty("结构")
@TableField("structure")
private String structure;
@ApiModelProperty("整改")
@TableField("rectification")
private String rectification;
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/IWorkBatchDetailModifyService.java 0 → 100644
View file @ 06942fdb
package org.jeecg.modules.maintenanceWork.service;
import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailModify;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailModifyVO;
import java.util.List;
/**
* <p>
* 动静态几何尺寸对应得里程相关信息详情表 服务类
* </p>
*
* @author hkl
* @since 2023-09-14
*/
public interface IWorkBatchDetailModifyService extends IService<WorkBatchDetailModify> {
List<WorkBatchDetailModifyVO> getUnitDeviceModify(String workBatchDetailId);
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/IWorkBatchDetailService.java
View file @ 06942fdb
......@@ -17,5 +17,4 @@ import java.util.List;
*/
public interface IWorkBatchDetailService extends IService<WorkBatchDetail> {
List<CaseReportWorkBatchDetailVO> caseReportWorkBatchDetail(CaseReportWorkBatchDetailDTO dto);
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchDetailModifyServiceImpl.java 0 → 100644
View file @ 06942fdb
package org.jeecg.modules.maintenanceWork.service.impl;
import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailModify;
import org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailModifyMapper;
import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailModifyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailModifyVO;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 动静态几何尺寸对应得里程相关信息详情表 服务实现类
* </p>
*
* @author hkl
* @since 2023-09-14
*/
@Service
public class WorkBatchDetailModifyServiceImpl extends ServiceImpl<WorkBatchDetailModifyMapper, WorkBatchDetailModify> implements IWorkBatchDetailModifyService {
@Override
public List<WorkBatchDetailModifyVO> getUnitDeviceModify(String workBatchDetailId) {
return this.baseMapper.getUnitDeviceModify(workBatchDetailId);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchDetailServiceImpl.java
View file @ 06942fdb
......@@ -21,8 +21,4 @@ import java.util.List;
@Service
public class WorkBatchDetailServiceImpl extends ServiceImpl<WorkBatchDetailMapper, WorkBatchDetail> implements IWorkBatchDetailService {
@Override
public List<CaseReportWorkBatchDetailVO> caseReportWorkBatchDetail(CaseReportWorkBatchDetailDTO dto) {
return this.baseMapper.caseReportWorkBatchDetail(dto);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchDetailModifyVO.java 0 → 100644
View file @ 06942fdb
package org.jeecg.modules.maintenanceWork.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* <p>
* 动静态几何尺寸对应得里程相关信息详情表
* </p>
*
* @author hkl
* @since 2023-09-12
*/
@Data
public class WorkBatchDetailModifyVO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("作业计划批次id")
private String workBatchId;
@ApiModelProperty("作业计划批次code")
private String workBatchCode;
@ApiModelProperty("作业计划详情id")
private String workBatchDetailId;
@ApiModelProperty("单元设备id")
private String unitId;
@ApiModelProperty("单元设备code")
private String unitCode;
@ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
private Integer unitType;
@ApiModelProperty("设备单元类型名称")
private String unitTypeName;
@ApiModelProperty("设备编号")
private String unitDeviceCode;
@ApiModelProperty("设备单元起始里程")
private BigDecimal unitStartMileage;
@ApiModelProperty("设备单元中心里程")
private BigDecimal unitCenterMileage;
@ApiModelProperty("设备单元结束里程")
private BigDecimal unitEndMileage;
@ApiModelProperty("测点")
private Integer measurePoint;
@ApiModelProperty("轨距")
private String trackGauge;
@ApiModelProperty("水平")
private String level;
@ApiModelProperty("三角坑")
private String triangularPit;
@ApiModelProperty("方向")
private String direction;
@ApiModelProperty("高低")
private String height;
@ApiModelProperty("结构")
private String structure;
@ApiModelProperty("整改")
private String rectification;
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkUnitDeviceModifyVO.java 0 → 100644
View file @ 06942fdb
package org.jeecg.modules.maintenanceWork.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* <p>
* 维修作业管理-整改详情
* </p>
*
* @author hkl
* @since 2023-09-13 10:32:01
*/
@Data
@ApiModel(value = "WorkUnitDeviceModifyVO对象", description = "维修作业管理-整改详情")
public class WorkUnitDeviceModifyVO implements Serializable {
@ApiModelProperty("作业计划详情id")
private String workBatchDetailId;
@ApiModelProperty("整改备注")
private String reformRemark;
@ApiModelProperty("整改详情")
private List<WorkBatchDetailModifyVO> detailList;
}
jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/controller/UnitDeviceController.java
View file @ 06942fdb
......@@ -15,10 +15,7 @@ import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDTO;
import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDetailDTO;
import org.jeecg.modules.unitDevice.face.IUnitDeviceFace;
import org.jeecg.modules.unitDevice.vo.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
......@@ -84,12 +81,4 @@ public class UnitDeviceController {
}
@AutoLog(value = "单元设备-设备病历本-作业批次列表")
@ApiOperation(value = "单元设备-设备病历本-作业批次列表", notes = "单元设备-设备病历本-作业批次列表")
@GetMapping(value = "/caseReportWorkBatchDetail")
public Result<List<CaseReportWorkBatchDetailVO>> caseReportWorkBatchDetail(CaseReportWorkBatchDetailDTO dto) {
return Result.OK(unitDeviceFace.caseReportWorkBatchDetail(dto));
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/face/IUnitDeviceFace.java
View file @ 06942fdb
......@@ -24,6 +24,4 @@ public interface IUnitDeviceFace {
Page<CaseReportWorkBatchVO> caseReportWorkBatch(Page<CaseReportWorkBatchVO> pageData, CaseReportWorkBatchDTO dto);
List<CaseReportWorkBatchDetailVO> caseReportWorkBatchDetail(CaseReportWorkBatchDetailDTO dto);
}
jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/face/impl/UnitDeviceFaceImpl.java
View file @ 06942fdb
......@@ -114,13 +114,6 @@ public class UnitDeviceFaceImpl implements IUnitDeviceFace {
@Override
public Page<CaseReportWorkBatchVO> caseReportWorkBatch(Page<CaseReportWorkBatchVO> pageData, CaseReportWorkBatchDTO dto) {
return workBatchService.caseReportWorkBatch(pageData, dto);
}
@Override
public List<CaseReportWorkBatchDetailVO> caseReportWorkBatchDetail(CaseReportWorkBatchDetailDTO dto) {
return workBatchDetailService.caseReportWorkBatchDetail(dto);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/vo/CaseReportWorkBatchVO.java
View file @ 06942fdb
......@@ -13,6 +13,9 @@ import java.util.Date;
public class CaseReportWorkBatchVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("作业计划批次明细ID")
private String workBatchDetailId;
@ApiModelProperty("单元ID")
private String unitId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment