From 83430e4bd60f9a44ec76698fa04ee8d3373a1087 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 15 七月 2024 13:40:06 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index 0ebce2c..0e7c910 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -1,10 +1,13 @@
package com.doumee.biz.system.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.vo.UnitCodeVo;
import com.doumee.dao.system.model.SystemDict;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.system.SystemDictDataService;
@@ -15,10 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
@Service
public class SystemDictDataBizImpl implements SystemDictDataBiz {
@@ -33,11 +33,11 @@
public Integer create(SystemDictData systemDictData) {
SystemDictData queryDto = new SystemDictData();
queryDto.setDictId(systemDictData.getDictId());
- queryDto.setCode(systemDictData.getCode());
+ queryDto.setLabel(systemDictData.getLabel());
queryDto.setDeleted(Boolean.FALSE);
SystemDictData dictData = systemDictDataService.findOne(queryDto);
if (dictData != null) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鍊煎凡瀛樺湪");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鏍囩宸插瓨鍦�");
}
return systemDictDataService.create(systemDictData);
}
@@ -46,20 +46,45 @@
public void updateById(SystemDictData systemDictData) {
SystemDictData queryDto = new SystemDictData();
queryDto.setDictId(systemDictData.getDictId());
- queryDto.setCode(systemDictData.getLabel());
+ queryDto.setLabel(systemDictData.getLabel());
queryDto.setDeleted(Boolean.FALSE);
SystemDictData dictData = systemDictDataService.findOne(queryDto);
if (dictData != null && !dictData.getId().equals(systemDictData.getId())) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鍊煎凡瀛樺湪");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鏍囩宸插瓨鍦�");
}
systemDictDataService.updateById(systemDictData);
}
-
-
+ @Override
+ public String getUnitName(String unitCode, List<UnitCodeVo> unitCodeVoList) {
+ if(unitCodeVoList!=null){
+ for(UnitCodeVo c :unitCodeVoList){
+ if(StringUtils.equals(c.getCode(),unitCode)){
+ return c.getName();
+ }
+ }
+ }
+ return null;
+ }
@Override
public void updateByIdNew(SystemDictData systemDictData) {
systemDictDataService.updateById(systemDictData);
}
+ @Override
+ public List<UnitCodeVo> getUnitList(){
+ List<UnitCodeVo> list = new ArrayList<>();
+ try {
+ String temp = queryByCode(Constants.ZBOM,Constants.UNIT_CODE).getCode();
+ JSONArray array = JSONObject.parseArray(temp);
+ if(array!=null ){
+ for (int i = 0; i < array.size(); i++) {
+ list.add(JSONObject.toJavaObject(array.getJSONObject(i),UnitCodeVo.class));
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return list;
+ }
@Override
public SystemDictData queryByCode(String dicCode, String label){
--
Gitblit v1.9.3