From c84991603548ca07bdcb589bf61ab230a6fb9f3e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 07 九月 2023 13:57:52 +0800
Subject: [PATCH] getCodeRuleByClassifyOid接口修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeButtonController.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java | 21 -----
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeFixedValueMapper.xml | 1
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java | 13 ++-
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java | 2
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/config/NacosConfig.java | 10 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 7 -
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml | 5 -
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 95 +++++++++++++++++++++++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java | 8 +
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml | 28 +++---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java | 2
14 files changed, 132 insertions(+), 65 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
index debd8d1..8fa4fb1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
@@ -149,7 +149,6 @@
*/
private String filterSql ;
-
/**
* 娴佹按鍙疯捣濮嬪��
*/
@@ -159,7 +158,6 @@
* 娴佹按鐨勬闀�
*/
private Integer serialStep;
-
/**
* 缂栫爜琛ヤ綅鏂瑰紡
@@ -211,7 +209,6 @@
*/
private String parentClassifySecText;
-
/**
* 鏄惁鍙互涓虹┖
*/
@@ -238,6 +235,11 @@
private Integer serialDependOrder;
/**
+ * 鐮佸�肩敵璇疯〃鍗曚腑鏄剧ず闅愯棌绛夌姸鎬侊細 1(鍙緭)銆�2(鍙)銆�3(闅愯棌)
+ */
+ private Integer codeValueApplyStatus;
+
+ /**
* 鍥哄畾鐮佺殑鐮佸�煎唴瀹�
*/
private List<CodeFixedValueVO> fixedValueVOList;
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/cache/NacosConfigCache.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
similarity index 81%
rename from Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/cache/NacosConfigCache.java
rename to Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
index b7ffd86..64f3bdd 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/cache/NacosConfigCache.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
@@ -1,9 +1,12 @@
-package com.vci.ubcs.common.cache;
+package com.vci.ubcs.system.cache;
-/*import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.secure.BladeUser;
-import org.springblade.core.tool.utils.Func;*/
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.cache.utils.CacheUtil;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
@@ -28,7 +31,7 @@
* nacos涓婇厤缃殑瓒呯淇℃伅
* @return
*/
- /*public BladeUser getAdminUserInfo() {
+ public BladeUser getAdminUserInfo() {
try {
BladeUser user = CacheUtil.getCache(NACOS_CONFIG_CACHE).get(ADMIN_INFO_CODE,BladeUser.class);
//浠庣紦瀛樹腑鏈幏鍙栧埌瓒呯骇绠＄悊鍛橀厤缃俊鎭紝浠巒acos涓婇噸鏂拌幏鍙栧苟瀛樺叆缂撳瓨銆�
@@ -44,6 +47,6 @@
}catch (Exception e){
throw new ServiceException("浠巒acos涓婅幏鍙栬秴绾х鐞嗗憳閰嶇疆澶辫触锛�");
}
- }*/
+ }
}
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/config/NacosConfig.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/config/NacosConfig.java
similarity index 83%
rename from Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/config/NacosConfig.java
rename to Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/config/NacosConfig.java
index 23c1e4e..610e192 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/config/NacosConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/config/NacosConfig.java
@@ -1,9 +1,9 @@
-package com.vci.ubcs.common.config;
+package com.vci.ubcs.system.config;
-/*import org.springblade.core.cache.utils.CacheUtil;
+import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.utils.Func;
-import org.springframework.data.redis.core.RedisTemplate;*/
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.core.env.Environment;
@@ -29,11 +29,11 @@
@PostConstruct
public void init() {
- /*BladeUser adminUser = new BladeUser();
+ BladeUser adminUser = new BladeUser();
adminUser.setTenantId(environment.getProperty("user-info.tenant-id", "000000"));
adminUser.setUserName(environment.getProperty("user-info.user-name","admin"));
adminUser.setUserId(Func.toLong(environment.getProperty("user-info.id","0")));
- CacheUtil.getCache(NACOS_CONFIG_CACHE).put(ADMIN_INFO_CODE,adminUser);*/
+ CacheUtil.getCache(NACOS_CONFIG_CACHE).put(ADMIN_INFO_CODE,adminUser);
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeButtonController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeButtonController.java
index 2e1d209..ee1f49f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeButtonController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeButtonController.java
@@ -70,6 +70,7 @@
CodeButton detail = codeButtonMapper.selectOne(Condition.getQueryWrapper(codebutton));
return R.data(CodeButtonWrapper.build().entityVO(detail));
}
+
/**
* 妯℃澘鎵╁睍姹� 鍒嗛〉
*/
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
index d32e68c..8069761 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
@@ -39,7 +39,7 @@
* @param codeAllCode
* @return
*/
- List<CodeAllCodeVO> selectCodeAllCodePage(IPage page, CodeAllCodeVO codeAllCode, @Param("tenantId")String tenantId);
+ List<CodeAllCodeVO> selectCodeAllCodePage(IPage page, CodeAllCodeVO codeAllCode);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
index b498a08..547f5a7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -58,7 +58,7 @@
* @param oid 鍒嗙被鐨勪富閿�
* @return true 琛ㄧず鍖呭惈
*/
-// @MapKey("oid")
+ // @MapKey("oid")
Boolean checkHasChild(@Param("oid") String oid);
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java
index 017ada2..be07e46 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java
@@ -23,8 +23,6 @@
import com.vci.ubcs.code.mapper.CodeAllCodeMapper;
import com.vci.ubcs.code.service.ICodeAllCodeService;
import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
-import com.vci.ubcs.common.cache.NacosConfigCache;
-import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -46,26 +44,9 @@
@Lazy
private CodeAllCodeMapper codeAllcodeMapper;
- /**
- * nacos涓婃媺鍙栫殑閰嶇疆
- */
- @Resource
- private NacosConfigCache nacosConfigCache;
-
@Override
public IPage<CodeAllCodeVO> selectCodeAllcodePage(IPage<CodeAllCodeVO> page, CodeAllCodeVO CodeAllcode) {
- IPage<CodeAllCodeVO> codeAllCodeVOIPage = page.setRecords(
- baseMapper.selectCodeAllCodePage(
- page,
- CodeAllcode,
- AuthUtil.getTenantId()
- .equals(
- nacosConfigCache
- .getAdminUserInfo()
- .getTenantId()
- )
- ? null : AuthUtil.getTenantId()));
- return codeAllCodeVOIPage;
+ return page.setRecords(baseMapper.selectCodeAllCodePage(page,CodeAllcode));
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 721683a..825b051 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -2739,13 +2739,102 @@
String codeRuleOid = classifyVO.getCodeRuleOid();
if (StringUtils.isBlank(codeRuleOid)) {
//寰�涓婃壘
- CodeClassifyFullInfoBO fullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
- return getCodeRuleByClassifyFullInfo(fullInfo);
+ CodeRuleVO classifyFullInfoCodeRule = getCodeRuleByClassifyFullInfo(classifyService.getClassifyFullInfo(codeClassifyOid));
+ return toCodeValueApplyStatus(classifyFullInfoCodeRule);
}
//鏌ヨ缂栫爜瑙勫垯
- return ruleService.getObjectHasSecByOid(codeRuleOid);
+ CodeRuleVO objectHasSecByOid = ruleService.getObjectHasSecByOid(codeRuleOid);
+ return toCodeValueApplyStatus(objectHasSecByOid);
}
+ /**
+ * 缂栫爜鐢宠琛ㄥ崟锛岄殣钘忋�佸彲杈撱�佸彧璇昏浆鎹�
+ * @param codeRuleVO
+ * @return
+ */
+ private CodeRuleVO toCodeValueApplyStatus(CodeRuleVO codeRuleVO){
+ if(codeRuleVO.getSecVOList().isEmpty()){
+ return codeRuleVO;
+ }
+ // 鍙緭鐮佹绫诲瀷
+ List<String> inputTypes = Arrays.asList(
+ CodeSecTypeEnum.CODE_FIXED_SEC.getValue(),
+ CodeSecTypeEnum.CODE_VARIABLE_SEC.getValue(),
+ CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue(),
+ CodeSecTypeEnum.CODE_REFER_SEC.getValue()
+ );
+ // 鍙鐮佹绫诲瀷
+ List<String> readOnlyTypes = Arrays.asList(
+ CodeSecTypeEnum.CODE_LEVEL_SEC.getValue(),
+ CodeSecTypeEnum.CODE_ATTR_SEC.getValue(),
+ CodeSecTypeEnum.CODE_DATE_SEC.getValue()
+ );
+ // 闅愯棌鐮佹绫诲瀷
+ /*List<String> hideType = Arrays.asList(
+ CodeSecTypeEnum.CODE_SERIAL_SEC.getValue()
+ );*/
+ // 褰撳墠瑙勫垯鐨勬墍鏈夌被鍨嬬爜娈�
+ List<String> secTypeList = codeRuleVO.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.toList());
+ // 鎯呭喌涓� 鍏ㄩ儴鏄彧璇荤殑鐮佹绫诲瀷
+ boolean hasAllReadOnlyType =secTypeList.stream().allMatch(item -> readOnlyTypes.stream().anyMatch(item1-> item.equals(item1)));
+ // 鍏ㄩ儴鏄彧璇荤殑鐮佹绫诲瀷
+ if(hasAllReadOnlyType){
+ List<CodeBasicSecVO> basicSecVOS = codeRuleVO.getSecVOList().stream().map(secVO -> {
+ secVO.setCodeValueApplyStatus(3);
+ // 鏃ユ湡鐮佹璁剧疆榛樿鍊�
+ if (secVO.getSecType().equals(CodeSecTypeEnum.CODE_DATE_SEC.getValue())) {
+ try {
+ secVO.setCodeDateFormatStr(Func.format(new Date(),secVO.getCodeDateFormatStr()));
+ }catch (Exception e){
+ throw new ServiceException("鏃ユ湡鐮佹鏃ユ湡鏍煎紡閰嶇疆鏈夎锛屽鑷磋浆鎹㈠嚭閿欙細"+e.getMessage());
+ }
+ }
+ return secVO;
+ }).collect(Collectors.toList());
+ codeRuleVO.setSecVOList(basicSecVOS);
+ return codeRuleVO;
+ }
+ // 鎯呭喌浜� 鍏ㄩ儴閮芥槸鍙緭鍏ョ被鍨嬬殑
+ boolean hasAllInputType = secTypeList.stream().allMatch(item -> inputTypes.stream().anyMatch(item1-> item.equals(item1)));
+ if(hasAllInputType){
+ List<CodeBasicSecVO> basicSecVOS = codeRuleVO.getSecVOList().stream().map(secVO -> {
+ secVO.setCodeValueApplyStatus(1);
+ // 鏃ユ湡鐮佹璁剧疆榛樿鍊�
+ if (secVO.getSecType().equals(CodeSecTypeEnum.CODE_DATE_SEC.getValue())) {
+ try {
+ secVO.setCodeDateFormatStr(Func.format(new Date(),secVO.getCodeDateFormatStr()));
+ }catch (Exception e){
+ throw new ServiceException("鏃ユ湡鐮佹鏃ユ湡鏍煎紡閰嶇疆鏈夎锛屽鑷磋浆鎹㈠嚭閿欙細"+e.getMessage());
+ }
+ }
+ return secVO;
+ }).collect(Collectors.toList());
+ codeRuleVO.setSecVOList(basicSecVOS);
+ return codeRuleVO;
+ }
+ // 鎯呭喌涓夊寘鍚汉涓洪�夋嫨鐨勭爜娈碉紝鍙堟湁鍙绫诲瀷鐮佹鐨勶紝鎵�鏈夌爜娈甸兘瑕佹樉绀哄嚭鏉ワ紝鍙緭璁剧疆涓�1锛屽彧璇昏缃负2锛岄殣钘忚缃负3
+ List<CodeBasicSecVO> basicSecVOS = codeRuleVO.getSecVOList().stream().map(secVO -> {
+ if(inputTypes.contains(secVO.getSecType())){
+ secVO.setCodeValueApplyStatus(1);
+ }else if(readOnlyTypes.contains(secVO.getSecType())){
+ secVO.setCodeValueApplyStatus(2);
+ }else{
+ secVO.setCodeValueApplyStatus(3);
+ }
+ // 鏃ユ湡鐮佹璁剧疆榛樿鍊�
+ if (secVO.getSecType().equals(CodeSecTypeEnum.CODE_DATE_SEC.getValue())) {
+ try {
+ secVO.setCodeDateFormatStr(Func.format(new Date(),secVO.getCodeDateFormatStr()));
+ }catch (Exception e){
+ throw new ServiceException("鏃ユ湡鐮佹鏃ユ湡鏍煎紡閰嶇疆鏈夎锛屽鑷磋浆鎹㈠嚭閿欙細"+e.getMessage());
+ }
+ }
+ return secVO;
+ }).collect(Collectors.toList());
+ codeRuleVO.setSecVOList(basicSecVOS);
+ return codeRuleVO;
+ }
+
/**
* 浣跨敤鍒嗙被鐨勫叏閮ㄤ俊鎭幏鍙栫紪鐮佽鍒�
*
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
index 201be73..523d622 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
@@ -8,11 +8,6 @@
<select id="selectCodeAllCodePage" resultMap="CodeAllcodeResultMap">
select * from PL_CODE_ALLCODE
- <where>
- <if test="tenantId != null and tenantId != ''">
- TENANT_ID = #{tenantId}
- </if>
- </where>
</select>
</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index 83d12c5..8f12082 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -45,9 +45,9 @@
</sql>
<select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
- select * from PL_CODE_CLASSIFY where is_deleted = 0
+ select * from PL_CODE_CLASSIFY where
<if test="tenantId != null and tenantId != ''">
- and tenant_id = #{tenantId}
+ tenant_id = #{tenantId}
</if>
</select>
@@ -241,7 +241,6 @@
SYS_CONNECT_BY_PATH(id, '#') as paths
</otherwise>
</choose>
-
from pl_code_classify plcodeclassify
START WITH parentCodeClassifyOid is null
CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
@@ -363,7 +362,6 @@
<if test="parentOid == null or parentOid == ''">
and codeclassify0.parentcodeclassifyoid is null
</if>
-
<if test="tenantId != null and tenantId != ''">
and codeclassify0.tenant_id = #{tenantId}
</if>
@@ -450,7 +448,6 @@
<if test="desc != null">
and codeclassify0.DESCRIPTION = #{desc}
</if>
-
<if test="tenantId != null and tenantId != ''">
and codeclassify0.tenant_id = #{tenantId}
</if>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeFixedValueMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeFixedValueMapper.xml
index d642a2e..7f3f632 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeFixedValueMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeFixedValueMapper.xml
@@ -109,7 +109,6 @@
<foreach collection="secOids" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
-
</select>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
index 676ea36..4546f83 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
@@ -135,20 +135,20 @@
<select id="selectShowFieldByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeShowFieldConfig">
SELECT temp.* FROM (
- SELECT
- PCS.REFERCONFIGOID,
- PCS.FIELD,
- PCS.TITLE,
- PCS.FIELDTYPE,
- PCS.SORT,
- PCS.ATTRSORTFIELD,
- PCS.WIDTH,
- PCS.FIXEDPOSITION,
- PCS.TEMPLET,
- PCS.ISQUERY
- FROM PL_CODE_REFERCONFIG PCR
- LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID)
- temp WHERE temp.REFERCONFIGOID = #{oid}
+ SELECT
+ PCS.REFERCONFIGOID,
+ PCS.FIELD,
+ PCS.TITLE,
+ PCS.FIELDTYPE,
+ PCS.SORT,
+ PCS.ATTRSORTFIELD,
+ PCS.WIDTH,
+ PCS.FIXEDPOSITION,
+ PCS.TEMPLET,
+ PCS.ISQUERY
+ FROM PL_CODE_REFERCONFIG PCR
+ LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID
+ )temp WHERE temp.REFERCONFIGOID = #{oid}
</select>
<select id="selectSrchCondByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeSrchCondConfig">
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml
index cb19814..6edc83c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml
@@ -35,7 +35,7 @@
<select id="selectCodeTempphasePage" resultMap="CodeTempphaseResultMap">
- select * from PL_CODE_TEMPPHASE where is_deleted = 0
+ select * from PL_CODE_TEMPPHASE
</select>
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
index 906f470..7359525 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.common.constant.CommonConstant;
-import com.vci.ubcs.common.cache.NacosConfigCache;
+import com.vci.ubcs.system.cache.NacosConfigCache;
import com.vci.ubcs.system.entity.Strategy;
import com.vci.ubcs.system.mapper.StrategyMapper;
import com.vci.ubcs.system.service.IStrategyService;
--
Gitblit v1.9.3