diff --git a/aucma-api/src/main/java/com/aucma/api/controller/ElectricalInspectionController.java b/aucma-api/src/main/java/com/aucma/api/controller/ElectricalInspectionController.java index 31b5ac4..0205eed 100644 --- a/aucma-api/src/main/java/com/aucma/api/controller/ElectricalInspectionController.java +++ b/aucma-api/src/main/java/com/aucma/api/controller/ElectricalInspectionController.java @@ -33,7 +33,7 @@ public class ElectricalInspectionController { * @param paramMap * @return */ - @PostMapping("/electricalInspection") + @PostMapping("/electricalInspectionElectricalinspection") public HashMap getSAPMaterialData(@RequestBody Map paramMap) { return electricalInspectionService.analysisElectricalInspectionData(paramMap); } diff --git a/aucma-report/src/main/java/com/aucma/report/controller/BoxTemperatureHistoryController.java b/aucma-report/src/main/java/com/aucma/report/controller/BoxTemperatureHistoryController.java new file mode 100644 index 0000000..afea20d --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/controller/BoxTemperatureHistoryController.java @@ -0,0 +1,98 @@ +package com.aucma.report.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.aucma.common.annotation.Log; +import com.aucma.common.core.controller.BaseController; +import com.aucma.common.core.domain.AjaxResult; +import com.aucma.common.enums.BusinessType; +import com.aucma.report.domain.BoxTemperatureHistory; +import com.aucma.report.service.IBoxTemperatureHistoryService; +import com.aucma.common.utils.poi.ExcelUtil; +import com.aucma.common.core.page.TableDataInfo; + +/** + * 测温记录报表Controller + * + * @author Yinq + * @date 2024-03-13 + */ +@RestController +@RequestMapping("/report/temperatureHistory" ) +public class BoxTemperatureHistoryController extends BaseController { + @Autowired + private IBoxTemperatureHistoryService boxTemperatureHistoryService; + + /** + * 查询测温记录报表列表 + */ +// @PreAuthorize("@ss.hasPermi('report:temperatureHistory:list')" ) + @GetMapping("/list" ) + public TableDataInfo list(BoxTemperatureHistory boxTemperatureHistory) { + startPage(); + List list = boxTemperatureHistoryService.selectBoxTemperatureHistoryList(boxTemperatureHistory); + return getDataTable(list); + } + + /** + * 导出测温记录报表列表 + */ +// @PreAuthorize("@ss.hasPermi('report:temperatureHistory:export')" ) + @Log(title = "测温记录报表" , businessType = BusinessType.EXPORT) + @PostMapping("/export" ) + public void export(HttpServletResponse response, BoxTemperatureHistory boxTemperatureHistory) { + List list = boxTemperatureHistoryService.selectBoxTemperatureHistoryList(boxTemperatureHistory); + ExcelUtil util = new ExcelUtil(BoxTemperatureHistory. class); + util.exportExcel(response, list, "测温记录报表数据" ); + } + + /** + * 获取测温记录报表详细信息 + */ +// @PreAuthorize("@ss.hasPermi('report:temperatureHistory:query')" ) + @GetMapping(value = "/{objId}" ) + public AjaxResult getInfo(@PathVariable("objId" ) Long objId) { + return success(boxTemperatureHistoryService.selectBoxTemperatureHistoryByObjId(objId)); + } + + /** + * 新增测温记录报表 + */ + @PreAuthorize("@ss.hasPermi('report:temperatureHistory:add')" ) + @Log(title = "测温记录报表" , businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BoxTemperatureHistory boxTemperatureHistory) { + return toAjax(boxTemperatureHistoryService.insertBoxTemperatureHistory(boxTemperatureHistory)); + } + + /** + * 修改测温记录报表 + */ + @PreAuthorize("@ss.hasPermi('report:temperatureHistory:edit')" ) + @Log(title = "测温记录报表" , businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BoxTemperatureHistory boxTemperatureHistory) { + return toAjax(boxTemperatureHistoryService.updateBoxTemperatureHistory(boxTemperatureHistory)); + } + + /** + * 删除测温记录报表 + */ + @PreAuthorize("@ss.hasPermi('report:temperatureHistory:remove')" ) + @Log(title = "测温记录报表" , businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}" ) + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(boxTemperatureHistoryService.deleteBoxTemperatureHistoryByObjIds(objIds)); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/domain/BoxTemperatureHistory.java b/aucma-report/src/main/java/com/aucma/report/domain/BoxTemperatureHistory.java new file mode 100644 index 0000000..e4e32f4 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/BoxTemperatureHistory.java @@ -0,0 +1,433 @@ +package com.aucma.report.domain; + +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; + +/** + * 测温记录报表对象 box_temperaturehistory + * + * @author Yinq + * @date 2024-03-13 + */ +public class BoxTemperatureHistory extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long objId; + + /** + * 线号 + */ + @Excel(name = "线号") + private Long lineNo; + + /** + * 工位号 + */ + @Excel(name = "工位号") + private Long gongwno; + + /** + * 产品条码 + */ + @Excel(name = "产品条码") + private String cpno; + + /** + * 产品型号 + */ + @Excel(name = "产品型号") + private String cpmodel; + + /** + * 基准型号 + */ + @Excel(name = "基准型号") + private String factorymodel; + + /** + * 工作电压 + */ + @Excel(name = "工作电压") + private Long voltage; + + /** + * 测试通道 + */ + @Excel(name = "测试通道") + private String point2; + + /** + * 计划测试时间 + */ + @Excel(name = "计划测试时间") + private Long testtime; + + /** + * 实际测试时间 + */ + @Excel(name = "实际测试时间") + private Long testedtime; + + /** + * 环温 + */ + @Excel(name = "环温") + private Long etemp; + + /** + * 开始测试时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "开始测试时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date begindatetime; + + /** + * 测试结果 + */ + @Excel(name = "测试结果") + private String cpresult; + + /** + * 测试结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "测试结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date enddatetime; + + /** + * 系统用户 + */ + @Excel(name = "系统用户") + private String username; + + /** + * 第几次测试 + */ + @Excel(name = "第几次测试") + private Long testno; + + /** + * 温度数据 + */ + @Excel(name = "温度数据") + private String tempMes; + + /** + * 功率数据 + */ + @Excel(name = "功率数据") + private String powerMes; + + /** + * 部件测试数据 + */ + @Excel(name = "部件测试数据") + private String partMes; + + /** + * 是否测试部件(”Y”测试) + */ + @Excel(name = "是否测试部件", readConverterExp = "”=Y”测试") + private String isorder; + + /** + * 低压启动测试时间 + */ + @Excel(name = "低压启动测试时间") + private Long lowvTime; + + /** + * 低压启动标准下限 + */ + @Excel(name = "低压启动标准下限") + private Long lowvPowermin; + + /** + * 低压启动标准上限 + */ + @Excel(name = "低压启动标准上限") + private Long lowvPowermax; + + /** + * 低压启动实际采集值 + */ + @Excel(name = "低压启动实际采集值") + private Long lowvPowerfact; + + /** + * 低压启动测试电压 + */ + @Excel(name = "低压启动测试电压") + private Long lowvoltage; + + /** + * 同步时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "同步时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date syncDatetime; + + /** + * 供电频率 + */ + @Excel(name = "供电频率") + private Long frequency; + + public void setObjId(Long objId) { + this.objId = objId; + } + + public Long getObjId() { + return objId; + } + + public void setLineNo(Long lineNo) { + this.lineNo = lineNo; + } + + public Long getLineNo() { + return lineNo; + } + + public void setGongwno(Long gongwno) { + this.gongwno = gongwno; + } + + public Long getGongwno() { + return gongwno; + } + + public void setCpno(String cpno) { + this.cpno = cpno; + } + + public String getCpno() { + return cpno; + } + + public void setCpmodel(String cpmodel) { + this.cpmodel = cpmodel; + } + + public String getCpmodel() { + return cpmodel; + } + + public void setFactorymodel(String factorymodel) { + this.factorymodel = factorymodel; + } + + public String getFactorymodel() { + return factorymodel; + } + + public void setVoltage(Long voltage) { + this.voltage = voltage; + } + + public Long getVoltage() { + return voltage; + } + + public void setPoint2(String point2) { + this.point2 = point2; + } + + public String getPoint2() { + return point2; + } + + public void setTesttime(Long testtime) { + this.testtime = testtime; + } + + public Long getTesttime() { + return testtime; + } + + public void setTestedtime(Long testedtime) { + this.testedtime = testedtime; + } + + public Long getTestedtime() { + return testedtime; + } + + public void setEtemp(Long etemp) { + this.etemp = etemp; + } + + public Long getEtemp() { + return etemp; + } + + public void setBegindatetime(Date begindatetime) { + this.begindatetime = begindatetime; + } + + public Date getBegindatetime() { + return begindatetime; + } + + public void setCpresult(String cpresult) { + this.cpresult = cpresult; + } + + public String getCpresult() { + return cpresult; + } + + public void setEnddatetime(Date enddatetime) { + this.enddatetime = enddatetime; + } + + public Date getEnddatetime() { + return enddatetime; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getUsername() { + return username; + } + + public void setTestno(Long testno) { + this.testno = testno; + } + + public Long getTestno() { + return testno; + } + + public void setTempMes(String tempMes) { + this.tempMes = tempMes; + } + + public String getTempMes() { + return tempMes; + } + + public void setPowerMes(String powerMes) { + this.powerMes = powerMes; + } + + public String getPowerMes() { + return powerMes; + } + + public void setPartMes(String partMes) { + this.partMes = partMes; + } + + public String getPartMes() { + return partMes; + } + + public void setIsorder(String isorder) { + this.isorder = isorder; + } + + public String getIsorder() { + return isorder; + } + + public void setLowvTime(Long lowvTime) { + this.lowvTime = lowvTime; + } + + public Long getLowvTime() { + return lowvTime; + } + + public void setLowvPowermin(Long lowvPowermin) { + this.lowvPowermin = lowvPowermin; + } + + public Long getLowvPowermin() { + return lowvPowermin; + } + + public void setLowvPowermax(Long lowvPowermax) { + this.lowvPowermax = lowvPowermax; + } + + public Long getLowvPowermax() { + return lowvPowermax; + } + + public void setLowvPowerfact(Long lowvPowerfact) { + this.lowvPowerfact = lowvPowerfact; + } + + public Long getLowvPowerfact() { + return lowvPowerfact; + } + + public void setLowvoltage(Long lowvoltage) { + this.lowvoltage = lowvoltage; + } + + public Long getLowvoltage() { + return lowvoltage; + } + + public void setSyncDatetime(Date syncDatetime) { + this.syncDatetime = syncDatetime; + } + + public Date getSyncDatetime() { + return syncDatetime; + } + + public void setFrequency(Long frequency) { + this.frequency = frequency; + } + + public Long getFrequency() { + return frequency; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("lineNo", getLineNo()) + .append("gongwno", getGongwno()) + .append("cpno", getCpno()) + .append("cpmodel", getCpmodel()) + .append("factorymodel", getFactorymodel()) + .append("voltage", getVoltage()) + .append("point2", getPoint2()) + .append("testtime", getTesttime()) + .append("testedtime", getTestedtime()) + .append("etemp", getEtemp()) + .append("begindatetime", getBegindatetime()) + .append("cpresult", getCpresult()) + .append("enddatetime", getEnddatetime()) + .append("username", getUsername()) + .append("remark", getRemark()) + .append("testno", getTestno()) + .append("tempMes", getTempMes()) + .append("powerMes", getPowerMes()) + .append("partMes", getPartMes()) + .append("isorder", getIsorder()) + .append("lowvTime", getLowvTime()) + .append("lowvPowermin", getLowvPowermin()) + .append("lowvPowermax", getLowvPowermax()) + .append("lowvPowerfact", getLowvPowerfact()) + .append("lowvoltage", getLowvoltage()) + .append("syncDatetime", getSyncDatetime()) + .append("frequency", getFrequency()) + .toString(); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/BoxTemperatureHistoryMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/BoxTemperatureHistoryMapper.java new file mode 100644 index 0000000..2829749 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/mapper/BoxTemperatureHistoryMapper.java @@ -0,0 +1,61 @@ +package com.aucma.report.mapper; + +import java.util.List; +import com.aucma.report.domain.BoxTemperatureHistory; + +/** + * 测温记录报表Mapper接口 + * + * @author Yinq + * @date 2024-03-13 + */ +public interface BoxTemperatureHistoryMapper +{ + /** + * 查询测温记录报表 + * + * @param objId 测温记录报表主键 + * @return 测温记录报表 + */ + public BoxTemperatureHistory selectBoxTemperatureHistoryByObjId(Long objId); + + /** + * 查询测温记录报表列表 + * + * @param boxTemperatureHistory 测温记录报表 + * @return 测温记录报表集合 + */ + public List selectBoxTemperatureHistoryList(BoxTemperatureHistory boxTemperatureHistory); + + /** + * 新增测温记录报表 + * + * @param boxTemperatureHistory 测温记录报表 + * @return 结果 + */ + public int insertBoxTemperatureHistory(BoxTemperatureHistory boxTemperatureHistory); + + /** + * 修改测温记录报表 + * + * @param boxTemperatureHistory 测温记录报表 + * @return 结果 + */ + public int updateBoxTemperatureHistory(BoxTemperatureHistory boxTemperatureHistory); + + /** + * 删除测温记录报表 + * + * @param objId 测温记录报表主键 + * @return 结果 + */ + public int deleteBoxTemperatureHistoryByObjId(Long objId); + + /** + * 批量删除测温记录报表 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBoxTemperatureHistoryByObjIds(Long[] objIds); +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/IBoxTemperatureHistoryService.java b/aucma-report/src/main/java/com/aucma/report/service/IBoxTemperatureHistoryService.java new file mode 100644 index 0000000..bcf9591 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/IBoxTemperatureHistoryService.java @@ -0,0 +1,61 @@ +package com.aucma.report.service; + +import java.util.List; +import com.aucma.report.domain.BoxTemperatureHistory; + +/** + * 测温记录报表Service接口 + * + * @author Yinq + * @date 2024-03-13 + */ +public interface IBoxTemperatureHistoryService +{ + /** + * 查询测温记录报表 + * + * @param objId 测温记录报表主键 + * @return 测温记录报表 + */ + public BoxTemperatureHistory selectBoxTemperatureHistoryByObjId(Long objId); + + /** + * 查询测温记录报表列表 + * + * @param boxTemperatureHistory 测温记录报表 + * @return 测温记录报表集合 + */ + public List selectBoxTemperatureHistoryList(BoxTemperatureHistory boxTemperatureHistory); + + /** + * 新增测温记录报表 + * + * @param boxTemperatureHistory 测温记录报表 + * @return 结果 + */ + public int insertBoxTemperatureHistory(BoxTemperatureHistory boxTemperatureHistory); + + /** + * 修改测温记录报表 + * + * @param boxTemperatureHistory 测温记录报表 + * @return 结果 + */ + public int updateBoxTemperatureHistory(BoxTemperatureHistory boxTemperatureHistory); + + /** + * 批量删除测温记录报表 + * + * @param objIds 需要删除的测温记录报表主键集合 + * @return 结果 + */ + public int deleteBoxTemperatureHistoryByObjIds(Long[] objIds); + + /** + * 删除测温记录报表信息 + * + * @param objId 测温记录报表主键 + * @return 结果 + */ + public int deleteBoxTemperatureHistoryByObjId(Long objId); +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/BoxTemperatureHistoryServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/BoxTemperatureHistoryServiceImpl.java new file mode 100644 index 0000000..8e3665d --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/BoxTemperatureHistoryServiceImpl.java @@ -0,0 +1,93 @@ +package com.aucma.report.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.aucma.report.mapper.BoxTemperatureHistoryMapper; +import com.aucma.report.domain.BoxTemperatureHistory; +import com.aucma.report.service.IBoxTemperatureHistoryService; + +/** + * 测温记录报表Service业务层处理 + * + * @author Yinq + * @date 2024-03-13 + */ +@Service +public class BoxTemperatureHistoryServiceImpl implements IBoxTemperatureHistoryService +{ + @Autowired + private BoxTemperatureHistoryMapper boxTemperatureHistoryMapper; + + /** + * 查询测温记录报表 + * + * @param objId 测温记录报表主键 + * @return 测温记录报表 + */ + @Override + public BoxTemperatureHistory selectBoxTemperatureHistoryByObjId(Long objId) + { + return boxTemperatureHistoryMapper.selectBoxTemperatureHistoryByObjId(objId); + } + + /** + * 查询测温记录报表列表 + * + * @param boxTemperatureHistory 测温记录报表 + * @return 测温记录报表 + */ + @Override + public List selectBoxTemperatureHistoryList(BoxTemperatureHistory boxTemperatureHistory) + { + return boxTemperatureHistoryMapper.selectBoxTemperatureHistoryList(boxTemperatureHistory); + } + + /** + * 新增测温记录报表 + * + * @param boxTemperatureHistory 测温记录报表 + * @return 结果 + */ + @Override + public int insertBoxTemperatureHistory(BoxTemperatureHistory boxTemperatureHistory) + { + return boxTemperatureHistoryMapper.insertBoxTemperatureHistory(boxTemperatureHistory); + } + + /** + * 修改测温记录报表 + * + * @param boxTemperatureHistory 测温记录报表 + * @return 结果 + */ + @Override + public int updateBoxTemperatureHistory(BoxTemperatureHistory boxTemperatureHistory) + { + return boxTemperatureHistoryMapper.updateBoxTemperatureHistory(boxTemperatureHistory); + } + + /** + * 批量删除测温记录报表 + * + * @param objIds 需要删除的测温记录报表主键 + * @return 结果 + */ + @Override + public int deleteBoxTemperatureHistoryByObjIds(Long[] objIds) + { + return boxTemperatureHistoryMapper.deleteBoxTemperatureHistoryByObjIds(objIds); + } + + /** + * 删除测温记录报表信息 + * + * @param objId 测温记录报表主键 + * @return 结果 + */ + @Override + public int deleteBoxTemperatureHistoryByObjId(Long objId) + { + return boxTemperatureHistoryMapper.deleteBoxTemperatureHistoryByObjId(objId); + } +} diff --git a/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml b/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml new file mode 100644 index 0000000..e8cabe2 --- /dev/null +++ b/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select obj_id, + line_no, + gongwno, + cpno, + cpmodel, + factorymodel, + voltage, + point2, + testtime, + testedtime, + etemp, + begindatetime, + cpresult, + enddatetime, + username, + remark, + testno, + temp_mes, + power_mes, + part_mes, + isorder, + lowv_time, + lowv_powermin, + lowv_powermax, + lowv_powerfact, + lowvoltage, + sync_datetime, + frequency + from C##AUCMA_SCADA.box_temperaturehistory + + + + + + + + + SELECT seq_box_temperaturehistory.NEXTVAL as objId FROM DUAL + + insert into box_temperaturehistory + + obj_id, + line_no, + gongwno, + cpno, + cpmodel, + factorymodel, + voltage, + point2, + testtime, + testedtime, + etemp, + begindatetime, + cpresult, + enddatetime, + username, + remark, + testno, + temp_mes, + power_mes, + part_mes, + isorder, + lowv_time, + lowv_powermin, + lowv_powermax, + lowv_powerfact, + lowvoltage, + sync_datetime, + frequency, + + + #{objId}, + #{lineNo}, + #{gongwno}, + #{cpno}, + #{cpmodel}, + #{factorymodel}, + #{voltage}, + #{point2}, + #{testtime}, + #{testedtime}, + #{etemp}, + #{begindatetime}, + #{cpresult}, + #{enddatetime}, + #{username}, + #{remark}, + #{testno}, + #{tempMes}, + #{powerMes}, + #{partMes}, + #{isorder}, + #{lowvTime}, + #{lowvPowermin}, + #{lowvPowermax}, + #{lowvPowerfact}, + #{lowvoltage}, + #{syncDatetime}, + #{frequency}, + + + + + update box_temperaturehistory + + line_no = #{lineNo}, + gongwno = #{gongwno}, + cpno = #{cpno}, + cpmodel = #{cpmodel}, + factorymodel = #{factorymodel}, + voltage = #{voltage}, + point2 = #{point2}, + testtime = #{testtime}, + testedtime = #{testedtime}, + etemp = #{etemp}, + begindatetime = #{begindatetime}, + cpresult = #{cpresult}, + enddatetime = #{enddatetime}, + username = #{username}, + remark = #{remark}, + testno = #{testno}, + temp_mes = #{tempMes}, + power_mes = #{powerMes}, + part_mes = #{partMes}, + isorder = #{isorder}, + lowv_time = #{lowvTime}, + lowv_powermin = #{lowvPowermin}, + lowv_powermax = #{lowvPowermax}, + lowv_powerfact = #{lowvPowerfact}, + lowvoltage = #{lowvoltage}, + sync_datetime = #{syncDatetime}, + frequency = #{frequency}, + + where obj_id = #{objId} + + + + delete + from box_temperaturehistory + where obj_id = #{objId} + + + + delete from box_temperaturehistory where obj_id in + + #{objId} + + + \ No newline at end of file diff --git a/aucma-report/src/main/resources/mapper/report/RecordElectricalInspectionMapper.xml b/aucma-report/src/main/resources/mapper/report/RecordElectricalInspectionMapper.xml index f424d5a..ad6da72 100644 --- a/aucma-report/src/main/resources/mapper/report/RecordElectricalInspectionMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/RecordElectricalInspectionMapper.xml @@ -48,6 +48,7 @@ to_date(#{params.endRecordTime}, 'yyyy-mm-dd hh24:mi:ss') + order by recordtime