From 560228ac3c15cccce0b2a5994d44e4e81b5b3b73 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 11:12:22 +0800
Subject: [PATCH] 合并服务单订单改造分支
---
zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java
index 485c148..80978e4 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java
@@ -1,16 +1,18 @@
package com.matrix.system.common.actions;
+import cn.hutool.core.collection.CollUtil;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
+import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.ParameterSettings;
import com.matrix.system.hive.dao.ParameterSettingsDao;
-import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -124,7 +126,13 @@
BusParameterSettings newParam=new BusParameterSettings();
newParam.setParamCode(parameterSetting.getCode());
newParam.setCompanyId(user.getCompanyId());
- newParam.setParamValue(parameterSetting.getUserValue());
+ if(BooleanEnum.TRUE.getDisplayName().equals(parameterSetting.getUserValue())){
+ newParam.setParamValue(String.valueOf(BooleanEnum.TRUE.getValue()));
+ }else if(BooleanEnum.FALSE.getDisplayName().equals(parameterSetting.getUserValue())){
+ newParam.setParamValue(String.valueOf(BooleanEnum.FALSE.getValue()));
+ }else{
+ newParam.setParamValue(parameterSetting.getUserValue());
+ }
if(type==SHOP){
newParam.setShopId(user.getShopId());
}
@@ -155,4 +163,22 @@
}
+ @GetMapping(value = "/getSystemName")
+ public @ResponseBody
+ AjaxResult getSystemName() {
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ List codes = new ArrayList<>();
+ codes.add(AppConstance.ADMIN_SYSTEM_TITLE);
+ List<BusParameterSettings> dataList = busParameterSettingsDao.selectByCodesAndCompanyId(codes, user.getCompanyId());
+ String paramValue = "";
+ if(CollUtil.isNotEmpty(dataList)){
+ paramValue = dataList.get(0).getParamValue();
+ }else{
+ paramValue = "讯聪管理系统";
+ }
+ AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, paramValue);
+ return result;
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1