From ab3fa6cc3eccfe0052044f738d39d6801636e35b Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 21 Feb 2023 14:45:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutFeign.java | 4 + .../biz/basevehicle/BaseVehicleMapper.java | 2 + .../biz/basevehicle/BaseVehicleMapper.xml | 41 +- .../biz/basevehicle/BaseVehicleService.java | 4 + .../basevehicleout/BaseVehicleOutRest.java | 5 + .../basevehicleout/BaseVehicleOutService.java | 14 + .../biz/sysfunction/SysFunctionMapper.java | 6 +- .../biz/sysfunction/SysFunctionService.java | 456 +++++++++--------- .../ScmApplyInboundQueryMapper.xml | 1 + .../ScmApplyInboundQueryService.java | 1 - 10 files changed, 296 insertions(+), 238 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java index 90fe18d547..070de90341 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java @@ -51,6 +51,10 @@ public interface BaseVehicleOutFeign { @ResponseBody ResultBean createPdf(@RequestParam("xsckdSid") String xsckdSid, @RequestParam("printerType") String printerType); + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySid") + @ResponseBody + public ResultBean delBySid(@RequestParam("sid") String sid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 2184d04683..5fd2ab89b4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -491,4 +491,6 @@ public interface BaseVehicleMapper extends BaseMapper { BasePurchSystemVo getSystem(@Param("useOrgSid") String useOrgSid, @Param("purchaseSystemSid") String purchaseSystemSid); + + void updateVehicleStateAndSaleDate(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index bbd0f41073..404b550275 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -592,19 +592,19 @@ SELECT orderingNo FROM base_vehicle - WHERE vinNo like concat('%', #{fMaterialID}, '%') - LIMIT 1 + WHERE vinNo like concat('%', #{fMaterialID}, '%') LIMIT 1 + + + UPDATE + base_vehicle + SET vehicleState = "0001", + vehicleStateValue = "库存", + salesDate = null + WHERE sid = #{sid} + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 767335503d..4a1fc04f0e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -3645,4 +3645,8 @@ public class BaseVehicleService extends MybatisBaseService { List> getSourceAuthorization(@Param("roleSid")String roleSid); @Select("SELECT sm.name,sm.sid,sm.pageUrl FROM sys_menu sm LEFT JOIN sys_source_menu ssm ON sm.sid=ssm.menuSid where ssm.sourceSid=#{sourceSid}") List> getMenuAuthorization(@Param("sourceSid") String sourceSid); + @Select("SELECT sf.name,sf.sid FROM sys_function sf WHERE sf.actionUrl= #{pageUrl}") + List> getFunctionAuthorization(@Param("pageUrl") String pageUrl); @Select("SELECT sf.name,sf.sid,IF(IFNULL(srf.id,0)<=0,1,0) checked FROM sys_function sf " + " LEFT JOIN sys_role_function srf ON srf.functionSid=sf.sid " + - " WHERE sf.actionUrl= #{pageUrl} ") - List> getFunctionAuthorization(@Param("pageUrl") String pageUrl); + " WHERE sf.actionUrl= #{pageUrl} AND srf.roleSid = #{roleSid} ") + List> getFunctionByRoleSid(@Param("pageUrl") String pageUrl,@Param("roleSid") String roleSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java index f7985301f1..5adcf3be50 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java @@ -35,247 +35,263 @@ import java.util.Map; */ @Service public class SysFunctionService extends MybatisBaseService { - @Autowired - private SysSourceService sysSourceService; - @Autowired - private SysSourceFunctionService sysSourceFunctionService; - public PagerVo listPage(PagerQuery pq) { - SysFunctionQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - public List listAll(SysFunctionQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectList(qw); - } - private QueryWrapper createQueryWrapper(SysFunctionQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); + @Autowired + private SysSourceService sysSourceService; + @Autowired + private SysSourceFunctionService sysSourceFunctionService; + public PagerVo listPage(PagerQuery pq) { + SysFunctionQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAll(SysFunctionQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysFunctionQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getName())) { + qw.eq("name", query.getName()); + } + + if (query.getLevel() != null) { + qw.eq("level", query.getLevel()); + } + + if (StringUtils.isNotBlank(query.getParentSid())) { + qw.eq("parentSid", query.getParentSid()); + } + + if (StringUtils.isNotBlank(query.getActionUrl())) { + qw.eq("actionUrl", query.getActionUrl()); + } + + if (StringUtils.isNotBlank(query.getControllerName())) { + qw.eq("controllerName", query.getControllerName()); + } + + if (StringUtils.isNotBlank(query.getFunId())) { + qw.eq("funId", query.getFunId()); + } + + if (query.getPhoneFunction() != null) { + qw.eq("phoneFunction", query.getPhoneFunction()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysFunctionQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } - if (StringUtils.isNotBlank(query.getName())) { - qw.eq("name", query.getName()); - } + public List listAllVo(SysFunctionQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("func.parentSid", "0"); + List sysFunctionVos = baseMapper.selectListAllVo(qw); + for (SysFunctionVo s : sysFunctionVos) { + getChildrens(s); + } + return sysFunctionVos; + } - if (query.getLevel() != null) { - qw.eq("level", query.getLevel()); - } + private void getChildrens(SysFunctionVo s) { + String sid = s.getSid(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(sid)) { + qw.eq("func.parentSid", sid); + } + List sysFunctionVos = baseMapper.selectListAllVo(qw); + if (!sysFunctionVos.isEmpty()) { + for (SysFunctionVo sfv : sysFunctionVos) { + getChildrens(sfv); + } + } + s.setChildren(sysFunctionVos); + } - if (StringUtils.isNotBlank(query.getParentSid())) { - qw.eq("parentSid", query.getParentSid()); - } + public List listVo() { + return baseMapper.selectListVo(); + } - if (StringUtils.isNotBlank(query.getActionUrl())) { - qw.eq("actionUrl", query.getActionUrl()); - } + public void saveOrUpdateDto(SysFunctionDto dto) { + SysFunction entity = new SysFunction(); + dto.fillEntity(entity); + SysSourceFunction sysSourceFunction = new SysSourceFunction(); + sysSourceFunction.setFunctionSid(entity.getSid()); + sysSourceFunction.setSourceSid(dto.getSourceSid()); + setRootSid(entity, sysSourceFunction); + sysSourceFunctionService.save(sysSourceFunction); + this.saveOrUpdate(entity); + } - if (StringUtils.isNotBlank(query.getControllerName())) { - qw.eq("controllerName", query.getControllerName()); - } + private void setRootSid(SysFunction entity, SysSourceFunction sysSourceFunction) { + String pSid = entity.getParentSid(); + if ("0".equals(pSid)) { + sysSourceFunction.setFunctionRootSid(entity.getSid()); + } else { + SysFunction sysFunction = this.fetchBySid(pSid); + String pSid1 = sysFunction.getParentSid(); + if ("0".equals(pSid1)) { + sysSourceFunction.setFunctionRootSid(sysFunction.getSid()); + } + setRootSid(sysFunction, sysSourceFunction); + } + } - if (StringUtils.isNotBlank(query.getFunId())) { - qw.eq("funId", query.getFunId()); - } + public SysFunctionVo fetchByIdVo(String id) { + SysFunction entity = this.fetchById(id); + SysFunctionVo vo = new SysFunctionVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } - if (query.getPhoneFunction() != null) { - qw.eq("phoneFunction", query.getPhoneFunction()); - } - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - SysFunctionQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public List listAllVo(SysFunctionQuery query) { - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("func.parentSid", "0"); - List sysFunctionVos = baseMapper.selectListAllVo(qw); - for(SysFunctionVo s:sysFunctionVos){ - getChildrens(s); - } - return sysFunctionVos; - } - private void getChildrens(SysFunctionVo s){ - String sid = s.getSid(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(sid)) { - qw.eq("func.parentSid", sid); - } - List sysFunctionVos = baseMapper.selectListAllVo(qw); - if(!sysFunctionVos.isEmpty()){ - for(SysFunctionVo sfv:sysFunctionVos){ - getChildrens(sfv); - } - } - s.setChildren(sysFunctionVos); - } - public List listVo() { - return baseMapper.selectListVo(); - } - - public void saveOrUpdateDto(SysFunctionDto dto){ - SysFunction entity = new SysFunction(); - dto.fillEntity(entity); - SysSourceFunction sysSourceFunction = new SysSourceFunction(); - sysSourceFunction.setFunctionSid(entity.getSid()); - sysSourceFunction.setSourceSid(dto.getSourceSid()); - setRootSid(entity,sysSourceFunction); - sysSourceFunctionService.save(sysSourceFunction); - this.saveOrUpdate(entity); - } - private void setRootSid(SysFunction entity,SysSourceFunction sysSourceFunction){ - String pSid = entity.getParentSid(); - if("0".equals(pSid)){ - sysSourceFunction.setFunctionRootSid(entity.getSid()); - }else{ - SysFunction sysFunction = this.fetchBySid(pSid); - String pSid1 = sysFunction.getParentSid(); - if("0".equals(pSid1)){ - sysSourceFunction.setFunctionRootSid(sysFunction.getSid()); - } - setRootSid(sysFunction,sysSourceFunction); - } - } - public SysFunctionVo fetchByIdVo(String id){ - SysFunction entity = this.fetchById(id); - SysFunctionVo vo = new SysFunctionVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + public List listAllByRoleSid(SysFunctionQuery query) { + List sysFunctionVos = baseMapper.listAllParentByRoleSid(query.getRoleSid(), "0"); + for (SysFunctionVo s : sysFunctionVos) { + getChildrensByRoleSid(s, query.getRoleSid()); + } + return sysFunctionVos; + } - public List listAllByRoleSid(SysFunctionQuery query) { - List sysFunctionVos = baseMapper.listAllParentByRoleSid(query.getRoleSid(),"0"); - for(SysFunctionVo s:sysFunctionVos){ - getChildrensByRoleSid(s,query.getRoleSid()); - } - return sysFunctionVos; - } - private void getChildrensByRoleSid(SysFunctionVo s,String roleSid){ - List sysFunctionVos = baseMapper.listAllParentByRoleSid(roleSid,s.getSid()); - if(!sysFunctionVos.isEmpty()){ - for(SysFunctionVo sfv:sysFunctionVos){ - getChildrensByRoleSid(sfv,roleSid); - } - } - s.setChildren(sysFunctionVos); - } + private void getChildrensByRoleSid(SysFunctionVo s, String roleSid) { + List sysFunctionVos = baseMapper.listAllParentByRoleSid(roleSid, s.getSid()); + if (!sysFunctionVos.isEmpty()) { + for (SysFunctionVo sfv : sysFunctionVos) { + getChildrensByRoleSid(sfv, roleSid); + } + } + s.setChildren(sysFunctionVos); + } - public List listAllVoForSource(SysFunctionQuery query) { - String name = query.getName(); - List sysSourceVos = sysSourceService.listFunctionTreeVo(name); - for (SysFunctionTreeVo s : sysSourceVos) { - List sysFunctionVoList = sysSourceFunctionService.fetchRootFunctionBySourceSid(s.getSourceSid()); - s.setChildren(sysFunctionVoList); - s.setIsSource("1"); - //判断该资源下的功能是否有可用的状态 - int isEnable = 1; - int count = baseMapper.selectBySourceSid(isEnable, s.getSourceSid()); - if (count == 0) { - s.setIsEnable("0"); - } else { - s.setIsEnable("1"); - } - if (!sysFunctionVoList.isEmpty()) { + public List listAllVoForSource(SysFunctionQuery query) { + String name = query.getName(); + List sysSourceVos = sysSourceService.listFunctionTreeVo(name); + for (SysFunctionTreeVo s : sysSourceVos) { + List sysFunctionVoList = sysSourceFunctionService.fetchRootFunctionBySourceSid(s.getSourceSid()); + s.setChildren(sysFunctionVoList); + s.setIsSource("1"); + //判断该资源下的功能是否有可用的状态 + int isEnable = 1; + int count = baseMapper.selectBySourceSid(isEnable, s.getSourceSid()); + if (count == 0) { + s.setIsEnable("0"); + } else { + s.setIsEnable("1"); + } + if (!sysFunctionVoList.isEmpty()) { // sysFunctionVoList = getChildrensForFunctionTree(sysFunctionVoList); - getChildList(sysFunctionVoList); - } - } - return sysSourceVos; - } + getChildList(sysFunctionVoList); + } + } + return sysSourceVos; + } - public void getChildList(List list) { - list.forEach(str -> { - String sid = str.getSid(); - List listChildren = baseMapper.selectChildernList(sid); - str.setChildren(listChildren); - getChildList(listChildren); - }); - } + public void getChildList(List list) { + list.forEach(str -> { + String sid = str.getSid(); + List listChildren = baseMapper.selectChildernList(sid); + str.setChildren(listChildren); + getChildList(listChildren); + }); + } - private List getChildrensForFunctionTree(List sysFunctionVoList) { - List list = new ArrayList<>(); - for (SysFunctionTreeVo s : sysFunctionVoList) { - SysFunction sysFunction = fetchBySid(s.getFunctionRootSid()); - SysFunctionTreeVo sysFunctionTreeVo = new SysFunctionTreeVo(); - BeanUtil.copyProperties(sysFunction, sysFunctionTreeVo); - /*sysFunctionTreeVo.setParentName("顶级功能");*/ - list.add(sysFunctionTreeVo); - } - for (SysFunctionTreeVo s : list) { - getChildrensForFunctionTree(s, s.getSid()); - } - return list; - } + private List getChildrensForFunctionTree(List sysFunctionVoList) { + List list = new ArrayList<>(); + for (SysFunctionTreeVo s : sysFunctionVoList) { + SysFunction sysFunction = fetchBySid(s.getFunctionRootSid()); + SysFunctionTreeVo sysFunctionTreeVo = new SysFunctionTreeVo(); + BeanUtil.copyProperties(sysFunction, sysFunctionTreeVo); + /*sysFunctionTreeVo.setParentName("顶级功能");*/ + list.add(sysFunctionTreeVo); + } + for (SysFunctionTreeVo s : list) { + getChildrensForFunctionTree(s, s.getSid()); + } + return list; + } - private void getChildrensForFunctionTree(SysFunctionTreeVo s, String sid) { - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(sid)) { - qw.eq("func.parentSid", sid); - } - List sysMenuVos = baseMapper.getChildrensForFunctionTree(qw); - if (!sysMenuVos.isEmpty()) { - for (SysFunctionTreeVo smv : sysMenuVos) { + private void getChildrensForFunctionTree(SysFunctionTreeVo s, String sid) { + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(sid)) { + qw.eq("func.parentSid", sid); + } + List sysMenuVos = baseMapper.getChildrensForFunctionTree(qw); + if (!sysMenuVos.isEmpty()) { + for (SysFunctionTreeVo smv : sysMenuVos) { /*SysFunction sysFunction = fetchBySid(sid); smv.setParentName(sysFunction.getName());*/ - getChildrensForFunctionTree(smv, smv.getSid()); - } - } - s.setChildren(sysMenuVos); - } + getChildrensForFunctionTree(smv, smv.getSid()); + } + } + s.setChildren(sysMenuVos); + } - public int updateBySourceSid(Integer isEnable, List sids) { - return baseMapper.updateBySourceSid(isEnable, sids); - } + public int updateBySourceSid(Integer isEnable, List sids) { + return baseMapper.updateBySourceSid(isEnable, sids); + } - public List getButtonPermissions(ButtonPermissionQuery query) { - List buttonPermissions = baseMapper.getButtonPermissions(query); - return buttonPermissions ; + public List getButtonPermissions(ButtonPermissionQuery query) { + List buttonPermissions = baseMapper.getButtonPermissions(query); + return buttonPermissions; } public List> getFunctionAuthorization(String roleSid) { - List> list=new ArrayList<>(); - List> lsources=baseMapper.getSourceAuthorization(roleSid); - lsources.forEach(f->{ - Map map=new HashMap<>(); - map.put("name",f.get("sourceName").toString()); - map.put("sid",f.get("sid").toString()); - map.put("checked","1"); - list.add(map); - }); + List> list = new ArrayList<>(); + List> lsources = baseMapper.getSourceAuthorization(roleSid); + lsources.forEach(f -> { + Map map = new HashMap<>(); + map.put("name", f.get("sourceName").toString()); + map.put("sid", f.get("sid").toString()); + map.put("checked", "1"); + list.add(map); + }); - list.forEach(f->{ - List> list2=new ArrayList<>(); - String sid = f.get("sid").toString(); - List> lmenus=baseMapper.getMenuAuthorization(sid); - lmenus.forEach(ff->{ - Map map=new HashMap<>(); - map.put("name",ff.get("name")); - String sids = ff.get("sid").toString(); - map.put("sid",sids); - map.put("checked","1"); - map.put("children",new ArrayList<>()); - if( ff.get("pageUrl")!=null&& com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())){ - String pageUrl =ff.get("pageUrl").toString(); - List> lfuncs=baseMapper.getFunctionAuthorization(pageUrl); - lfuncs.forEach(fun->{ - fun.put("children",new ArrayList<>()); - }); - map.put("children",lfuncs); - } - list2.add(map); - }); - f.put("children",list2); - }); - return list; + list.forEach(f -> { + List> list2 = new ArrayList<>(); + String sid = f.get("sid").toString(); + List> lmenus = baseMapper.getMenuAuthorization(sid); + lmenus.forEach(ff -> { + Map map = new HashMap<>(); + map.put("name", ff.get("name")); + String sids = ff.get("sid").toString(); + map.put("sid", sids); + map.put("checked", "1"); + map.put("children", new ArrayList<>()); + if (ff.get("pageUrl") != null && com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())) { + String pageUrl = ff.get("pageUrl").toString(); + List> lfuncs = baseMapper.getFunctionAuthorization(pageUrl); + List> functionByRoleSid = baseMapper.getFunctionByRoleSid(pageUrl, roleSid); + if (lfuncs.size() > 0){ + for (Map lfunc : lfuncs) { + for (Map funByRole : functionByRoleSid) { + if (lfunc.get("sid").equals(funByRole.get("sid"))) { + lfunc.put("checked", "0"); + } + } + lfunc.put("children", new ArrayList<>()); + } + } + map.put("children", lfuncs); + } + list2.add(map); + }); + f.put("children", list2); + }); + return list; } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml index 2a29a99e82..b84b873d85 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml @@ -9,6 +9,7 @@ ${ew.sqlSegment} + ORDER BY saiq.createTime DESC