Merge pull request #1995 from tranvietlam92/release-candidate-2.2

update metaData of dossier

modules/backend-admin-config/backend-admin-config-service/src/main/java/org/opencps/adminconfig/model/impl/DynamicReportModelImpl.java

@@ -99,7 +99,7 @@ public class DynamicReportModelImpl extends BaseModelImpl<DynamicReport>
 		TABLE_COLUMNS_MAP.put("reportType", Types.VARCHAR);
 	}
 
-	public static final String TABLE_SQL_CREATE = "create table opencps_dynamicreport (dynamicReportId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,sharing INTEGER,reportName VARCHAR(75) null,reportCode VARCHAR(75) null,filterConfig VARCHAR(75) null,tableConfig VARCHAR(75) null,userConfig VARCHAR(75) null,reportType VARCHAR(75) null)";
+	public static final String TABLE_SQL_CREATE = "create table opencps_dynamicreport (dynamicReportId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,sharing INTEGER,reportName VARCHAR(75) null,reportCode VARCHAR(75) null,filterConfig TEXT null,tableConfig TEXT null,userConfig VARCHAR(1000) null,reportType VARCHAR(75) null)";
 	public static final String TABLE_SQL_DROP = "drop table opencps_dynamicreport";
 	public static final String ORDER_BY_JPQL = " ORDER BY dynamicReport.reportCode ASC";
 	public static final String ORDER_BY_SQL = " ORDER BY opencps_dynamicreport.reportCode ASC";

modules/backend-admin-config/backend-admin-config-service/src/main/resources/META-INF/portlet-model-hints.xml

@@ -26,13 +26,13 @@
 		<field name="sharing" type="int" />
 		<field name="reportName" type="String" />
 		<field name="reportCode" type="String" />
-		<field name="filterConfig" type="String" >
+		<field name="filterConfig" type="String">
 			<hint name="max-length">65535</hint>
 		</field>
-		<field name="tableConfig" type="String" >
+		<field name="tableConfig" type="String">
 			<hint name="max-length">65535</hint>
 		</field>
-		<field name="userConfig" type="String" >
+		<field name="userConfig" type="String">
 			<hint name="max-length">1000</hint>
 		</field>
 		<field name="reportType" type="String" />

modules/backend-admin-config/backend-admin-config-service/src/main/resources/META-INF/sql/tables.sql

@@ -24,8 +24,8 @@ create table opencps_dynamicreport (
 	sharing INTEGER,
 	reportName VARCHAR(75) null,
 	reportCode VARCHAR(75) null,
-	filterConfig VARCHAR(75) null,
-	tableConfig VARCHAR(75) null,
-	userConfig VARCHAR(75) null,
+	filterConfig TEXT null,
+	tableConfig TEXT null,
+	userConfig VARCHAR(1000) null,
 	reportType VARCHAR(75) null
 );

modules/backend-admin-config/backend-admin-config-service/src/main/resources/service.properties

@@ -13,5 +13,5 @@
 ##
 
     build.namespace=ADMIN_CONFIG
-    build.number=67
-    build.date=1561802353937
+    build.number=73
+    build.date=1562063570273

modules/backend-api-rest/src/main/java/org/opencps/api/controller/DossierManagement.java

@@ -40,6 +40,8 @@
 import org.opencps.api.processsequence.model.DossierSequenceResultModel;
 import org.opencps.api.reassign.model.ReAssign;
 import org.opencps.api.reassign.model.ToUsers;
+import org.opencps.api.serviceprocess.model.ServiceProcessResultsModel;
+import org.opencps.api.serviceprocess.model.ServiceProcessSearchModel;
 import org.opencps.api.v21.dossiersync.model.DossierSyncV21ResultsModel;
 import org.opencps.exception.model.ExceptionModel;
 
