liweidong
张乾翔 2 days ago
parent 9d4d836cc3
commit 3a66f6c274
  1. 69
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/QueryUtils.java

@ -55,50 +55,69 @@ public class QueryUtils {
for (int i = 0; i < fields.length; i++) { for (int i = 0; i < fields.length; i++) {
String field = fields[i].trim(); String field = fields[i].trim();
String convertedField = switch (field.toUpperCase()) { String convertedField;
// 操作人姓名转换为更新时间排序 String upperField = field.toUpperCase();
case "OP_USER_REAL_NAME" -> "UPDATE_USER";
if ("OP_USER_REAL_NAME".equals(upperField)) {
convertedField = "UPDATE_USER";
} else if ("CUR_STATUS_TEXT".equals(upperField)) {
/** /**
* {@link org.springblade.desk.basic.controller.OemController.list} * {@link org.springblade.desk.basic.controller.OemController.list}
* */ * */
case "CUR_STATUS_TEXT" -> "status"; convertedField = "status";
} else if ("UPDATE_USER_NAME".equals(upperField)) {
/** /**
* {@link org.springblade.desk.basic.controller.BatConfigController#page(org.springblade.desk.basic.pojo.vo.BatConfigVO, org.springblade.core.mp.support.Query)} * {@link org.springblade.desk.basic.controller.BatConfigController#page(org.springblade.desk.basic.pojo.vo.BatConfigVO, org.springblade.core.mp.support.Query)}
* */ * */
case "UPDATE_USER_NAME" -> "UPDATE_USER"; convertedField = "UPDATE_USER";
} else if ("LEADER_USER_NAME".equals(upperField)) {
/** /**
* {@link org.springblade.desk.basic.controller.WorkCenterController#list(java.util.Map, org.springblade.core.mp.support.Query)} * {@link org.springblade.desk.basic.controller.WorkCenterController#list(java.util.Map, org.springblade.core.mp.support.Query)}
* */ * */
case "LEADER_USER_NAME" -> "LEADER_USER"; convertedField = "LEADER_USER";
} else if ("CREATE_USER_NAME".equals(upperField)) {
/** /**
* {@link } * {@link }
* */ * */
case "CREATE_USER_NAME" -> "CREATE_USER"; convertedField = "CREATE_USER";
} else if ("WC_NAME".equals(upperField)) {
/** /**
* {@link LiquidTankController#list(java.util.Map, org.springblade.core.mp.support.Query)} * {@link LiquidTankController#list(java.util.Map, org.springblade.core.mp.support.Query)}
* *
* */ * */
case "WC_NAME" -> "WORK_CENTER_ID"; convertedField = "WORK_CENTER_ID";
case "ADD_DRUG_FORMULA_NAME" -> "ADD_DRUG_FORMULA_ID"; } else if ("ADD_DRUG_FORMULA_NAME".equals(upperField)) {
case "TEST_USER_REAL_NAME" -> "TEST_USER_ID"; convertedField = "ADD_DRUG_FORMULA_ID";
case "PROCESS_USER_REAL_NAME" -> "PROCESS_USER_ID"; } else if ("TEST_USER_REAL_NAME".equals(upperField)) {
case "TS_NAME" -> "TEAM_ID"; convertedField = "TEST_USER_ID";
case "WORK_TANK_NAME" -> "WORK_TANK_ID"; } else if ("PROCESS_USER_REAL_NAME".equals(upperField)) {
case "AFTER_THEORY_FORMULA_NAME" -> "AFTER_THEORY_FORMULA_ID"; convertedField = "PROCESS_USER_ID";
} else if ("TS_NAME".equals(upperField)) {
convertedField = "TEAM_ID";
} else if ("WORK_TANK_NAME".equals(upperField)) {
convertedField = "WORK_TANK_ID";
} else if ("AFTER_THEORY_FORMULA_NAME".equals(upperField)) {
convertedField = "AFTER_THEORY_FORMULA_ID";
} else if ("NORM_VALUE_LIMIT".equals(upperField)) {
/** /**
* {@link LiquidTankTaskController#listHandle(org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO, org.springblade.core.mp.support.Query)} * {@link LiquidTankTaskController#listHandle(org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO, org.springblade.core.mp.support.Query)}
* case "WORK_TANK_NAME" -> "WORK_TANK_ID";
* case "NORM_VALUE_LIMIT" -> "NORM_VALUE_MAX,NORM_VALUE_MIN";
* case "TARGET_VALUE_LIMIT" -> "TARGET_VALUE_MAX,TARGET_VALUE_MIN";
* case "TEST_USER_REAL_NAME" -> "TEST_USER_ID";
* case "PROCESS_USER_REAL_NAME" -> "PROCESS_USER_ID";
* case "STATUS_VALUE" -> "STATUS";
* case "TS_NAME" -> "TEAM_ID";
* */ * */
//case "WORK_TANK_NAME" -> "WORK_TANK_ID"; convertedField = "NORM_VALUE_MAX,NORM_VALUE_MIN";
case "NORM_VALUE_LIMIT" -> "NORM_VALUE_MAX,NORM_VALUE_MIN"; } else if ("TARGET_VALUE_LIMIT".equals(upperField)) {
case "TARGET_VALUE_LIMIT" -> "TARGET_VALUE_MAX,TARGET_VALUE_MIN"; convertedField = "TARGET_VALUE_MAX,TARGET_VALUE_MIN";
//case "TEST_USER_REAL_NAME" -> "TEST_USER_ID"; } else if ("STATUS_VALUE".equals(upperField)) {
//case "PROCESS_USER_REAL_NAME" -> "PROCESS_USER_ID"; convertedField = "STATUS";
case "STATUS_VALUE" -> "STATUS"; } else {
//case "TS_NAME" -> "TEAM_ID"; // 默认不转换
convertedField = field;
default -> field; }
};
result.append(convertedField); result.append(convertedField);
if (i < fields.length - 1) { if (i < fields.length - 1) {
result.append(","); result.append(",");

Loading…
Cancel
Save