diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java index c58bec6..0f84dc9 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java @@ -47,9 +47,9 @@ public interface ProcessDesignMapper extends BaseMapperX { .leftJoin("(select progress,process_design_id,blueprint_link FROM pro_process_design_progress where id in (select max(id) FROM pro_process_design_progress GROUP BY process_design_id) ) z on z.process_design_id = t.id") .disableSubLogicDel(); if(reqVO.getPgType()!=null && reqVO.getPgType() == 0){ - query.orderByAsc(ProjectOrderDO::getCode); + query.orderByAsc(PlanDO::getPlanNo); }else { - query.orderByDesc(ProjectOrderDO::getCode); + query.orderByDesc(PlanDO::getPlanNo); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java index 3e9b44f..18e2541 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java @@ -237,7 +237,7 @@ public class ProcessDesignServiceImpl implements ProcessDesignService { } @Override - public PageResult getProcessDesignPage(ProcessDesignPageReqVO pageReqVO) { + public PageResult getProcessDesignPage(ProcessDesignPageReqVO pageReqVO) { if(pageReqVO.getIsOverview()){ PageResult processDesignDOPageResult = processDesignMapper.selectPageOverview(pageReqVO); if(processDesignDOPageResult.getTotal() > 0){ diff --git a/mes-ui/mini-app/package.json b/mes-ui/mini-app/package.json index e23aafe..894547f 100644 --- a/mes-ui/mini-app/package.json +++ b/mes-ui/mini-app/package.json @@ -36,7 +36,7 @@ "build:quickapp-webview-union": "uni build -p quickapp-webview-union", "tsc": "vue-tsc --noEmit --skipLibCheck", "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore", - "prepare": "husky install", + "prepare": "cd .. && husky install frontend/.husky", "lint-staged": "lint-staged" }, "lint-staged": {