Commit b5c8735b by 宋祥

Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into master-dc

parents d23c3691 a736e4e4
...@@ -6,6 +6,7 @@ import com.baosight.hggp.core.extapp.decheng.api.DcOpenApi; ...@@ -6,6 +6,7 @@ import com.baosight.hggp.core.extapp.decheng.api.DcOpenApi;
import com.baosight.hggp.core.extapp.decheng.model.DcContract; import com.baosight.hggp.core.extapp.decheng.model.DcContract;
import com.baosight.hggp.core.extapp.decheng.model.DcContractList; import com.baosight.hggp.core.extapp.decheng.model.DcContractList;
import com.baosight.hggp.core.model.Pager; import com.baosight.hggp.core.model.Pager;
import com.baosight.hggp.core.tools.CodeValueTools;
import com.baosight.hggp.core.utils.ThreadUtils; import com.baosight.hggp.core.utils.ThreadUtils;
import com.baosight.hggp.hg.pz.domain.HGPZ009; import com.baosight.hggp.hg.pz.domain.HGPZ009;
import com.baosight.hggp.hg.pz.tools.HGPZTools; import com.baosight.hggp.hg.pz.tools.HGPZTools;
...@@ -232,8 +233,19 @@ public class ServiceHGSC101 extends ServiceEPBase { ...@@ -232,8 +233,19 @@ public class ServiceHGSC101 extends ServiceEPBase {
* @return * @return
*/ */
private String getProjectSource(String name) { private String getProjectSource(String name) {
List<Map> codesetMaps = CodeValueTools.getCodeValues("app.sc.projectSource");
if (CollectionUtils.isEmpty(codesetMaps)) {
ProjectSourceEnum projectSourceEnum = ProjectSourceEnum.getByName(name); ProjectSourceEnum projectSourceEnum = ProjectSourceEnum.getByName(name);
return projectSourceEnum == null ? ProjectSourceEnum.OTHER.getCode() : projectSourceEnum.getCode(); return projectSourceEnum == null ? ProjectSourceEnum.OTHER.getCode() : projectSourceEnum.getCode();
} }
for (Map codesetMap : codesetMaps) {
String value = MapUtils.getString(codesetMap, "value");
String text = MapUtils.getString(codesetMap, "label");
if (text.equals(name)) {
return value;
}
}
return ProjectSourceEnum.OTHER.getCode();
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment