From b46cf401da847d7cca6269c6b2ffb04f6f72691a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 14 五月 2023 03:57:37 +0800
Subject: [PATCH] 新增应用码段下的参照配置界面，以及代码整合
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
index dd76b88..a0469b6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.core.JsonParser;
+import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
import com.vci.ubcs.code.entity.CodeClassifyProcessTemp;
import com.vci.ubcs.code.mapper.CodeClassifyProcessTempMapper;
@@ -31,9 +34,11 @@
import javax.annotation.Resource;
import java.sql.Wrapper;
+import java.text.SimpleDateFormat;
import java.util.*;
import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.*;
+import static com.vci.ubcs.code.constant.MdmBtmTypeConstant.CODE_CLASSIFY_PROCESS_TEMPLATE;
/**
* 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎湇鍔℃帴鍙�
@@ -67,7 +72,7 @@
public IPage<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
Query query = new Query();
if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
+ //pageHelper = new PageHelper(-1);
query.setSize(-1);
}else {
query.setSize(pageHelper.getLimit());
@@ -78,14 +83,12 @@
BeanMap beanMap = BeanMap.create(codeClassifyProcessTemp);
beanMap.putAll(conditionMap);
IPage<CodeClassifyProcessTemp> doList = codeClassifyProcessTempMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeClassifyProcessTemp));
- IPage<CodeClassifyProcessTempVO> pageList = new Page<CodeClassifyProcessTempVO>();
+ IPage<CodeClassifyProcessTempVO> voList = new Page<>();
//DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
if (!CollectionUtils.isEmpty(doList.getRecords())) {
- pageList.setRecords(CodeClassifyProcessTempWrapper.build().listVO(doList.getRecords()));
- //鍒嗛〉鍙傛暟杞埌pageVO瀵硅薄
- pageList = PageDO2PageVO.pageDO2PageVO(doList,pageList);
+ voList = CodeClassifyProcessTempWrapper.build().pageVO(doList);
}
- return pageList;
+ return voList;
}
/**
@@ -145,7 +148,7 @@
//灏咲TO杞崲涓篋O
CodeClassifyProcessTemp codeClassifyProcessTempDO = new CodeClassifyProcessTemp();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
- codeClassifyProcessTempDO = DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyProcessTempDO,"codeclsflowtemp");
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyProcessTempDO, MdmBtmTypeConstant.CODE_CLASSIFY_PROCESS_TEMPLATE);
codeClassifyProcessTempMapper.insert(codeClassifyProcessTempDO);
//鍥犱负涓氬姟绫诲瀷鏈韩娌℃湁鎺у埗鐗堟湰锛屾墍鏈夊己鍒剁粰鐗堟湰revisionValue璁剧疆鍊硷紝骞冲彴涔熶細鍙樻垚绌恒�傘�傘�傘��
//鐗堟湰鍙蜂笉鑳戒娇鐢ㄩ粯璁ょ殑灞炴��
@@ -165,7 +168,7 @@
//灏咲TO杞崲涓篋O
CodeClassifyProcessTemp codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid());
revisionModelUtil.copyFromDTOIgnore(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
- codeClassifyProcessTempDO = DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO);
codeClassifyProcessTempMapper.updateById(codeClassifyProcessTempDO);
return CodeClassifyProcessTempWrapper.build().entityVO(codeClassifyProcessTempDO);
}
@@ -310,8 +313,7 @@
private boolean checkTs(CodeClassifyProcessTemp tempDO, CodeClassifyProcessTemp codeClassifyProcessTempDO){
Date dbTs = codeClassifyProcessTempDO.getTs();
Date currentTs = tempDO.getTs();
- int i = currentTs.compareTo(dbTs);
- if(i==0){
+ if(currentTs == null ? dbTs == null:currentTs.compareTo(dbTs)==0){
return true;
}
return false;
--
Gitblit v1.9.3