From c20b0a3032a6738b79bb15768cffabfd78cc7b0f Mon Sep 17 00:00:00 2001 From: ls Date: Sun, 23 Feb 2025 02:01:47 +0800 Subject: [PATCH] update --- .../database/constant/ExperimentStatus.java | 9 ++--- .../controller/ExperimentController.java | 35 ++++++++++++++++--- .../database/mapper/ExperimentMapper.java | 3 +- .../database/mapper/xml/ExperimentMapper.xml | 10 ++++-- .../database/service/IExperimentService.java | 4 +-- .../service/impl/ExperimentServiceImpl.java | 5 ++- 6 files changed, 49 insertions(+), 17 deletions(-) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentStatus.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentStatus.java index 5164e2f..b5fc9ab 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentStatus.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentStatus.java @@ -2,9 +2,10 @@ package org.jeecg.modules.database.constant; public interface ExperimentStatus { - String STAGING = "暂存"; - String PRE_TEST = "试验前"; - String PROGRESSING = "试验进行中"; + String STAGING = "暂存"; + String PRE_TEST = "试验前"; + String PROGRESSING = "试验进行中"; String REPORT_AUDITING = "报告审批中"; - String COMPLETED = "试验完成"; + String COMPLETED = "试验完成"; + String REVIEWED = "已审核"; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index c57e650..a4602b7 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -14,6 +14,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.util.JwtUtil; +import org.jeecg.common.util.ReflectHelper; import org.jeecg.modules.database.constant.ExperimentStatus; import org.jeecg.modules.database.dto.NasaDataRecordPage; import org.jeecg.modules.database.entity.*; @@ -88,13 +89,23 @@ public class ExperimentController extends JeecgController parameterMap = req.getParameterMap(); + Map parameterMap = req.getParameterMap(); //QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experiment, parameterMap, customeRuleMap); Page page = new Page<>(pageNo, pageSize); - //if (!parameterMap.containsKey("column") || StringUtils.isBlank(parameterMap.get("column")[0])) { - // page.addOrder(OrderItem.asc("index_no")); - //} - IPage pageList = experimentService.join(page, experiment, null); + + String username = JwtUtil.getUserNameByToken(req); + SysUser currentUser = userService.getUserByName(username); + if (parameterMap.containsKey("column") && StringUtils.isNotBlank(parameterMap.get("column")[0])) { + String columnObj = parameterMap.get("column")[0]; + String column = ReflectHelper.getTableFieldName(experiment.getClass(), columnObj); + String order = parameterMap.get("order")[0]; + String orderSql = "e." + column + " " + order; + currentUser.setPostText(orderSql); + } else { + currentUser.setPostText("e.index_no asc"); + } + + IPage pageList = experimentService.join(page, experiment, currentUser); pageList.getRecords().forEach(v -> experimentService.fetchExperimentDetail(v)); return Result.OK(pageList); } @@ -368,4 +379,18 @@ public class ExperimentController extends JeecgController queryPageList(Experiment experiment) { + if (Objects.isNull(experiment) || StringUtils.isBlank(experiment.getId())) { + return Result.OK("请选择试验"); + } + return Result.OK("审核完成"); + } + } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentMapper.java index d850f11..c9d4ade 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.system.entity.SysUser; /** * @Description: 试验管理 @@ -14,7 +15,7 @@ import org.jeecg.modules.database.entity.Experiment; */ public interface ExperimentMapper extends BaseMapper { - IPage join(Page page, Experiment experiment); + IPage join(Page page, Experiment experiment, SysUser loginUser); @Select("SELECT SUM(total_count_lhs) FROM experiment where total_count_lhs is not null") Long sumLhs(); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml index 064a61e..fe6adfb 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml @@ -4,11 +4,15 @@ \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentService.java index b311ea0..8c4520c 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentService.java @@ -1,10 +1,10 @@ package org.jeecg.modules.database.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.database.entity.Experiment; +import org.jeecg.modules.system.entity.SysUser; /** * @Description: 试验管理 @@ -24,7 +24,7 @@ public interface IExperimentService extends IService { Integer getLastIndex(); - IPage join(Page page, Experiment experiment, QueryWrapper queryWrapper); + IPage join(Page page, Experiment experiment, SysUser loginUser); Long sumLhs(); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java index dc16d14..86fc94b 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -274,8 +273,8 @@ public class ExperimentServiceImpl extends ServiceImpl join(Page page, Experiment experiment, QueryWrapper queryWrapper) { - return baseMapper.join(page, experiment); + public IPage join(Page page, Experiment experiment, SysUser loginUser) { + return baseMapper.join(page, experiment,loginUser); } @Override