WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改UAT问题

Browse Source
This commit is contained in:
高嵩
2023-08-17 17:40:06 +08:00
parent c71e75132a
commit 09e3297be4
13 changed files with 206 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+9 -7
View File
@@ -79,13 +79,15 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
IPage page = new Page(pageNo, pageSize);
IPage pageList = paramsManifestEOService.pageInfo(page, paramsManifestEO);
List<ParamsManifestEO> rows = pageList.getRecords();
// 处理 状态 中英文
Map<String, String> stateMap = ManifestStateEnum.toMap(cut);
rows.forEach(manifestEO -> {
manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion(),paramsManifestEO.getCut()).getProjectName());
manifestEO.setState(stateMap.get(manifestEO.getState()));
});
// List<ParamsManifestEO> rows = pageList.getRecords();
// // 处理 状态 中英文
// Map<String, String> stateMap = ManifestStateEnum.toMap(cut);
// rows.forEach(manifestEO -> {
// manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion(),paramsManifestEO.getCut()).getProjectName());
// manifestEO.setState(stateMap.get(manifestEO.getState()));
// });
pageList.setRecords(paramsManifestEOService.queryList(paramsManifestEO));
return Result.OK(cut, pageList);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
+4
View File
@@ -128,4 +128,8 @@ public class ParamsManifestEO implements Serializable {
// 参数项清单的参考列配置id(对应上报库参数配置表（params_report_config）中的id)
private String referencesColId;
//是否为历史记录数据(0:不是；1:是)
@TableField(exist = false)
private String isHistory;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
+5
View File
@@ -21,6 +21,11 @@ import java.util.Map;
*/
public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
/**
* 查询列表
*/
List<ParamsManifestEO> queryList(ParamsManifestEO paramsManifestEO);
/**
* 保存
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java
+2
View File
@@ -18,5 +18,7 @@ public interface IParamsManifestHistoryEOService extends IService<ParamsManifest
List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId);
List<ParamsManifestHistoryEO> getHistoryList(String paramsManifestId);
void deleteAllHistoryVersion(List<String> paramsManifestIdList);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+1 -1
View File
@@ -1509,7 +1509,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
String[] references = projectName.split("-");
// map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
map.put("db_field_txt", projectName + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
map.put("db_field_txt", paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
map.put("db_field_id", paramsManifestEO.getReferencesColId());
map.put("references_col", true);
} else {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+24 -4
View File
@@ -12,10 +12,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.DictModel;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import com.jero.modules.cert.collect.entity.ParamsManifestEO;
import com.jero.modules.cert.collect.entity.*;
import com.jero.modules.cert.collect.enums.CollectManifestChangeFlagEnum;
import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
import com.jero.modules.cert.collect.enums.ManifestStateEnum;
@@ -127,6 +124,29 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
@Autowired
private ISysDictItemService sysDictItemService;
@Override
public List<ParamsManifestEO> queryList(ParamsManifestEO paramsManifestEO) {
List<ParamsManifestEO> resList = new ArrayList<>();
LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
if(StringUtils.isNotEmpty(paramsManifestEO.getTitle())){
queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle());
}
queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId());
List<ParamsManifestEO> paramsManifestEOList = list(queryWrapper);
resList.addAll(paramsManifestEOList);
for (ParamsManifestEO pm : paramsManifestEOList) {
pm.setIsHistory("0");
List<ParamsManifestHistoryEO> hisList = paramsManifestHistoryEOService.getHistoryList(pm.getId());
if(CollectionUtils.isNotEmpty(hisList)){
for (ParamsManifestHistoryEO his : hisList) {
his.setIsHistory("1");
resList.add(his);
}
}
}
return resList;
}
/**
* 保存
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java
+10
View File
@@ -133,6 +133,16 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl<ParamsManife
paramsManifestHistoryEOService.save(paramsManifestHistoryEO);
}
@Override
public List<ParamsManifestHistoryEO> getHistoryList(String paramsManifestId) {
// 历史版本和当前版本通过id进行关联
LambdaQueryWrapper<ParamsManifestHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsManifestHistoryEO::getSourceParamsManifestId, paramsManifestId)
.orderByAsc(ParamsManifestHistoryEO::getVersion);
List<ParamsManifestHistoryEO> list = list(queryWrapper);
return list;
}
@Override
public List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId) {
// 历史版本和当前版本通过id进行关联