@@ -934,4 +936,18 @@ public Response updateDossierInGroup(@Context HttpServletRequest request, @Conte
 	public Response addFullDossier(@Context HttpServletRequest request, @Context HttpHeaders header,
 			@Context Company company, @Context Locale locale, @Context User user,
 			@Context ServiceContext serviceContext, @BeanParam DossierMultipleInputModel input);
+
+	@GET
+	@Path("/dueDate")
+	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+	@ApiOperation(value = "Get dueDate by ServiceProcess", response = ServiceProcessResultsModel.class)
+	@ApiResponses(value = {
+			@ApiResponse(code = HttpURLConnection.HTTP_OK, message = "Returns a list of all ServiceProcesses", response = ServiceProcessResultsModel.class),
+			@ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = "Unauthorized", response = ExceptionModel.class),
+			@ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = "Not found", response = ExceptionModel.class),
+			@ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = "Access denied", response = ExceptionModel.class) })
+
+	public Response getDueDateByProcess(@Context HttpServletRequest request, @Context HttpHeaders header,
+			@Context Company company, @Context Locale locale, @Context User user,
+			@Context ServiceContext serviceContext, @BeanParam DossierSearchModel query);
 }

modules/backend-api-rest/src/main/java/org/opencps/api/controller/ServiceProcessManagement.java

@@ -492,4 +492,5 @@ public Response deleteProcessSequence(@Context HttpServletRequest request, @Cont
 	public Response getServiceProcessMermaidGraph(@Context HttpServletRequest request, @Context HttpHeaders header,
 			@Context Company company, @Context Locale locale, @Context User user,
 			@Context ServiceContext serviceContext, @PathParam("id") String id);
+
 }

modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/DossierManagementImpl.java

