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

Merge remote-tracking branch 'origin/fix_2nd_20230103' into fix_2nd_20230103

Browse Source
This commit is contained in:
zyx.net
2023-02-09 11:33:11 +08:00
parent 5e13324ace abd8f44d26
commit 5cb0df6616
2 changed files with 15 additions and 7 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/service/impl/ParamsCollectManifestEOServiceImpl.java
+12 -2
View File
@@ -1384,7 +1384,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
map.put("flag", true); // 标识 map.put("flag", true); // 标识
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)); map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
String[] references = projectName.split("-"); String[] references = projectName.split("-");
map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名 // 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_id", paramsManifestEO.getReferencesColId()); map.put("db_field_id", paramsManifestEO.getReferencesColId());
map.put("references_col", true); map.put("references_col", true);
} else { } else {
@@ -1400,7 +1401,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
map.put("flag", true); // 标识 map.put("flag", true); // 标识
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)); map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
String[] references = projectName.split("-"); String[] references = projectName.split("-");
map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名 // map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
map.put("db_field_txt", projectName + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
map.put("db_field_id", paramsManifestEO.getReferencesColId()); map.put("db_field_id", paramsManifestEO.getReferencesColId());
map.put("references_col", true); map.put("references_col", true);
@@ -1411,6 +1413,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
} }
} }
if(StringUtils.equals(dbFieldName,"nio_number")
|| StringUtils.equals(dbFieldName,"duty_territory")
|| StringUtils.equals(dbFieldName,"sdt")
|| StringUtils.equals(dbFieldName,"dre")
|| StringUtils.equals(dbFieldName,"deadline")
){
map.put("sort", "true");
}
list.add(map); list.add(map);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+3 -5
View File
@@ -3173,12 +3173,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
cnContentLower = "项目: " + PRN + cnContentLower = "项目: " + PRN +
"\n法规: " + LAW_CN + "\n法规: " + LAW_CN +
"\n发起人: " + sysUser.getUsername() + "\n发起人: " + sysUser.getUsername() +
"\n截止时间: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate()); "\n截止时间: " + sdf.format(projectLawsInventoryEO.getDesignDueDate());
enContentUpper = "Hello! "+ sysUser.getUsername() +" has completed the task. Please check and review it"; enContentUpper = "Hello! "+ sysUser.getUsername() +" has completed the task. Please check and review it";
enContentLower = "Project: " + PRN + enContentLower = "Project: " + PRN +
"\nRegulation No: " + LAW_EN + "\nRegulation No: " + LAW_EN +
"\nInitiator: " + sysUser.getUsername() + "\nInitiator: " + sysUser.getUsername() +
"\nDue Date: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate()); "\nDue Date: " + sdf.format(projectLawsInventoryEO.getDesignDueDate());
color = MsgColorEnum.GREEN.getValue(); color = MsgColorEnum.GREEN.getValue();
//feishuMsgVo.setAssignee(sysUser.getUsername()); //feishuMsgVo.setAssignee(sysUser.getUsername());
@@ -3384,9 +3384,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink()
+ projectLibraryBase.getId() + projectLibraryBase.getId()
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getType() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-" + "&projectName=" + PRN;
+ projectYearNameInfoEO.getYearName()
+ projectLibraryBase.getTargetMarket();
//href = "<a href='" //href = "<a href='"
// + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType() // + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
// + "&projectName=" + projectNameInfoEO.getProjectName() + "-" // + "&projectName=" + projectNameInfoEO.getProjectName() + "-"