Merge pull request #196 from trungnt-ksnb/feature-dossier

Feature dossier
VietOpenCPS · May 16, 2016 · aa6386f · aa6386f
2 parents 85bc4db + bb9dfc4
commit aa6386f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...ets/opencps-portlet/docroot/WEB-INF/src/org/opencps/dossiermgt/bean/ProcessOrderBean.java b/...ets/opencps-portlet/docroot/WEB-INF/src/org/opencps/dossiermgt/bean/ProcessOrderBean.java
@@ -276,7 +276,7 @@ public String getAssignToUserName() {
 		try {
 			user = UserLocalServiceUtil
 			    .fetchUserById(this
-			        .getActionUserId());
+			        .getAssignToUsesrId());
 
 		}
 		catch (Exception e) {

diff --git a/...s/opencps-portlet/docroot/html/portlets/dossiermgt/frontoffice/frontofficedossierlist.jsp b/...s/opencps-portlet/docroot/html/portlets/dossiermgt/frontoffice/frontofficedossierlist.jsp
@@ -1,3 +1,5 @@
+<%@page import="org.opencps.servicemgt.service.ServiceInfoLocalServiceUtil"%>
+<%@page import="org.opencps.servicemgt.model.ServiceInfo"%>
 <%
 /**
  * OpenCPS is the open source Core Public Services software
@@ -82,7 +84,13 @@
 				//id column
 				row.addText(String.valueOf(dossier.getDossierId()));
 				row.addText(DateTimeUtil.convertDateToString(dossier.getCreateDate(), DateTimeUtil._VN_DATE_TIME_FORMAT));
-				row.addText(String.valueOf(dossier.getSubjectId()));
+				ServiceInfo serviceInfo = null;
+				String serviceName = StringPool.DASH;
+				try{
+					serviceInfo = ServiceInfoLocalServiceUtil.getServiceInfo(dossier.getServiceInfoId());
+					serviceName = serviceInfo.getServiceName();
+				}catch(Exception e){}
+				row.addText(serviceName);
 				row.addText(dossier.getGovAgencyName());
 				row.addText(PortletUtil.getDossierStatusLabel(dossier.getDossierStatus(), locale));
 				row.addText(DateTimeUtil.convertDateToString(dossier.getReceiveDatetime(), DateTimeUtil._VN_DATE_TIME_FORMAT));