yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

制度手册导出版本号处理

Browse Source
This commit is contained in:
lihongyu 2022-09-05 17:38:44 +08:00
parent 9021ac50b9
commit 970210629e
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readword/ReadWordUtil.java
View File

@ -679,7 +679,7 @@ public class ReadWordUtil {
public static PALRepositoryModel getRepositoryByName(String wsId, String repositoryName) {
List<PALRepositoryModel> palRepositoryModels = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getAllCoeProcessLevelByWsId(wsId);
for (PALRepositoryModel palRepositoryModel : palRepositoryModels) {
if (palRepositoryModel.getName().equals(repositoryName)) {
if (palRepositoryModel.getName().equals(repositoryName)&&palRepositoryModel.isUse()) {
return palRepositoryModel;
}
}

14
com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java
View File

@ -690,8 +690,18 @@ public class Report1Gener {
// 版本P_versions，制度用的是versions
String attr = "versions";
String val = "";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
String plvers = model.getVersion()+"";
String plver = "";
if (!"".equals(plvers)) {
if (plvers.length() > 1) {
plver = plvers.substring(0, 1) + "."
+ plvers.substring(plvers.length() - 1, plvers.length());
} else {
plver = plvers.substring(0, 1) + ".0";
}
}
//val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, "V"+plver);
// 拟制/修订单位Issuing_department
attr = "Issuing_department";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);