diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java index 2e653722..04554a9d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java @@ -329,6 +329,7 @@ public class MachineServiceImpl implements IMachineService sample.setPdf(pdfUrl); sample.setReportName(reportName); sample.setReportNum(reportNum); + sample.setSelfCode(sample.getSelfCode().trim()); sample.setTypeNameCode(sample.getSampleName() + "-" + sample.getSelfCode()); sample.setParentId(newId); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml index c21365f1..4f88c07e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml @@ -1117,6 +1117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) + order by mci.create_time desc