@@ -38,6 +38,7 @@
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -850,6 +851,14 @@ public Response getDossierProcessList(HttpServletRequest request, HttpHeaders he
 			params.put(DossierTerm.APPLICANT_ID_NO, applicantIdNo);
 			params.put(DossierTerm.SERVICE_NAME, serviceName);
 			params.put(PaymentFileTerm.PAYMENT_STATUS, query.getPaymentStatus());
+			//
+			if (Validator.isNotNull(query.getAssigned())) {
+				if (query.getAssigned() == 1) {
+					params.put(DossierTerm.ASSIGNED_USER_ID, userId + "_assigned");
+				} else if(query.getAssigned() == 0){
+					params.put(DossierTerm.ASSIGNED_USER_ID, userId + "_follow");
+				}
+			}
 
 			//Process follow StepCode
 			if (Validator.isNotNull(strStatusStep)) {
@@ -4947,6 +4956,7 @@ public Response addFullDossier(HttpServletRequest request, HttpHeaders header, C
 			User user, ServiceContext serviceContext, DossierMultipleInputModel input) {
 		long groupId = GetterUtil.getLong(header.getHeaderString("groupId"));
 		try {
+			_log.info("dossiers: "+input.getDossiers());
 			if (Validator.isNotNull(input.getDossiers())) {
 				JSONObject dossiers = JSONFactoryUtil.createJSONObject(input.getDossiers());
 				String applicantName = Validator.isNotNull(dossiers.getString(DossierTerm.APPLICANT_NAME))
@@ -4955,6 +4965,9 @@ public Response addFullDossier(HttpServletRequest request, HttpHeaders header, C
 				String delegateName = Validator.isNotNull(dossiers.getString(DossierTerm.DELEGATE_NAME))
 						? dossiers.getString(DossierTerm.DELEGATE_NAME)
 						: StringPool.BLANK;
+
+				_log.info("applicantName: "+applicantName);
+				_log.info("delegateName: "+delegateName);
 				String[] statusArr = {StringPool.BLANK, DossierTerm.DOSSIER_STATUS_NEW};
 				List<Dossier> dossierList = DossierLocalServiceUtil.getByGID_GC_SC_DTN_DS_APP_DELEGATE(groupId,
 						input.getGovAgencyCode(), input.getServiceCode(), input.getDossierTemplateNo(), statusArr,
@@ -4982,4 +4995,49 @@ public Response addFullDossier(HttpServletRequest request, HttpHeaders header, C
 		}
 	}
 
+	@Override
+	public Response getDueDateByProcess(HttpServletRequest request, HttpHeaders header, Company company, Locale locale,
+			User user, ServiceContext serviceContext, DossierSearchModel query) {
+
+		long groupId = GetterUtil.getLong(header.getHeaderString("groupId"));
+		try {
+			JSONObject jsonData = JSONFactoryUtil.createJSONObject();
+			String strReceiveDate = query.getFromReceiveDate();
+			Date receiveDate = null;
+			if (Validator.isNotNull(strReceiveDate)) {
+				SimpleDateFormat sdf = new SimpleDateFormat(APIDateTimeUtils._NORMAL_PARTTERN);
+				receiveDate = sdf.parse(strReceiveDate);
+			} else {
+				receiveDate = new Date();
+			}
+			//
+			jsonData.put(DossierTerm.RECEIVE_DATE, receiveDate != null ? receiveDate.getTime() : (new Date()).getTime());
+			Date dueDate = null;
+			ProcessOption option = getProcessOption(query.getService(), query.getAgency(),
+					query.getTemplate(), groupId);
+			if (option != null) {
+				ServiceProcess process = ServiceProcessLocalServiceUtil
+						.fetchServiceProcess(option.getServiceProcessId());
+				if (process != null) {
+					Double durationCount = process.getDurationCount();
+					if (Validator.isNotNull(String.valueOf(durationCount)) && durationCount > 0d) {
+						dueDate = HolidayUtils.getDueDate(receiveDate, process.getDurationCount(),
+								process.getDurationUnit(), groupId);
+						jsonData.put(DossierTerm.DUE_DATE, dueDate != null ? dueDate.getTime() : 0);
+					} else {
+						jsonData.put(DossierTerm.DUE_DATE, 0);
+					}
+				} else {
+					jsonData.put(DossierTerm.DUE_DATE, 0);
+				}
+			} else {
+				jsonData.put(DossierTerm.DUE_DATE, 0);
+			}
+			return Response.status(HttpStatus.SC_OK).entity(JSONFactoryUtil.looseSerialize(jsonData)).build();
+		} catch (Exception e) {
+			_log.debug(e);
+		}
+		return Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).entity("No Content").build();
+	}
+
 }

modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/DossierUtils.java

@@ -408,6 +408,7 @@ public static List<DossierDataModel> mappingForGetList(List<Document> docs, long
 			model.setDelegateDistrictName(doc.get(DossierTerm.DELEGATE_DISTRICTNAME));
 			model.setDelegateWardCode(doc.get(DossierTerm.DELEGATE_WARDCODE));
 			model.setDelegateWardName(doc.get(DossierTerm.DELEGATE_WARDNAME));
+			model.setMetaData(doc.get(DossierTerm.META_DATA));
 
 			ouputs.add(model);
 		}
@@ -879,6 +880,7 @@ public static DossierDetailModel mappingForGetDetail(Dossier input, long userId)
 		model.setOriginality(input.getOriginality());
 		model.setOriginDossierId(input.getOriginDossierId());
 		model.setOriginDossierNo(input.getOriginDossierNo());
+		model.setMetaData(input.getMetaData());
 
 		return model;
 	}
@@ -1266,6 +1268,7 @@ public static DossierInputModel convertFormModelToInputModel(org.opencps.api.dos
 		model.setPostalWardCode(input.getPostalWardCode());
 		model.setPostalWardName(input.getPostalWardName());
 		model.setOriginDossierNo(input.getOriginDossierNo());
+		model.setMetaData(input.getMetaData());
 
 		return model;
 	}
@@ -1354,6 +1357,7 @@ public static DossierPublishModel convertFormModelToPublishModel(org.opencps.api
 		model.setViaPostal(input.getViaPostal());
 		model.setWardCode(input.getWardCode());
 		model.setWardName(input.getWardName());
+		model.setMetaData(input.getMetaData());
 
 		return model;
 	}

modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierDataModel.java

@@ -198,6 +198,7 @@
     "delegateDistrictName",
     "delegateWardCode",
     "delegateWardName",
+    "metaData"
 })
 public class DossierDataModel {
 
@@ -301,6 +302,7 @@ public class DossierDataModel {
     protected String delegateTelNo;
     protected String delegateWardCode;
     protected String delegateWardName;
+    protected String metaData;
 
 	public String getStatusReg() {
 		return statusReg;
@@ -2112,4 +2114,12 @@ public void setDelegateWardName(String delegateWardName) {
 		this.delegateWardName = delegateWardName;
 	}
 
+	public String getMetaData() {
+		return metaData;
+	}
+
+	public void setMetaData(String metaData) {
+		this.metaData = metaData;
+	}
+
 }

modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierDetailModel.java

@@ -193,7 +193,8 @@
     "dossierName",
     "originality",
     "originDossierId",
-    "originDossierNo"
+    "originDossierNo",
+    "metaData"
 })
 @XmlRootElement(name = "DossierDetailModel")
 public class DossierDetailModel {
@@ -294,6 +295,7 @@ public class DossierDetailModel {
     protected int originality;
 	protected Long originDossierId;
 	protected String originDossierNo;
+	protected String metaData;
 
     public String getPaymentFee() {
 		return paymentFee;
@@ -2094,4 +2096,12 @@ public void setOriginDossierNo(String originDossierNo) {
 		this.originDossierNo = originDossierNo;
 	}
 
+	public String getMetaData() {
+		return metaData;
+	}
+
+	public void setMetaData(String metaData) {
+		this.metaData = metaData;
+	}
+
 }

modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierInputModel.java

@@ -111,7 +111,8 @@
 	"dossierFileArr",
 	"dossiers",
 	"payment",
-	"importing"
+	"importing",
+	"metaData"
 })
 @XmlRootElement(name = "DossierInputModel")
 public class DossierInputModel {
@@ -238,6 +239,8 @@ public class DossierInputModel {
 	private String dossiers;
 	@FormParam(value = "payment")
 	private String payment;
+	@FormParam(value = "metaData")
+	private String metaData;
 
 	public Integer getViaPostal() {
 		return viaPostal;
@@ -1079,4 +1082,12 @@ public void setPayment(String payment) {
 		this.payment = payment;
 	}
 
+	public String getMetaData() {
+		return metaData;
+	}
+
+	public void setMetaData(String metaData) {
+		this.metaData = metaData;
+	}
+
 }

modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierPublishModel.java

@@ -119,7 +119,8 @@
 	"durationCount",
 	"durationUnit",
 	"sampleCount",
-	"dossierName"
+	"dossierName",
+	"mataData"
 })
 @XmlRootElement(name = "DossierInputModel")
 public class DossierPublishModel {
@@ -259,6 +260,8 @@ public class DossierPublishModel {
 	protected Integer sampleCount;
 	@FormParam(value = "dossierName")
 	protected String dossierName;
+	@FormParam(value = "metaData")
+	protected String metaData;
 
 	public int getViaPostal() {
 		return viaPostal;
@@ -1235,4 +1238,17 @@ public String getDossierName() {
 	public void setDossierName(String value) {
 		this.dossierName = value;
 	}
+
+	public String getMetaData() {
+		return metaData;
+	}
+
+	public void setMetaData(String metaData) {
+		this.metaData = metaData;
+	}
+
+	public void setCorrecttingDate(String correcttingDate) {
+		this.correcttingDate = correcttingDate;
+	}
+
 }

modules/backend-api-rest/src/main/java/org/opencps/api/serviceprocess/model/ServiceProcessSearchModel.java

@@ -45,7 +45,8 @@
     "start",
     "end",
     "sort",
-    "order"
+    "order",
+    "receiveDate"
 })
 @XmlRootElement(name = "ServiceProcessSearchModel")
 public class ServiceProcessSearchModel {
@@ -59,6 +60,8 @@ public class ServiceProcessSearchModel {
     protected String sort;
 	@QueryParam(value = "order")
     protected String order;
+	@QueryParam(value = "receiveDate")
+    protected String receiveDate;
 
     /**
      * Gets the value of the keyword property.
@@ -180,4 +183,12 @@ public void setOrder(String value) {
         this.order = value;
     }
 
+	public String getReceiveDate() {
+		return receiveDate;
+	}
+
+	public void setReceiveDate(String receiveDate) {
+		this.receiveDate = receiveDate;
+	}
+
 }