licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

排序状态

Browse Source
This commit is contained in:
Ledo 2025-02-17 21:25:27 +08:00
parent a5120ba560
commit 144ef8f8c5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java
View File

@ -47,9 +47,9 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
.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") .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(); .disableSubLogicDel();
if(reqVO.getPgType()!=null && reqVO.getPgType() == 0){ if(reqVO.getPgType()!=null && reqVO.getPgType() == 0){
query.orderByAsc(ProjectOrderDO::getCode); query.orderByAsc(PlanDO::getPlanNo);
}else { }else {
query.orderByDesc(ProjectOrderDO::getCode); query.orderByDesc(PlanDO::getPlanNo);
} }

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java
View File

@ -237,7 +237,7 @@ public class ProcessDesignServiceImpl implements ProcessDesignService {
} }
@Override @Override
public PageResult<ProcessDesignDO> getProcessDesignPage(ProcessDesignPageReqVO pageReqVO) { public PageResult<ProcessDesignDO> getProcessDesignPage(ProcessDesignPageReqVO pageReqVO) {
if(pageReqVO.getIsOverview()){ if(pageReqVO.getIsOverview()){
PageResult<ProcessDesignDO> processDesignDOPageResult = processDesignMapper.selectPageOverview(pageReqVO); PageResult<ProcessDesignDO> processDesignDOPageResult = processDesignMapper.selectPageOverview(pageReqVO);
if(processDesignDOPageResult.getTotal() > 0){ if(processDesignDOPageResult.getTotal() > 0){

2
mes-ui/mini-app/package.json
View File

@ -36,7 +36,7 @@
"build:quickapp-webview-union": "uni build -p quickapp-webview-union", "build:quickapp-webview-union": "uni build -p quickapp-webview-union",
"tsc": "vue-tsc --noEmit --skipLibCheck", "tsc": "vue-tsc --noEmit --skipLibCheck",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore", "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": "lint-staged"
}, },
"lint-staged": { "lint-staged": {