diff --git a/modules/backend-admin-config/backend-admin-config-service/src/main/java/org/opencps/adminconfig/model/impl/DynamicReportModelImpl.java b/modules/backend-admin-config/backend-admin-config-service/src/main/java/org/opencps/adminconfig/model/impl/DynamicReportModelImpl.java index b78608e49a..41d14ee84c 100644 --- a/modules/backend-admin-config/backend-admin-config-service/src/main/java/org/opencps/adminconfig/model/impl/DynamicReportModelImpl.java +++ b/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 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"; diff --git a/modules/backend-admin-config/backend-admin-config-service/src/main/resources/META-INF/portlet-model-hints.xml b/modules/backend-admin-config/backend-admin-config-service/src/main/resources/META-INF/portlet-model-hints.xml index fcfec1d2f3..e31626ce6a 100644 --- a/modules/backend-admin-config/backend-admin-config-service/src/main/resources/META-INF/portlet-model-hints.xml +++ b/modules/backend-admin-config/backend-admin-config-service/src/main/resources/META-INF/portlet-model-hints.xml @@ -26,13 +26,13 @@ - + 65535 - + 65535 - + 1000 diff --git a/modules/backend-admin-config/backend-admin-config-service/src/main/resources/META-INF/sql/tables.sql b/modules/backend-admin-config/backend-admin-config-service/src/main/resources/META-INF/sql/tables.sql index cdcf4083a3..ff203424ac 100644 --- a/modules/backend-admin-config/backend-admin-config-service/src/main/resources/META-INF/sql/tables.sql +++ b/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 ); \ No newline at end of file diff --git a/modules/backend-admin-config/backend-admin-config-service/src/main/resources/service.properties b/modules/backend-admin-config/backend-admin-config-service/src/main/resources/service.properties index 3fa30b561e..2a48af6603 100644 --- a/modules/backend-admin-config/backend-admin-config-service/src/main/resources/service.properties +++ b/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 \ No newline at end of file + build.number=73 + build.date=1562063570273 \ No newline at end of file diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/DossierManagement.java b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/DossierManagement.java index 40ecd2f284..af21c4affe 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/DossierManagement.java +++ b/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); } diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/ServiceProcessManagement.java b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/ServiceProcessManagement.java index 3153b1d1b8..9d999bdc27 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/ServiceProcessManagement.java +++ b/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); + } diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/DossierManagementImpl.java b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/DossierManagementImpl.java index aa8567d49f..289e05f868 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/DossierManagementImpl.java +++ b/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 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(); + } + } diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/DossierUtils.java b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/DossierUtils.java index 7620cf8a6e..e9a40dc850 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/DossierUtils.java +++ b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/DossierUtils.java @@ -408,6 +408,7 @@ public static List mappingForGetList(List 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; } diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierDataModel.java b/modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierDataModel.java index 367c93f302..f30ac23fcf 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierDataModel.java +++ b/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; + } + } diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierDetailModel.java b/modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierDetailModel.java index 6528c8eaba..6f17b3b7b7 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierDetailModel.java +++ b/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; + } + } diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierInputModel.java b/modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierInputModel.java index 48b3c6a50e..9fe03aee74 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierInputModel.java +++ b/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; + } + } diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierPublishModel.java b/modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierPublishModel.java index 0df0ff52ab..f8da50d133 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierPublishModel.java +++ b/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; + } + } diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/serviceprocess/model/ServiceProcessSearchModel.java b/modules/backend-api-rest/src/main/java/org/opencps/api/serviceprocess/model/ServiceProcessSearchModel.java index c7061cccec..13f4fa07d7 100644 --- a/modules/backend-api-rest/src/main/java/org/opencps/api/serviceprocess/model/ServiceProcessSearchModel.java +++ b/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; + } + } diff --git a/modules/backend-auth/src/main/java/org/opencps/kernel/message/notification/MBNotificationSenderImpl.java b/modules/backend-auth/src/main/java/org/opencps/kernel/message/notification/MBNotificationSenderImpl.java index 165f50a635..60f200a251 100644 --- a/modules/backend-auth/src/main/java/org/opencps/kernel/message/notification/MBNotificationSenderImpl.java +++ b/modules/backend-auth/src/main/java/org/opencps/kernel/message/notification/MBNotificationSenderImpl.java @@ -1,14 +1,6 @@ package org.opencps.kernel.message.notification; -import java.io.OutputStream; -import java.net.URL; -import java.net.URLConnection; -import java.util.Date; - -import org.opencps.kernel.message.MBMessageEntry; -import org.osgi.service.component.annotations.Component; - import com.liferay.portal.kernel.json.JSONException; import com.liferay.portal.kernel.json.JSONFactoryUtil; import com.liferay.portal.kernel.json.JSONObject; @@ -20,6 +12,15 @@ import com.liferay.portal.kernel.service.UserNotificationEventLocalServiceUtil; import com.liferay.portal.kernel.util.Validator; +import java.io.OutputStream; +import java.net.URL; +import java.net.URLConnection; +import java.util.Date; +import java.util.List; + +import org.opencps.kernel.message.MBMessageEntry; +import org.osgi.service.component.annotations.Component; + /** * @author trungnt */ @@ -44,9 +45,9 @@ public void send( payloadJSON.put("data", messageEntry.getData()); payloadJSON.put("notifyMessage", messageEntry.getNotifyMessage()); - if (messageEntry.getToUserIds() != null) { + List toUserList = messageEntry.getToUserIds(); + if (toUserList != null && toUserList.size() > 0) { for (Long toUserId : messageEntry.getToUserIds()) { - try { /* * userNotificationEventLocalService. @@ -58,22 +59,20 @@ public void send( // _log.info(serviceContext[0].getScopeGroupId()); - UserNotificationEvent event = - UserNotificationEventLocalServiceUtil.addUserNotificationEvent( - toUserId, portletId, (new Date()).getTime(), - UserNotificationDeliveryConstants.TYPE_WEBSITE, - toUserId, payloadJSON.toString(), false, - serviceContext[0]); + if (toUserId > 0) { + UserNotificationEvent event = UserNotificationEventLocalServiceUtil.addUserNotificationEvent( + toUserId, portletId, (new Date()).getTime(), + UserNotificationDeliveryConstants.TYPE_WEBSITE, toUserId, payloadJSON.toString(), false, + serviceContext[0]); - event.setDelivered(false); + event.setDelivered(false); - UserNotificationEventLocalServiceUtil.updateUserNotificationEvent( - event); + UserNotificationEventLocalServiceUtil.updateUserNotificationEvent( + event); + } } catch (Exception e) { _log.debug(e); - // _log.error(e); - // continue; } // send to zalo diff --git a/modules/backend-communication/backend-communication-service/src/main/java/org/opencps/communication/scheduler/OneMinute.java b/modules/backend-communication/backend-communication-service/src/main/java/org/opencps/communication/scheduler/OneMinute.java index 217599d7d0..991866734b 100644 --- a/modules/backend-communication/backend-communication-service/src/main/java/org/opencps/communication/scheduler/OneMinute.java +++ b/modules/backend-communication/backend-communication-service/src/main/java/org/opencps/communication/scheduler/OneMinute.java @@ -134,7 +134,8 @@ private void doProcessNotification(Message message) { * * If Send SMS error, continue until expiredDate * */ - if (resultSendSMS.getResult() <= 0) { + //_log.debug("resultSendSMS: "+JSONFactoryUtil.looseSerialize(resultSendSMS)); + if (resultSendSMS.getResult() > 0) { NotificationQueueBusinessFactoryUtil.delete( notificationQueue.getNotificationQueueId(), serviceContext); diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/constants/DossierTerm.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/constants/DossierTerm.java index 4d8bc5c92a..766356b3da 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/constants/DossierTerm.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/constants/DossierTerm.java @@ -83,6 +83,7 @@ public class DossierTerm { public static final String STEP_OVER_DUE = "stepOverdue"; public static final String DOSSIER_OVER_DUE = "dossierOverdue"; public static final String ACTION_USERIDS = "actionUserIds"; + public static final String ASSIGNED_USER_ID = "assignedUserId"; public static final String STATUS = "status"; public static final String SUBSTATUS = "subStatus"; @@ -250,4 +251,5 @@ public class DossierTerm { public static final String GROUP_DOSSIER_ID = "groupDossierId"; public static final String APPLICANT_FOLLOW_ID_NO = "applicantFollowIdNo"; public static final String DOSSIER_SATUS_DC_CODE = "DOSSIER_STATUS"; + public static final String META_DATA = "metaData"; } diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/input/model/DossierInputModel.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/input/model/DossierInputModel.java index 6ef6a99095..8ea1b45f43 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/input/model/DossierInputModel.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/input/model/DossierInputModel.java @@ -69,6 +69,7 @@ public class DossierInputModel { private String dossierFileArr; private String dossiers; private String payment; + private String metaData; public Integer getViaPostal() { return viaPostal; @@ -902,4 +903,12 @@ public void setPayment(String payment) { this.payment = payment; } + public String getMetaData() { + return metaData; + } + + public void setMetaData(String metaData) { + this.metaData = metaData; + } + } diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/input/model/DossierPublishModel.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/input/model/DossierPublishModel.java index f64d22f4f8..ead4223756 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/input/model/DossierPublishModel.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/input/model/DossierPublishModel.java @@ -77,6 +77,7 @@ public class DossierPublishModel { protected Integer durationUnit; protected Integer sampleCount; protected String dossierName; + protected String metaData; public int getViaPostal() { return viaPostal; @@ -1053,4 +1054,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; + } + } diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/model/DossierModel.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/model/DossierModel.java index c6601cde68..cbbfb381f0 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/model/DossierModel.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/model/DossierModel.java @@ -1473,6 +1473,21 @@ public interface DossierModel extends BaseModel, GroupedModel, */ public void setGroupDossierId(long groupDossierId); + /** + * Returns the meta data of this dossier. + * + * @return the meta data of this dossier + */ + @AutoEscape + public String getMetaData(); + + /** + * Sets the meta data of this dossier. + * + * @param metaData the meta data of this dossier + */ + public void setMetaData(String metaData); + @Override public boolean isNew(); diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/model/DossierSoap.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/model/DossierSoap.java index f60ff46ae1..288b900977 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/model/DossierSoap.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/model/DossierSoap.java @@ -125,6 +125,7 @@ public static DossierSoap toSoapModel(Dossier model) { soapModel.setDossierName(model.getDossierName()); soapModel.setOriginDossierNo(model.getOriginDossierNo()); soapModel.setGroupDossierId(model.getGroupDossierId()); + soapModel.setMetaData(model.getMetaData()); return soapModel; } @@ -929,6 +930,14 @@ public void setGroupDossierId(long groupDossierId) { _groupDossierId = groupDossierId; } + public String getMetaData() { + return _metaData; + } + + public void setMetaData(String metaData) { + _metaData = metaData; + } + private String _uuid; private long _dossierId; private long _groupId; @@ -1021,4 +1030,5 @@ public void setGroupDossierId(long groupDossierId) { private String _dossierName; private String _originDossierNo; private long _groupDossierId; + private String _metaData; } \ No newline at end of file diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/model/DossierWrapper.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/model/DossierWrapper.java index 9142022199..ff19687107 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/model/DossierWrapper.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/model/DossierWrapper.java @@ -151,6 +151,7 @@ public Map getModelAttributes() { attributes.put("dossierName", getDossierName()); attributes.put("originDossierNo", getOriginDossierNo()); attributes.put("groupDossierId", getGroupDossierId()); + attributes.put("metaData", getMetaData()); return attributes; } @@ -712,6 +713,12 @@ public void setModelAttributes(Map attributes) { if (groupDossierId != null) { setGroupDossierId(groupDossierId); } + + String metaData = (String)attributes.get("metaData"); + + if (metaData != null) { + setMetaData(metaData); + } } @Override @@ -1269,6 +1276,16 @@ public String getLockState() { return _dossier.getLockState(); } + /** + * Returns the meta data of this dossier. + * + * @return the meta data of this dossier + */ + @Override + public String getMetaData() { + return _dossier.getMetaData(); + } + /** * Returns the modified date of this dossier. * @@ -2300,6 +2317,16 @@ public void setLockState(String lockState) { _dossier.setLockState(lockState); } + /** + * Sets the meta data of this dossier. + * + * @param metaData the meta data of this dossier + */ + @Override + public void setMetaData(String metaData) { + _dossier.setMetaData(metaData); + } + /** * Sets the modified date of this dossier. * diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalService.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalService.java index 0a2567c486..d3fd1fe134 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalService.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalService.java @@ -551,8 +551,8 @@ public Dossier publishDossier(long groupId, long dossierId, String delegateCityName, String delegateDistrictCode, String delegateDistrictName, String delegateWardCode, String delegateWardName, double durationCount, int durationUnit, - String dossierName, String processNo, ServiceContext context) - throws PortalException; + String dossierName, String processNo, String metaData, + ServiceContext context) throws PortalException; @Indexable(type = IndexableType.REINDEX) public Dossier publishImportDossier(long groupId, long dossierId, diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalServiceUtil.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalServiceUtil.java index 8759fd4837..0ed962c459 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalServiceUtil.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalServiceUtil.java @@ -760,7 +760,7 @@ public static org.opencps.dossiermgt.model.Dossier publishDossier( String delegateCityName, String delegateDistrictCode, String delegateDistrictName, String delegateWardCode, String delegateWardName, double durationCount, int durationUnit, - String dossierName, String processNo, + String dossierName, String processNo, String metaData, com.liferay.portal.kernel.service.ServiceContext context) throws com.liferay.portal.kernel.exception.PortalException { return getService() @@ -780,7 +780,7 @@ public static org.opencps.dossiermgt.model.Dossier publishDossier( delegateAddress, delegateCityCode, delegateCityName, delegateDistrictCode, delegateDistrictName, delegateWardCode, delegateWardName, durationCount, durationUnit, dossierName, - processNo, context); + processNo, metaData, context); } public static org.opencps.dossiermgt.model.Dossier publishImportDossier( diff --git a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalServiceWrapper.java b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalServiceWrapper.java index 72455f8d77..8fd9a3a5d6 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalServiceWrapper.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalServiceWrapper.java @@ -797,7 +797,7 @@ public org.opencps.dossiermgt.model.Dossier publishDossier(long groupId, String delegateCityName, String delegateDistrictCode, String delegateDistrictName, String delegateWardCode, String delegateWardName, double durationCount, int durationUnit, - String dossierName, String processNo, + String dossierName, String processNo, String metaData, com.liferay.portal.kernel.service.ServiceContext context) throws com.liferay.portal.kernel.exception.PortalException { return _dossierLocalService.publishDossier(groupId, dossierId, @@ -816,7 +816,7 @@ public org.opencps.dossiermgt.model.Dossier publishDossier(long groupId, delegateTelNo, delegateEmail, delegateAddress, delegateCityCode, delegateCityName, delegateDistrictCode, delegateDistrictName, delegateWardCode, delegateWardName, durationCount, durationUnit, - dossierName, processNo, context); + dossierName, processNo, metaData, context); } @Override diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/service.xml b/modules/backend-dossiermgt/backend-dossiermgt-service/service.xml index b0cad772ce..4054140cce 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/service.xml +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/service.xml @@ -553,6 +553,7 @@ + diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/DossierActions.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/DossierActions.java index ef0cc4a724..e0e873b89f 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/DossierActions.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/DossierActions.java @@ -166,7 +166,7 @@ public Dossier publishDossier(long groupId, long dossierId, String referenceUid, long dossierActionId, String submissionNote, String lockState, String delegateName, String delegateIdNo, String delegateTelNo, String delegateEmail, String delegateAddress, String delegateCityCode, String delegateCityName, String delegateDistrictCode, String delegateDistrictName, String delegateWardCode, String delegateWardName, double durationCount, int durationUnit, String dossierName, String processNo, - ServiceContext context) throws PortalException; + String metaData, ServiceContext context) throws PortalException; public List getAssignUsersByStep(Dossier dossier, ProcessStep ps); public ProcessOption getProcessOption(long serviceProcessId, long dossierTemplateId); diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/impl/DossierActionsImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/impl/DossierActionsImpl.java index f507ef3bcd..729292c677 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/impl/DossierActionsImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/action/impl/DossierActionsImpl.java @@ -4186,13 +4186,13 @@ private void createNotificationQueue(User user, long groupId, Dossier dossier, A List applicants = ApplicantLocalServiceUtil.findByAppIds(dossier.getApplicantIdNo()); Applicant foundApplicant = (applicants.isEmpty() ? null : applicants.get(0)); -// for (Applicant applicant : applicants) { -// long toUserId = (applicant != null ? applicant.getMappingUserId() : 0l); -// if (toUserId != 0) { -// foundApplicant = applicant; -// break; -// } -// } + for (Applicant applicant : applicants) { + long toUserId = (applicant != null ? applicant.getMappingUserId() : 0l); + if (toUserId != 0) { + foundApplicant = applicant; + break; + } + } if (foundApplicant != null) { NotificationQueueLocalServiceUtil.addNotificationQueue( user.getUserId(), groupId, @@ -6968,7 +6968,7 @@ public Dossier publishDossier(long groupId, long dossierId, String referenceUid, String delegateName, String delegateIdNo, String delegateTelNo, String delegateEmail, String delegateAddress, String delegateCityCode, String delegateCityName, String delegateDistrictCode, String delegateDistrictName, String delegateWardCode, String delegateWardName, double durationCount, - int durationUnit, String dossierName, String processNo, ServiceContext context) throws PortalException { + int durationUnit, String dossierName, String processNo, String metaData, ServiceContext context) throws PortalException { Date appIdDate = null; SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); @@ -6990,7 +6990,7 @@ public Dossier publishDossier(long groupId, long dossierId, String referenceUid, dossierStatusText, dossierSubStatus, dossierSubStatusText, dossierActionId, submissionNote, lockState, delegateName, delegateIdNo, delegateTelNo, delegateEmail, delegateAddress, delegateCityCode, delegateCityName, delegateDistrictCode, delegateDistrictName, delegateWardCode, - delegateWardName, durationCount, durationUnit, dossierName, processNo, context); + delegateWardName, durationCount, durationUnit, dossierName, processNo, metaData, context); } catch (Exception e) { _log.debug(e); diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ActionConfigModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ActionConfigModelImpl.java index e3c235d3d0..6100c5e72a 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ActionConfigModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ActionConfigModelImpl.java @@ -120,7 +120,7 @@ public class ActionConfigModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("dateOption", Types.INTEGER); } - public static final String TABLE_SQL_CREATE = "create table opencps_actionconfig (uuid_ VARCHAR(75) null,actionConfigId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,actionCode VARCHAR(75) null,actionName VARCHAR(75) null,extraForm BOOLEAN,formConfig VARCHAR(75) null,sampleData VARCHAR(75) null,insideProcess BOOLEAN,userNote INTEGER,syncType INTEGER,eventType INTEGER,infoType INTEGER,pending BOOLEAN,rollbackable BOOLEAN,notificationType VARCHAR(75) null,documentType VARCHAR(75) null,mappingAction VARCHAR(75) null,dateOption INTEGER)"; + public static final String TABLE_SQL_CREATE = "create table opencps_actionconfig (uuid_ VARCHAR(75) null,actionConfigId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,actionCode VARCHAR(75) null,actionName VARCHAR(75) null,extraForm BOOLEAN,formConfig TEXT null,sampleData TEXT null,insideProcess BOOLEAN,userNote INTEGER,syncType INTEGER,eventType INTEGER,infoType INTEGER,pending BOOLEAN,rollbackable BOOLEAN,notificationType VARCHAR(75) null,documentType VARCHAR(255) null,mappingAction VARCHAR(255) null,dateOption INTEGER)"; public static final String TABLE_SQL_DROP = "drop table opencps_actionconfig"; public static final String ORDER_BY_JPQL = " ORDER BY actionConfig.actionCode ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_actionconfig.actionCode ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DeliverableLogModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DeliverableLogModelImpl.java index ed661ced50..ccf071d27a 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DeliverableLogModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DeliverableLogModelImpl.java @@ -104,7 +104,7 @@ public class DeliverableLogModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("payload", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_deliverablelog (uuid_ VARCHAR(75) null,deliverableLogId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,deliverableId LONG,dossierUid VARCHAR(75) null,author VARCHAR(75) null,content VARCHAR(75) null,deliverableAction INTEGER,actionDate DATE null,payload VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_deliverablelog (uuid_ VARCHAR(75) null,deliverableLogId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,deliverableId LONG,dossierUid VARCHAR(75) null,author VARCHAR(75) null,content TEXT null,deliverableAction INTEGER,actionDate DATE null,payload TEXT null)"; public static final String TABLE_SQL_DROP = "drop table opencps_deliverablelog"; public static final String ORDER_BY_JPQL = " ORDER BY deliverableLog.deliverableLogId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_deliverablelog.deliverableLogId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DeliverableModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DeliverableModelImpl.java index 49b26dc9e3..9fcc6f4ae6 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DeliverableModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DeliverableModelImpl.java @@ -126,7 +126,7 @@ public class DeliverableModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("docSync", Types.INTEGER); } - public static final String TABLE_SQL_CREATE = "create table opencps_deliverable (uuid_ VARCHAR(75) null,deliverableId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,deliverableCode VARCHAR(75) null,deliverableName VARCHAR(75) null,deliverableType VARCHAR(75) null,govAgencyCode VARCHAR(75) null,govAgencyName VARCHAR(75) null,applicantIdNo VARCHAR(75) null,applicantName VARCHAR(75) null,subject VARCHAR(75) null,formData VARCHAR(75) null,formScript VARCHAR(75) null,formReport VARCHAR(75) null,expireDate DATE null,issueDate DATE null,revalidate DATE null,deliverableState INTEGER,fileEntryId LONG,dossierId LONG,docSync INTEGER)"; + public static final String TABLE_SQL_CREATE = "create table opencps_deliverable (uuid_ VARCHAR(75) null,deliverableId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,deliverableCode VARCHAR(75) null,deliverableName VARCHAR(75) null,deliverableType VARCHAR(75) null,govAgencyCode VARCHAR(75) null,govAgencyName VARCHAR(75) null,applicantIdNo VARCHAR(75) null,applicantName VARCHAR(75) null,subject VARCHAR(75) null,formData TEXT null,formScript TEXT null,formReport TEXT null,expireDate DATE null,issueDate DATE null,revalidate DATE null,deliverableState INTEGER,fileEntryId LONG,dossierId LONG,docSync INTEGER)"; public static final String TABLE_SQL_DROP = "drop table opencps_deliverable"; public static final String ORDER_BY_JPQL = " ORDER BY deliverable.deliverableId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_deliverable.deliverableId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DeliverableTypeModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DeliverableTypeModelImpl.java index 227fe477a7..3aa31a9c3b 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DeliverableTypeModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DeliverableTypeModelImpl.java @@ -116,7 +116,7 @@ public class DeliverableTypeModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("govAgencies", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_deliverabletype (uuid_ VARCHAR(75) null,deliverableTypeId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,typeCode VARCHAR(75) null,typeName VARCHAR(75) null,formScript VARCHAR(75) null,formReport VARCHAR(75) null,formScriptFileId LONG,formReportFileId LONG,codePattern VARCHAR(75) null,dataConfig VARCHAR(75) null,tableConfig VARCHAR(75) null,counter LONG,mappingData VARCHAR(75) null,docSync INTEGER,govAgencies VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_deliverabletype (uuid_ VARCHAR(75) null,deliverableTypeId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,typeCode VARCHAR(75) null,typeName VARCHAR(575) null,formScript TEXT null,formReport TEXT null,formScriptFileId LONG,formReportFileId LONG,codePattern VARCHAR(275) null,dataConfig TEXT null,tableConfig TEXT null,counter LONG,mappingData TEXT null,docSync INTEGER,govAgencies VARCHAR(255) null)"; public static final String TABLE_SQL_DROP = "drop table opencps_deliverabletype"; public static final String ORDER_BY_JPQL = " ORDER BY deliverableType.deliverableTypeId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_deliverabletype.deliverableTypeId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DocumentTypeModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DocumentTypeModelImpl.java index 83c1928e90..c9536cbca4 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DocumentTypeModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DocumentTypeModelImpl.java @@ -96,7 +96,7 @@ public class DocumentTypeModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("docSync", Types.INTEGER); } - public static final String TABLE_SQL_CREATE = "create table opencps_documenttype (uuid_ VARCHAR(75) null,DocumentTypeId LONG not null primary key,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,typeCode VARCHAR(75) null,templateClass INTEGER,documentName VARCHAR(75) null,codePattern VARCHAR(75) null,documentScript VARCHAR(75) null,docSync INTEGER)"; + public static final String TABLE_SQL_CREATE = "create table opencps_documenttype (uuid_ VARCHAR(75) null,DocumentTypeId LONG not null primary key,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,typeCode VARCHAR(255) null,templateClass INTEGER,documentName VARCHAR(255) null,codePattern VARCHAR(255) null,documentScript TEXT null,docSync INTEGER)"; public static final String TABLE_SQL_DROP = "drop table opencps_documenttype"; public static final String ORDER_BY_JPQL = " ORDER BY documentType.modifiedDate DESC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_documenttype.modifiedDate DESC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierActionModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierActionModelImpl.java index ca45320507..1172d7d3d2 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierActionModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierActionModelImpl.java @@ -137,7 +137,7 @@ public class DossierActionModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("eventStatus", Types.INTEGER); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossieraction (uuid_ VARCHAR(75) null,dossierActionId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,dossierId LONG,serviceProcessId LONG,previousActionId LONG,fromStepCode VARCHAR(75) null,fromStepName VARCHAR(75) null,fromSequenceNo VARCHAR(75) null,actionCode VARCHAR(75) null,actionUser VARCHAR(75) null,actionName VARCHAR(75) null,actionNote VARCHAR(75) null,actionOverdue INTEGER,syncActionCode VARCHAR(75) null,pending BOOLEAN,rollbackable BOOLEAN,stepCode VARCHAR(75) null,stepName VARCHAR(75) null,sequenceNo VARCHAR(75) null,dueDate DATE null,nextActionId LONG,payload VARCHAR(75) null,stepInstruction VARCHAR(75) null,state_ INTEGER,eventStatus INTEGER)"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossieraction (uuid_ VARCHAR(75) null,dossierActionId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,dossierId LONG,serviceProcessId LONG,previousActionId LONG,fromStepCode VARCHAR(255) null,fromStepName VARCHAR(255) null,fromSequenceNo VARCHAR(255) null,actionCode VARCHAR(100) null,actionUser VARCHAR(255) null,actionName VARCHAR(255) null,actionNote VARCHAR(500) null,actionOverdue INTEGER,syncActionCode VARCHAR(100) null,pending BOOLEAN,rollbackable BOOLEAN,stepCode VARCHAR(500) null,stepName VARCHAR(500) null,sequenceNo VARCHAR(255) null,dueDate DATE null,nextActionId LONG,payload TEXT null,stepInstruction VARCHAR(500) null,state_ INTEGER,eventStatus INTEGER)"; public static final String TABLE_SQL_DROP = "drop table opencps_dossieraction"; public static final String ORDER_BY_JPQL = " ORDER BY dossierAction.createDate ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossieraction.createDate ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierActionSyncModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierActionSyncModelImpl.java index 6fd2fa4d82..5c28f3ef30 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierActionSyncModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierActionSyncModelImpl.java @@ -104,7 +104,7 @@ public class DossierActionSyncModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("actionNote", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossieractionsync (uuid_ VARCHAR(75) null,dossierActionSyncId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,dossierId LONG,dossierActionId LONG,createDossier BOOLEAN,referenceUid VARCHAR(75) null,actionCode VARCHAR(75) null,actionUser VARCHAR(75) null,actionNote VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossieractionsync (uuid_ VARCHAR(75) null,dossierActionSyncId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,dossierId LONG,dossierActionId LONG,createDossier BOOLEAN,referenceUid VARCHAR(75) null,actionCode VARCHAR(255) null,actionUser VARCHAR(500) null,actionNote VARCHAR(500) null)"; public static final String TABLE_SQL_DROP = "drop table opencps_dossieractionsync"; public static final String ORDER_BY_JPQL = " ORDER BY dossierActionSync.dossierActionSyncId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossieractionsync.dossierActionSyncId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierActionUserModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierActionUserModelImpl.java index 56d6f2029e..5f256304e1 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierActionUserModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierActionUserModelImpl.java @@ -83,7 +83,7 @@ public class DossierActionUserModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("visited", Types.BOOLEAN); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossieractionuser (uuid_ VARCHAR(75) null,dossierActionId LONG not null,userId LONG not null,dossierId LONG,stepCode VARCHAR(75) null,moderator INTEGER,assigned INTEGER,visited BOOLEAN,primary key (dossierActionId, userId))"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossieractionuser (uuid_ VARCHAR(75) null,dossierActionId LONG not null,userId LONG not null,dossierId LONG,stepCode VARCHAR(255) null,moderator INTEGER,assigned INTEGER,visited BOOLEAN,primary key (dossierActionId, userId))"; public static final String TABLE_SQL_DROP = "drop table opencps_dossieractionuser"; public static final String ORDER_BY_JPQL = " ORDER BY dossierActionUser.id.dossierActionId DESC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossieractionuser.dossierActionId DESC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierCacheModel.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierCacheModel.java index 081bd258a3..d7775105a9 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierCacheModel.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierCacheModel.java @@ -64,7 +64,7 @@ public int hashCode() { @Override public String toString() { - StringBundler sb = new StringBundler(185); + StringBundler sb = new StringBundler(187); sb.append("{uuid="); sb.append(uuid); @@ -250,6 +250,8 @@ public String toString() { sb.append(originDossierNo); sb.append(", groupDossierId="); sb.append(groupDossierId); + sb.append(", metaData="); + sb.append(metaData); sb.append("}"); return sb.toString(); @@ -802,6 +804,13 @@ public Dossier toEntityModel() { dossierImpl.setGroupDossierId(groupDossierId); + if (metaData == null) { + dossierImpl.setMetaData(""); + } + else { + dossierImpl.setMetaData(metaData); + } + dossierImpl.resetOriginalValues(); return dossierImpl; @@ -919,6 +928,7 @@ public void readExternal(ObjectInput objectInput) throws IOException { originDossierNo = objectInput.readUTF(); groupDossierId = objectInput.readLong(); + metaData = objectInput.readUTF(); } @Override @@ -1402,6 +1412,13 @@ public void writeExternal(ObjectOutput objectOutput) } objectOutput.writeLong(groupDossierId); + + if (metaData == null) { + objectOutput.writeUTF(""); + } + else { + objectOutput.writeUTF(metaData); + } } public String uuid; @@ -1496,4 +1513,5 @@ public void writeExternal(ObjectOutput objectOutput) public String dossierName; public String originDossierNo; public long groupDossierId; + public String metaData; } \ No newline at end of file diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierDocumentModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierDocumentModelImpl.java index 13b9ad0d81..47186bb493 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierDocumentModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierDocumentModelImpl.java @@ -100,7 +100,7 @@ public class DossierDocumentModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("docSync", Types.INTEGER); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossierdocument (uuid_ VARCHAR(75) null,DossierDocumentId LONG not null primary key,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,dossierId LONG,referenceUid VARCHAR(75) null,dossierActionId LONG,documentType VARCHAR(75) null,documentName VARCHAR(75) null,documentCode VARCHAR(75) null,documentFileId LONG,docSync INTEGER)"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossierdocument (uuid_ VARCHAR(75) null,DossierDocumentId LONG not null primary key,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,dossierId LONG,referenceUid VARCHAR(75) null,dossierActionId LONG,documentType VARCHAR(255) null,documentName VARCHAR(255) null,documentCode VARCHAR(100) null,documentFileId LONG,docSync INTEGER)"; public static final String TABLE_SQL_DROP = "drop table opencps_dossierdocument"; public static final String ORDER_BY_JPQL = " ORDER BY dossierDocument.createDate DESC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossierdocument.createDate DESC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierFileModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierFileModelImpl.java index 633618874e..b470324b65 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierFileModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierFileModelImpl.java @@ -129,7 +129,7 @@ public class DossierFileModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("deliverableCode", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossierfile (uuid_ VARCHAR(75) null,dossierFileId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,dossierId LONG,referenceUid VARCHAR(75) null,dossierTemplateNo VARCHAR(75) null,dossierPartNo VARCHAR(75) null,dossierPartType INTEGER,fileTemplateNo VARCHAR(75) null,displayName VARCHAR(75) null,formData VARCHAR(75) null,fileEntryId LONG,original BOOLEAN,eForm BOOLEAN,isNew BOOLEAN,removed BOOLEAN,signCheck INTEGER,signInfo VARCHAR(75) null,formScript VARCHAR(75) null,formReport VARCHAR(75) null,formSchema VARCHAR(75) null,deliverableCode VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossierfile (uuid_ VARCHAR(75) null,dossierFileId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,dossierId LONG,referenceUid VARCHAR(75) null,dossierTemplateNo VARCHAR(255) null,dossierPartNo VARCHAR(255) null,dossierPartType INTEGER,fileTemplateNo VARCHAR(255) null,displayName VARCHAR(500) null,formData TEXT null,fileEntryId LONG,original BOOLEAN,eForm BOOLEAN,isNew BOOLEAN,removed BOOLEAN,signCheck INTEGER,signInfo TEXT null,formScript TEXT null,formReport TEXT null,formSchema TEXT null,deliverableCode VARCHAR(500) null)"; public static final String TABLE_SQL_DROP = "drop table opencps_dossierfile"; public static final String ORDER_BY_JPQL = " ORDER BY dossierFile.dossierPartNo ASC, dossierFile.modifiedDate DESC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossierfile.dossierPartNo ASC, opencps_dossierfile.modifiedDate DESC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierLogModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierLogModelImpl.java index 55c10e4af7..013de3b474 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierLogModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierLogModelImpl.java @@ -100,7 +100,7 @@ public class DossierLogModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("payload", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossierlog (uuid_ VARCHAR(75) null,dossierLogId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,dossierId LONG,author VARCHAR(75) null,content VARCHAR(75) null,notificationType VARCHAR(75) null,payload VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossierlog (uuid_ VARCHAR(75) null,dossierLogId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,dossierId LONG,author VARCHAR(75) null,content TEXT null,notificationType VARCHAR(200) null,payload TEXT null)"; public static final String TABLE_SQL_DROP = "drop table opencps_dossierlog"; public static final String ORDER_BY_JPQL = " ORDER BY dossierLog.dossierLogId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossierlog.dossierLogId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierMarkModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierMarkModelImpl.java index fe9fa04abf..b4fe047673 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierMarkModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierMarkModelImpl.java @@ -100,7 +100,7 @@ public class DossierMarkModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("recordCount", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossiermark (uuid_ VARCHAR(75) null,dossierMarkId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,dossierId LONG,dossierPartNo VARCHAR(75) null,fileCheck INTEGER,fileMark INTEGER,fileComment VARCHAR(75) null,recordCount VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossiermark (uuid_ VARCHAR(75) null,dossierMarkId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,dossierId LONG,dossierPartNo VARCHAR(255) null,fileCheck INTEGER,fileMark INTEGER,fileComment VARCHAR(75) null,recordCount VARCHAR(75) null)"; public static final String TABLE_SQL_DROP = "drop table opencps_dossiermark"; public static final String ORDER_BY_JPQL = " ORDER BY dossierMark.dossierMarkId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossiermark.dossierMarkId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierModelImpl.java index 452ccb14dd..91a99b36a6 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierModelImpl.java @@ -159,7 +159,8 @@ public class DossierModelImpl extends BaseModelImpl { "durationCount", Types.DOUBLE }, { "dossierName", Types.VARCHAR }, { "originDossierNo", Types.VARCHAR }, - { "groupDossierId", Types.BIGINT } + { "groupDossierId", Types.BIGINT }, + { "metaData", Types.VARCHAR } }; public static final Map TABLE_COLUMNS_MAP = new HashMap(); @@ -256,9 +257,10 @@ public class DossierModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("dossierName", Types.VARCHAR); TABLE_COLUMNS_MAP.put("originDossierNo", Types.VARCHAR); TABLE_COLUMNS_MAP.put("groupDossierId", Types.BIGINT); + TABLE_COLUMNS_MAP.put("metaData", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossier (uuid_ VARCHAR(75) null,dossierId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,referenceUid VARCHAR(75) null,counter LONG,registerBookCode VARCHAR(75) null,registerBookName VARCHAR(75) null,dossierRegister VARCHAR(75) null,processNo VARCHAR(75) null,serviceCode VARCHAR(75) null,serviceName VARCHAR(75) null,govAgencyCode VARCHAR(75) null,govAgencyName VARCHAR(75) null,applicantName VARCHAR(75) null,applicantIdType VARCHAR(75) null,applicantIdNo VARCHAR(75) null,applicantIdDate DATE null,address VARCHAR(75) null,cityCode VARCHAR(75) null,cityName VARCHAR(75) null,districtCode VARCHAR(75) null,districtName VARCHAR(75) null,wardCode VARCHAR(75) null,wardName VARCHAR(75) null,contactName VARCHAR(75) null,contactTelNo VARCHAR(75) null,contactEmail VARCHAR(75) null,delegateName VARCHAR(75) null,delegateIdNo VARCHAR(75) null,delegateTelNo VARCHAR(75) null,delegateEmail VARCHAR(75) null,delegateAddress VARCHAR(75) null,delegateCityCode VARCHAR(75) null,delegateCityName VARCHAR(75) null,delegateDistrictCode VARCHAR(75) null,delegateDistrictName VARCHAR(75) null,delegateWardCode VARCHAR(75) null,delegateWardName VARCHAR(75) null,dossierTemplateNo VARCHAR(75) null,dossierTemplateName VARCHAR(75) null,dossierNote VARCHAR(75) null,submissionNote VARCHAR(75) null,applicantNote VARCHAR(75) null,briefNote VARCHAR(75) null,dossierNo VARCHAR(75) null,submitting BOOLEAN,processDate DATE null,submitDate DATE null,receiveDate DATE null,dueDate DATE null,extendDate DATE null,releaseDate DATE null,finishDate DATE null,cancellingDate DATE null,correcttingDate DATE null,dossierStatus VARCHAR(75) null,dossierStatusText VARCHAR(75) null,dossierSubStatus VARCHAR(75) null,dossierSubStatusText VARCHAR(75) null,folderId LONG,dossierActionId LONG,viaPostal INTEGER,postalServiceCode VARCHAR(75) null,postalServiceName VARCHAR(75) null,postalAddress VARCHAR(75) null,postalCityCode VARCHAR(75) null,postalCityName VARCHAR(75) null,postalDistrictCode VARCHAR(75) null,postalDistrictName VARCHAR(75) null,postalWardCode VARCHAR(75) null,postalWardName VARCHAR(75) null,postalTelNo VARCHAR(75) null,password_ VARCHAR(75) null,notification BOOLEAN,online_ BOOLEAN,original BOOLEAN,serverNo VARCHAR(75) null,endorsementDate DATE null,lockState VARCHAR(75) null,originality INTEGER,originDossierId LONG,sampleCount LONG,durationUnit INTEGER,durationCount DOUBLE,dossierName VARCHAR(75) null,originDossierNo VARCHAR(75) null,groupDossierId LONG)"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossier (uuid_ VARCHAR(75) null,dossierId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,referenceUid VARCHAR(75) null,counter LONG,registerBookCode VARCHAR(100) null,registerBookName VARCHAR(75) null,dossierRegister VARCHAR(75) null,processNo VARCHAR(75) null,serviceCode VARCHAR(75) null,serviceName VARCHAR(75) null,govAgencyCode VARCHAR(75) null,govAgencyName VARCHAR(255) null,applicantName VARCHAR(500) null,applicantIdType VARCHAR(75) null,applicantIdNo VARCHAR(75) null,applicantIdDate DATE null,address TEXT null,cityCode VARCHAR(75) null,cityName VARCHAR(255) null,districtCode VARCHAR(75) null,districtName VARCHAR(255) null,wardCode VARCHAR(75) null,wardName VARCHAR(255) null,contactName TEXT null,contactTelNo VARCHAR(75) null,contactEmail VARCHAR(75) null,delegateName VARCHAR(75) null,delegateIdNo VARCHAR(75) null,delegateTelNo VARCHAR(75) null,delegateEmail VARCHAR(75) null,delegateAddress VARCHAR(75) null,delegateCityCode VARCHAR(75) null,delegateCityName VARCHAR(75) null,delegateDistrictCode VARCHAR(75) null,delegateDistrictName VARCHAR(75) null,delegateWardCode VARCHAR(75) null,delegateWardName VARCHAR(75) null,dossierTemplateNo VARCHAR(75) null,dossierTemplateName TEXT null,dossierNote TEXT null,submissionNote TEXT null,applicantNote TEXT null,briefNote TEXT null,dossierNo VARCHAR(255) null,submitting BOOLEAN,processDate DATE null,submitDate DATE null,receiveDate DATE null,dueDate DATE null,extendDate DATE null,releaseDate DATE null,finishDate DATE null,cancellingDate DATE null,correcttingDate DATE null,dossierStatus VARCHAR(75) null,dossierStatusText TEXT null,dossierSubStatus VARCHAR(75) null,dossierSubStatusText TEXT null,folderId LONG,dossierActionId LONG,viaPostal INTEGER,postalServiceCode VARCHAR(255) null,postalServiceName VARCHAR(255) null,postalAddress VARCHAR(255) null,postalCityCode VARCHAR(255) null,postalCityName VARCHAR(255) null,postalDistrictCode VARCHAR(255) null,postalDistrictName VARCHAR(255) null,postalWardCode VARCHAR(255) null,postalWardName VARCHAR(255) null,postalTelNo VARCHAR(75) null,password_ VARCHAR(75) null,notification BOOLEAN,online_ BOOLEAN,original BOOLEAN,serverNo VARCHAR(75) null,endorsementDate DATE null,lockState VARCHAR(200) null,originality INTEGER,originDossierId LONG,sampleCount LONG,durationUnit INTEGER,durationCount DOUBLE,dossierName VARCHAR(1000) null,originDossierNo VARCHAR(255) null,groupDossierId LONG,metaData TEXT null)"; public static final String TABLE_SQL_DROP = "drop table opencps_dossier"; public static final String ORDER_BY_JPQL = " ORDER BY dossier.dossierId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossier.dossierId ASC"; @@ -427,6 +429,7 @@ public Map getModelAttributes() { attributes.put("dossierName", getDossierName()); attributes.put("originDossierNo", getOriginDossierNo()); attributes.put("groupDossierId", getGroupDossierId()); + attributes.put("metaData", getMetaData()); attributes.put("entityCacheEnabled", isEntityCacheEnabled()); attributes.put("finderCacheEnabled", isFinderCacheEnabled()); @@ -991,6 +994,12 @@ public void setModelAttributes(Map attributes) { if (groupDossierId != null) { setGroupDossierId(groupDossierId); } + + String metaData = (String)attributes.get("metaData"); + + if (metaData != null) { + setMetaData(metaData); + } } @Override @@ -2484,6 +2493,21 @@ public void setGroupDossierId(long groupDossierId) { _groupDossierId = groupDossierId; } + @Override + public String getMetaData() { + if (_metaData == null) { + return ""; + } + else { + return _metaData; + } + } + + @Override + public void setMetaData(String metaData) { + _metaData = metaData; + } + @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( @@ -2613,6 +2637,7 @@ public Object clone() { dossierImpl.setDossierName(getDossierName()); dossierImpl.setOriginDossierNo(getOriginDossierNo()); dossierImpl.setGroupDossierId(getGroupDossierId()); + dossierImpl.setMetaData(getMetaData()); dossierImpl.resetOriginalValues(); @@ -3387,12 +3412,20 @@ public CacheModel toCacheModel() { dossierCacheModel.groupDossierId = getGroupDossierId(); + dossierCacheModel.metaData = getMetaData(); + + String metaData = dossierCacheModel.metaData; + + if ((metaData != null) && (metaData.length() == 0)) { + dossierCacheModel.metaData = null; + } + return dossierCacheModel; } @Override public String toString() { - StringBundler sb = new StringBundler(185); + StringBundler sb = new StringBundler(187); sb.append("{uuid="); sb.append(getUuid()); @@ -3578,6 +3611,8 @@ public String toString() { sb.append(getOriginDossierNo()); sb.append(", groupDossierId="); sb.append(getGroupDossierId()); + sb.append(", metaData="); + sb.append(getMetaData()); sb.append("}"); return sb.toString(); @@ -3585,7 +3620,7 @@ public String toString() { @Override public String toXmlString() { - StringBundler sb = new StringBundler(280); + StringBundler sb = new StringBundler(283); sb.append(""); sb.append("org.opencps.dossiermgt.model.Dossier"); @@ -3959,6 +3994,10 @@ public String toXmlString() { "groupDossierId"); + sb.append( + "metaData"); sb.append(""); @@ -4091,6 +4130,7 @@ public String toXmlString() { private String _originDossierNo; private String _originalOriginDossierNo; private long _groupDossierId; + private String _metaData; private long _columnBitmask; private Dossier _escapedModel; } \ No newline at end of file diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierPartModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierPartModelImpl.java index b015d4ec0c..3ddf02dc4d 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierPartModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierPartModelImpl.java @@ -122,7 +122,7 @@ public class DossierPartModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("fileMark", Types.INTEGER); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossierpart (uuid_ VARCHAR(75) null,dossierPartId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,templateNo VARCHAR(75) null,partNo VARCHAR(75) null,partName VARCHAR(75) null,partTip VARCHAR(75) null,partType INTEGER,multiple BOOLEAN,formScript VARCHAR(75) null,formReport VARCHAR(75) null,sampleData VARCHAR(75) null,required BOOLEAN,fileTemplateNo VARCHAR(75) null,eSign BOOLEAN,deliverableType VARCHAR(75) null,deliverableAction INTEGER,eForm BOOLEAN,fileMark INTEGER)"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossierpart (uuid_ VARCHAR(75) null,dossierPartId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,templateNo VARCHAR(75) null,partNo VARCHAR(500) null,partName VARCHAR(500) null,partTip TEXT null,partType INTEGER,multiple BOOLEAN,formScript TEXT null,formReport TEXT null,sampleData TEXT null,required BOOLEAN,fileTemplateNo VARCHAR(500) null,eSign BOOLEAN,deliverableType VARCHAR(500) null,deliverableAction INTEGER,eForm BOOLEAN,fileMark INTEGER)"; public static final String TABLE_SQL_DROP = "drop table opencps_dossierpart"; public static final String ORDER_BY_JPQL = " ORDER BY dossierPart.dossierPartId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossierpart.dossierPartId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierRequestUDModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierRequestUDModelImpl.java index 7707c9e007..21f760810b 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierRequestUDModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierRequestUDModelImpl.java @@ -103,7 +103,7 @@ public class DossierRequestUDModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("statusReg", Types.INTEGER); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossierrequests (uuid_ VARCHAR(75) null,dossierRequestId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,dossierId LONG,referenceUid VARCHAR(75) null,requestType VARCHAR(75) null,comment_ VARCHAR(75) null,isNew INTEGER,statusReg INTEGER)"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossierrequests (uuid_ VARCHAR(75) null,dossierRequestId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,dossierId LONG,referenceUid VARCHAR(75) null,requestType VARCHAR(75) null,comment_ VARCHAR(75) null,isNew INTEGER,statusReg INTEGER)"; public static final String TABLE_SQL_DROP = "drop table opencps_dossierrequests"; public static final String ORDER_BY_JPQL = " ORDER BY dossierRequestUD.modifiedDate DESC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossierrequests.modifiedDate DESC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierStatisticModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierStatisticModelImpl.java index aba9dd56f2..7541b2f473 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierStatisticModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierStatisticModelImpl.java @@ -142,7 +142,7 @@ public class DossierStatisticModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("reporting", Types.BOOLEAN); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossierstatistic (uuid_ VARCHAR(75) null,dossierStatisticId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,month INTEGER,year INTEGER,totalCount INTEGER,deniedCount INTEGER,cancelledCount INTEGER,processCount INTEGER,remainingCount INTEGER,receivedCount INTEGER,onlineCount INTEGER,releaseCount INTEGER,betimesCount INTEGER,ontimeCount INTEGER,overtimeCount INTEGER,doneCount INTEGER,releasingCount INTEGER,unresolvedCount INTEGER,processingCount INTEGER,undueCount INTEGER,overdueCount INTEGER,pausingCount INTEGER,ontimePercentage INTEGER,govAgencyCode VARCHAR(75) null,govAgencyName VARCHAR(75) null,domainCode VARCHAR(75) null,domainName VARCHAR(75) null,reporting BOOLEAN)"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossierstatistic (uuid_ VARCHAR(75) null,dossierStatisticId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,month INTEGER,year INTEGER,totalCount INTEGER,deniedCount INTEGER,cancelledCount INTEGER,processCount INTEGER,remainingCount INTEGER,receivedCount INTEGER,onlineCount INTEGER,releaseCount INTEGER,betimesCount INTEGER,ontimeCount INTEGER,overtimeCount INTEGER,doneCount INTEGER,releasingCount INTEGER,unresolvedCount INTEGER,processingCount INTEGER,undueCount INTEGER,overdueCount INTEGER,pausingCount INTEGER,ontimePercentage INTEGER,govAgencyCode VARCHAR(255) null,govAgencyName VARCHAR(255) null,domainCode VARCHAR(255) null,domainName VARCHAR(255) null,reporting BOOLEAN)"; public static final String TABLE_SQL_DROP = "drop table opencps_dossierstatistic"; public static final String ORDER_BY_JPQL = " ORDER BY dossierStatistic.dossierStatisticId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossierstatistic.dossierStatisticId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierSyncModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierSyncModelImpl.java index f359ebed87..4df10e52b8 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierSyncModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierSyncModelImpl.java @@ -116,7 +116,7 @@ public class DossierSyncModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("acknowlegement", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossiersync (uuid_ VARCHAR(75) null,DossierSyncId LONG not null primary key,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,dossierId LONG,dossierRefUid VARCHAR(75) null,syncRefUid VARCHAR(75) null,dossierActionId LONG,actionCode VARCHAR(75) null,actionName VARCHAR(75) null,actionUser VARCHAR(75) null,actionNote VARCHAR(75) null,syncType INTEGER,infoType INTEGER,payload VARCHAR(75) null,serverNo VARCHAR(75) null,state_ INTEGER,retry INTEGER,messageText VARCHAR(75) null,acknowlegement VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossiersync (uuid_ VARCHAR(75) null,DossierSyncId LONG not null primary key,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,dossierId LONG,dossierRefUid VARCHAR(75) null,syncRefUid VARCHAR(255) null,dossierActionId LONG,actionCode VARCHAR(75) null,actionName VARCHAR(75) null,actionUser VARCHAR(75) null,actionNote VARCHAR(75) null,syncType INTEGER,infoType INTEGER,payload TEXT null,serverNo VARCHAR(75) null,state_ INTEGER,retry INTEGER,messageText TEXT null,acknowlegement TEXT null)"; public static final String TABLE_SQL_DROP = "drop table opencps_dossiersync"; public static final String ORDER_BY_JPQL = " ORDER BY dossierSync.modifiedDate ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossiersync.modifiedDate ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierTemplateModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierTemplateModelImpl.java index a2ea9705a7..a6311a298a 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierTemplateModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/DossierTemplateModelImpl.java @@ -98,7 +98,7 @@ public class DossierTemplateModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("newFormScript", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_dossiertemplate (uuid_ VARCHAR(75) null,dossierTemplateId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,templateName VARCHAR(75) null,description VARCHAR(75) null,templateNo VARCHAR(75) null,newFormScript VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_dossiertemplate (uuid_ VARCHAR(75) null,dossierTemplateId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,templateName STRING null,description TEXT null,templateNo VARCHAR(255) null,newFormScript TEXT null)"; public static final String TABLE_SQL_DROP = "drop table opencps_dossiertemplate"; public static final String ORDER_BY_JPQL = " ORDER BY dossierTemplate.dossierTemplateId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_dossiertemplate.dossierTemplateId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/MenuConfigModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/MenuConfigModelImpl.java index b19f041b18..71e07dd0dd 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/MenuConfigModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/MenuConfigModelImpl.java @@ -104,7 +104,7 @@ public class MenuConfigModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("icon", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_menuconfig (uuid_ VARCHAR(75) null,menuConfigId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,menuGroup VARCHAR(75) null,menuName VARCHAR(75) null,order_ INTEGER,menuType INTEGER,queryParams VARCHAR(75) null,tableConfig VARCHAR(75) null,buttonConfig VARCHAR(75) null,icon VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_menuconfig (uuid_ VARCHAR(75) null,menuConfigId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,menuGroup VARCHAR(75) null,menuName VARCHAR(75) null,order_ INTEGER,menuType INTEGER,queryParams VARCHAR(500) null,tableConfig TEXT null,buttonConfig TEXT null,icon VARCHAR(75) null)"; public static final String TABLE_SQL_DROP = "drop table opencps_menuconfig"; public static final String ORDER_BY_JPQL = " ORDER BY menuConfig.order ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_menuconfig.order_ ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/PaymentConfigModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/PaymentConfigModelImpl.java index bc02d8374f..477ea7852d 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/PaymentConfigModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/PaymentConfigModelImpl.java @@ -108,7 +108,7 @@ public class PaymentConfigModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("epaymentConfig", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_paymentconfig (uuid_ VARCHAR(75) null,paymentConfigId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,govAgencyCode VARCHAR(75) null,govAgencyName VARCHAR(75) null,govAgencyTaxNo VARCHAR(75) null,invoiceTemplateNo VARCHAR(75) null,invoiceIssueNo VARCHAR(75) null,invoiceLastNo VARCHAR(75) null,invoiceForm VARCHAR(75) null,bankInfo VARCHAR(75) null,epaymentConfig VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_paymentconfig (uuid_ VARCHAR(75) null,paymentConfigId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,govAgencyCode VARCHAR(75) null,govAgencyName TEXT null,govAgencyTaxNo VARCHAR(75) null,invoiceTemplateNo TEXT null,invoiceIssueNo TEXT null,invoiceLastNo TEXT null,invoiceForm TEXT null,bankInfo STRING null,epaymentConfig TEXT null)"; public static final String TABLE_SQL_DROP = "drop table opencps_paymentconfig"; public static final String ORDER_BY_JPQL = " ORDER BY paymentConfig.paymentConfigId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_paymentconfig.paymentConfigId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/PaymentFileModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/PaymentFileModelImpl.java index 35df6028e6..ee315f6689 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/PaymentFileModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/PaymentFileModelImpl.java @@ -145,7 +145,7 @@ public class PaymentFileModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("einvoice", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_paymentfile (uuid_ VARCHAR(75) null,paymentFileId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,dossierId LONG,referenceUid VARCHAR(75) null,govAgencyCode VARCHAR(75) null,govAgencyName VARCHAR(75) null,paymentFee VARCHAR(75) null,advanceAmount LONG,feeAmount LONG,serviceAmount LONG,shipAmount LONG,paymentAmount LONG,paymentNote VARCHAR(75) null,epaymentProfile VARCHAR(75) null,bankInfo VARCHAR(75) null,paymentStatus INTEGER,paymentMethod VARCHAR(75) null,confirmDatetime DATE null,confirmPayload VARCHAR(75) null,confirmFileEntryId LONG,confirmNote VARCHAR(75) null,approveDatetime DATE null,accountUserName VARCHAR(75) null,govAgencyTaxNo VARCHAR(75) null,invoiceTemplateNo VARCHAR(75) null,invoiceIssueNo VARCHAR(75) null,invoiceNo VARCHAR(75) null,invoicePayload VARCHAR(75) null,einvoice VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_paymentfile (uuid_ VARCHAR(75) null,paymentFileId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,dossierId LONG,referenceUid VARCHAR(75) null,govAgencyCode VARCHAR(75) null,govAgencyName VARCHAR(500) null,paymentFee VARCHAR(500) null,advanceAmount LONG,feeAmount LONG,serviceAmount LONG,shipAmount LONG,paymentAmount LONG,paymentNote VARCHAR(500) null,epaymentProfile STRING null,bankInfo STRING null,paymentStatus INTEGER,paymentMethod VARCHAR(75) null,confirmDatetime DATE null,confirmPayload STRING null,confirmFileEntryId LONG,confirmNote VARCHAR(75) null,approveDatetime DATE null,accountUserName VARCHAR(500) null,govAgencyTaxNo VARCHAR(500) null,invoiceTemplateNo VARCHAR(500) null,invoiceIssueNo VARCHAR(500) null,invoiceNo VARCHAR(500) null,invoicePayload STRING null,einvoice STRING null)"; public static final String TABLE_SQL_DROP = "drop table opencps_paymentfile"; public static final String ORDER_BY_JPQL = " ORDER BY paymentFile.createDate DESC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_paymentfile.createDate DESC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessActionModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessActionModelImpl.java index f661ea1fe0..413d35b903 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessActionModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessActionModelImpl.java @@ -136,7 +136,7 @@ public class ProcessActionModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("checkInput", Types.INTEGER); } - public static final String TABLE_SQL_CREATE = "create table opencps_processaction (uuid_ VARCHAR(75) null,processActionId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,serviceProcessId LONG,preStepCode VARCHAR(75) null,postStepCode VARCHAR(75) null,autoEvent VARCHAR(75) null,preCondition VARCHAR(75) null,actionCode VARCHAR(75) null,actionName VARCHAR(75) null,allowAssignUser INTEGER,assignUserId LONG,requestPayment INTEGER,paymentFee VARCHAR(75) null,createDossierFiles VARCHAR(75) null,returnDossierFiles VARCHAR(75) null,makeBriefNote VARCHAR(75) null,syncActionCode VARCHAR(75) null,rollbackable BOOLEAN,createDossierNo BOOLEAN,eSignature BOOLEAN,configNote VARCHAR(75) null,dossierTemplateNo VARCHAR(75) null,signatureType VARCHAR(75) null,createDossiers VARCHAR(75) null,checkInput INTEGER)"; + public static final String TABLE_SQL_CREATE = "create table opencps_processaction (uuid_ VARCHAR(75) null,processActionId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,serviceProcessId LONG,preStepCode STRING null,postStepCode STRING null,autoEvent STRING null,preCondition STRING null,actionCode VARCHAR(255) null,actionName VARCHAR(500) null,allowAssignUser INTEGER,assignUserId LONG,requestPayment INTEGER,paymentFee VARCHAR(500) null,createDossierFiles STRING null,returnDossierFiles STRING null,makeBriefNote VARCHAR(500) null,syncActionCode VARCHAR(75) null,rollbackable BOOLEAN,createDossierNo BOOLEAN,eSignature BOOLEAN,configNote TEXT null,dossierTemplateNo VARCHAR(255) null,signatureType VARCHAR(255) null,createDossiers VARCHAR(255) null,checkInput INTEGER)"; public static final String TABLE_SQL_DROP = "drop table opencps_processaction"; public static final String ORDER_BY_JPQL = " ORDER BY processAction.processActionId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_processaction.processActionId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessOptionModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessOptionModelImpl.java index be18fb8641..4f1c40b4c4 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessOptionModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessOptionModelImpl.java @@ -110,7 +110,7 @@ public class ProcessOptionModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("registerBookCode", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_processoption (uuid_ VARCHAR(75) null,processOptionId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,serviceConfigId LONG,optionOrder INTEGER,optionName VARCHAR(75) null,autoSelect VARCHAR(75) null,dossierTemplateId LONG,serviceProcessId LONG,instructionNote VARCHAR(75) null,submissionNote VARCHAR(75) null,sampleCount LONG,registerBookCode VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_processoption (uuid_ VARCHAR(75) null,processOptionId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,serviceConfigId LONG,optionOrder INTEGER,optionName VARCHAR(500) null,autoSelect VARCHAR(500) null,dossierTemplateId LONG,serviceProcessId LONG,instructionNote TEXT null,submissionNote TEXT null,sampleCount LONG,registerBookCode VARCHAR(100) null)"; public static final String TABLE_SQL_DROP = "drop table opencps_processoption"; public static final String ORDER_BY_JPQL = " ORDER BY processOption.processOptionId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_processoption.processOptionId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessPluginModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessPluginModelImpl.java index a6eb4aa304..5759d5fa30 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessPluginModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessPluginModelImpl.java @@ -106,7 +106,7 @@ public class ProcessPluginModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("autoRun", Types.BOOLEAN); } - public static final String TABLE_SQL_CREATE = "create table opencps_process_plugin (uuid_ VARCHAR(75) null,processPluginId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,stepCode VARCHAR(75) null,serviceProcessId LONG,pluginName VARCHAR(75) null,pluginType INTEGER,sequenceNo VARCHAR(75) null,pluginForm VARCHAR(75) null,sampleData VARCHAR(75) null,autoRun BOOLEAN)"; + public static final String TABLE_SQL_CREATE = "create table opencps_process_plugin (uuid_ VARCHAR(75) null,processPluginId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,stepCode VARCHAR(75) null,serviceProcessId LONG,pluginName VARCHAR(500) null,pluginType INTEGER,sequenceNo VARCHAR(75) null,pluginForm TEXT null,sampleData STRING null,autoRun BOOLEAN)"; public static final String TABLE_SQL_DROP = "drop table opencps_process_plugin"; public static final String ORDER_BY_JPQL = " ORDER BY processPlugin.processPluginId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_process_plugin.processPluginId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessSequenceModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessSequenceModelImpl.java index 61e88dcc7b..34bb36c17e 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessSequenceModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessSequenceModelImpl.java @@ -100,7 +100,7 @@ public class ProcessSequenceModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("durationCount", Types.DOUBLE); } - public static final String TABLE_SQL_CREATE = "create table opencps_processsequence (uuid_ VARCHAR(75) null,processSequenceId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,serviceProcessId LONG,sequenceNo VARCHAR(75) null,sequenceName VARCHAR(75) null,sequenceRole VARCHAR(75) null,durationCount DOUBLE)"; + public static final String TABLE_SQL_CREATE = "create table opencps_processsequence (uuid_ VARCHAR(75) null,processSequenceId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,serviceProcessId LONG,sequenceNo VARCHAR(255) null,sequenceName VARCHAR(512) null,sequenceRole VARCHAR(255) null,durationCount DOUBLE)"; public static final String TABLE_SQL_DROP = "drop table opencps_processsequence"; public static final String ORDER_BY_JPQL = " ORDER BY processSequence.sequenceNo ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_processsequence.sequenceNo ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessStepModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessStepModelImpl.java index 7d6ff42323..6b98afe4d1 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessStepModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessStepModelImpl.java @@ -122,7 +122,7 @@ public class ProcessStepModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("checkInput", Types.INTEGER); } - public static final String TABLE_SQL_CREATE = "create table opencps_processstep (uuid_ VARCHAR(75) null,processStepId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,stepCode VARCHAR(75) null,serviceProcessId LONG,stepName VARCHAR(75) null,sequenceNo VARCHAR(75) null,dossierStatus VARCHAR(75) null,dossierSubStatus VARCHAR(75) null,durationCount DOUBLE,customProcessUrl VARCHAR(75) null,stepInstruction VARCHAR(75) null,briefNote VARCHAR(75) null,editable BOOLEAN,restrictDossier VARCHAR(75) null,lockState VARCHAR(75) null,groupName VARCHAR(75) null,roleAsStep VARCHAR(75) null,checkInput INTEGER)"; + public static final String TABLE_SQL_CREATE = "create table opencps_processstep (uuid_ VARCHAR(75) null,processStepId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,stepCode VARCHAR(255) null,serviceProcessId LONG,stepName VARCHAR(500) null,sequenceNo VARCHAR(255) null,dossierStatus VARCHAR(75) null,dossierSubStatus VARCHAR(75) null,durationCount DOUBLE,customProcessUrl VARCHAR(255) null,stepInstruction TEXT null,briefNote TEXT null,editable BOOLEAN,restrictDossier VARCHAR(255) null,lockState VARCHAR(255) null,groupName VARCHAR(255) null,roleAsStep VARCHAR(255) null,checkInput INTEGER)"; public static final String TABLE_SQL_DROP = "drop table opencps_processstep"; public static final String ORDER_BY_JPQL = " ORDER BY processStep.processStepId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_processstep.processStepId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessStepRoleModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessStepRoleModelImpl.java index 828469f791..7753090b4e 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessStepRoleModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ProcessStepRoleModelImpl.java @@ -78,7 +78,7 @@ public class ProcessStepRoleModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("condition_", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_processsteprole (uuid_ VARCHAR(75) null,processStepId LONG not null,roleId LONG not null,roleCode VARCHAR(75) null,roleName VARCHAR(75) null,moderator BOOLEAN,condition_ VARCHAR(75) null,primary key (processStepId, roleId))"; + public static final String TABLE_SQL_CREATE = "create table opencps_processsteprole (uuid_ VARCHAR(75) null,processStepId LONG not null,roleId LONG not null,roleCode VARCHAR(255) null,roleName VARCHAR(255) null,moderator BOOLEAN,condition_ TEXT null,primary key (processStepId, roleId))"; public static final String TABLE_SQL_DROP = "drop table opencps_processsteprole"; public static final String ORDER_BY_JPQL = " ORDER BY processStepRole.id.processStepId ASC, processStepRole.id.roleId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_processsteprole.processStepId ASC, opencps_processsteprole.roleId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/PublishQueueModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/PublishQueueModelImpl.java index 8d9040264d..5401878524 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/PublishQueueModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/PublishQueueModelImpl.java @@ -100,7 +100,7 @@ public class PublishQueueModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("acknowlegement", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_publish_queue (uuid_ VARCHAR(75) null,publishQueueId LONG not null primary key,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,dossierId LONG,serverNo VARCHAR(75) null,status INTEGER,retry INTEGER,publishType INTEGER,publishData VARCHAR(75) null,messageText VARCHAR(75) null,acknowlegement VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_publish_queue (uuid_ VARCHAR(75) null,publishQueueId LONG not null primary key,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,dossierId LONG,serverNo VARCHAR(255) null,status INTEGER,retry INTEGER,publishType INTEGER,publishData TEXT null,messageText TEXT null,acknowlegement TEXT null)"; public static final String TABLE_SQL_DROP = "drop table opencps_publish_queue"; public static final String ORDER_BY_JPQL = " ORDER BY publishQueue.modifiedDate ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_publish_queue.modifiedDate ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationFormModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationFormModelImpl.java index 914f8b23f5..271748b820 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationFormModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationFormModelImpl.java @@ -109,7 +109,7 @@ public class RegistrationFormModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("removed", Types.BOOLEAN); } - public static final String TABLE_SQL_CREATE = "create table opencps_registrationform (uuid_ VARCHAR(75) null,registrationFormId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,registrationId LONG,referenceUid VARCHAR(75) null,formNo VARCHAR(75) null,formName VARCHAR(75) null,formData VARCHAR(75) null,formScript VARCHAR(75) null,formReport VARCHAR(75) null,fileEntryId LONG,isNew BOOLEAN,removed BOOLEAN)"; + public static final String TABLE_SQL_CREATE = "create table opencps_registrationform (uuid_ VARCHAR(75) null,registrationFormId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,registrationId LONG,referenceUid VARCHAR(75) null,formNo VARCHAR(75) null,formName VARCHAR(275) null,formData TEXT null,formScript TEXT null,formReport TEXT null,fileEntryId LONG,isNew BOOLEAN,removed BOOLEAN)"; public static final String TABLE_SQL_DROP = "drop table opencps_registrationform"; public static final String ORDER_BY_JPQL = " ORDER BY registrationForm.createDate ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_registrationform.createDate ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationLogModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationLogModelImpl.java index 30336edaf3..f1e7c82ba9 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationLogModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationLogModelImpl.java @@ -97,7 +97,7 @@ public class RegistrationLogModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("payload", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_registrationlog (uuid_ VARCHAR(75) null,registrationLogId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,registrationId LONG,author VARCHAR(75) null,content VARCHAR(75) null,payload VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_registrationlog (uuid_ VARCHAR(75) null,registrationLogId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,registrationId LONG,author TEXT null,content TEXT null,payload TEXT null)"; public static final String TABLE_SQL_DROP = "drop table opencps_registrationlog"; public static final String ORDER_BY_JPQL = " ORDER BY registrationLog.createDate DESC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_registrationlog.createDate DESC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationModelImpl.java index 71165b76c1..80301839e0 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationModelImpl.java @@ -129,7 +129,7 @@ public class RegistrationModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("representativeEnterprise", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_registration (uuid_ VARCHAR(75) null,registrationId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,applicantName VARCHAR(75) null,applicantIdType VARCHAR(75) null,applicantIdNo VARCHAR(75) null,applicantIdDate DATE null,address VARCHAR(75) null,cityCode VARCHAR(75) null,cityName VARCHAR(75) null,districtCode VARCHAR(75) null,districtName VARCHAR(75) null,wardCode VARCHAR(75) null,wardName VARCHAR(75) null,contactName VARCHAR(75) null,contactTelNo VARCHAR(75) null,contactEmail VARCHAR(75) null,govAgencyCode VARCHAR(75) null,govAgencyName VARCHAR(75) null,registrationState INTEGER,registrationClass VARCHAR(75) null,submitting BOOLEAN,representativeEnterprise VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_registration (uuid_ VARCHAR(75) null,registrationId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,applicantName VARCHAR(275) null,applicantIdType VARCHAR(75) null,applicantIdNo VARCHAR(75) null,applicantIdDate DATE null,address VARCHAR(575) null,cityCode VARCHAR(75) null,cityName VARCHAR(275) null,districtCode VARCHAR(75) null,districtName VARCHAR(275) null,wardCode VARCHAR(75) null,wardName VARCHAR(275) null,contactName VARCHAR(275) null,contactTelNo VARCHAR(275) null,contactEmail VARCHAR(275) null,govAgencyCode VARCHAR(75) null,govAgencyName VARCHAR(275) null,registrationState INTEGER,registrationClass VARCHAR(75) null,submitting BOOLEAN,representativeEnterprise VARCHAR(255) null)"; public static final String TABLE_SQL_DROP = "drop table opencps_registration"; public static final String ORDER_BY_JPQL = " ORDER BY registration.modifiedDate DESC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_registration.modifiedDate DESC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationTemplatesModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationTemplatesModelImpl.java index 0a109c54bd..fa6e83d996 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationTemplatesModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/RegistrationTemplatesModelImpl.java @@ -101,7 +101,7 @@ public class RegistrationTemplatesModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("registration", Types.BOOLEAN); } - public static final String TABLE_SQL_CREATE = "create table opencps_serviceconfig (uuid_ VARCHAR(75) null,serviceConfigId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,serviceInfoId LONG,govAgencyCode VARCHAR(75) null,govAgencyName VARCHAR(75) null,serviceInstruction VARCHAR(75) null,serviceLevel INTEGER,serviceUrl VARCHAR(75) null,forCitizen BOOLEAN,forBusiness BOOLEAN,postService BOOLEAN,registration BOOLEAN)"; + public static final String TABLE_SQL_CREATE = "create table opencps_serviceconfig (uuid_ VARCHAR(75) null,serviceConfigId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(255) null,createDate DATE null,modifiedDate DATE null,serviceInfoId LONG,govAgencyCode VARCHAR(75) null,govAgencyName STRING null,serviceInstruction TEXT null,serviceLevel INTEGER,serviceUrl VARCHAR(500) null,forCitizen BOOLEAN,forBusiness BOOLEAN,postService BOOLEAN,registration BOOLEAN)"; public static final String TABLE_SQL_DROP = "drop table opencps_serviceconfig"; public static final String ORDER_BY_JPQL = " ORDER BY serviceConfig.serviceConfigId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_serviceconfig.serviceConfigId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ServiceFileTemplateModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ServiceFileTemplateModelImpl.java index 57c7b99a55..fbef7d3997 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ServiceFileTemplateModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ServiceFileTemplateModelImpl.java @@ -84,7 +84,7 @@ public class ServiceFileTemplateModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("public_", Types.BOOLEAN); } - public static final String TABLE_SQL_CREATE = "create table opencps_serviceinfo (uuid_ VARCHAR(75) null,serviceInfoId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,serviceCode VARCHAR(75) null,serviceName VARCHAR(75) null,processText VARCHAR(75) null,methodText VARCHAR(75) null,dossierText VARCHAR(75) null,conditionText VARCHAR(75) null,durationText VARCHAR(75) null,applicantText VARCHAR(75) null,resultText VARCHAR(75) null,regularText VARCHAR(75) null,feeText VARCHAR(75) null,administrationCode VARCHAR(75) null,administrationName VARCHAR(75) null,administrationIndex VARCHAR(75) null,domainCode VARCHAR(75) null,domainName VARCHAR(75) null,domainIndex VARCHAR(75) null,maxLevel INTEGER,public_ BOOLEAN)"; + public static final String TABLE_SQL_CREATE = "create table opencps_serviceinfo (uuid_ VARCHAR(75) null,serviceInfoId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,serviceCode VARCHAR(75) null,serviceName STRING null,processText TEXT null,methodText TEXT null,dossierText TEXT null,conditionText TEXT null,durationText TEXT null,applicantText TEXT null,resultText TEXT null,regularText TEXT null,feeText TEXT null,administrationCode VARCHAR(75) null,administrationName VARCHAR(500) null,administrationIndex VARCHAR(75) null,domainCode VARCHAR(75) null,domainName TEXT null,domainIndex VARCHAR(75) null,maxLevel INTEGER,public_ BOOLEAN)"; public static final String TABLE_SQL_DROP = "drop table opencps_serviceinfo"; public static final String ORDER_BY_JPQL = " ORDER BY serviceInfo.serviceInfoId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_serviceinfo.serviceInfoId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ServiceProcessModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ServiceProcessModelImpl.java index effa38972d..0140e770a6 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ServiceProcessModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ServiceProcessModelImpl.java @@ -124,7 +124,7 @@ public class ServiceProcessModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("dossierGroupPattern", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_serviceprocess (uuid_ VARCHAR(75) null,serviceProcessId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,processNo VARCHAR(75) null,processName VARCHAR(75) null,description VARCHAR(75) null,durationCount DOUBLE,durationUnit INTEGER,counter LONG,generateDossierNo BOOLEAN,dossierNoPattern VARCHAR(75) null,generateDueDate BOOLEAN,dueDatePattern VARCHAR(75) null,generatePassword BOOLEAN,directNotification BOOLEAN,serverNo VARCHAR(75) null,serverName VARCHAR(75) null,requestPayment BOOLEAN,paymentFee VARCHAR(75) null,dossierGroupPattern VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_serviceprocess (uuid_ VARCHAR(75) null,serviceProcessId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,processNo VARCHAR(255) null,processName STRING null,description TEXT null,durationCount DOUBLE,durationUnit INTEGER,counter LONG,generateDossierNo BOOLEAN,dossierNoPattern TEXT null,generateDueDate BOOLEAN,dueDatePattern VARCHAR(500) null,generatePassword BOOLEAN,directNotification BOOLEAN,serverNo VARCHAR(255) null,serverName TEXT null,requestPayment BOOLEAN,paymentFee VARCHAR(255) null,dossierGroupPattern VARCHAR(75) null)"; public static final String TABLE_SQL_DROP = "drop table opencps_serviceprocess"; public static final String ORDER_BY_JPQL = " ORDER BY serviceProcess.serviceProcessId ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_serviceprocess.serviceProcessId ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ServiceProcessRoleModelImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ServiceProcessRoleModelImpl.java index 8c1fbe8ba0..dc4a445c01 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ServiceProcessRoleModelImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/model/impl/ServiceProcessRoleModelImpl.java @@ -78,7 +78,7 @@ public class ServiceProcessRoleModelImpl extends BaseModelImpl TABLE_COLUMNS_MAP.put("buttonConfig", Types.VARCHAR); } - public static final String TABLE_SQL_CREATE = "create table opencps_stepconfig (uuid_ VARCHAR(75) null,stepConfigId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,stepCode VARCHAR(75) null,stepName VARCHAR(75) null,stepType INTEGER,dossierStatus VARCHAR(75) null,dossierSubStatus VARCHAR(75) null,menuGroup VARCHAR(75) null,menuStepName VARCHAR(75) null,buttonConfig VARCHAR(75) null)"; + public static final String TABLE_SQL_CREATE = "create table opencps_stepconfig (uuid_ VARCHAR(75) null,stepConfigId LONG not null primary key,companyId LONG,groupId LONG,userId LONG,createDate DATE null,modifiedDate DATE null,stepCode VARCHAR(75) null,stepName VARCHAR(75) null,stepType INTEGER,dossierStatus VARCHAR(75) null,dossierSubStatus VARCHAR(75) null,menuGroup VARCHAR(75) null,menuStepName VARCHAR(75) null,buttonConfig TEXT null)"; public static final String TABLE_SQL_DROP = "drop table opencps_stepconfig"; public static final String ORDER_BY_JPQL = " ORDER BY stepConfig.stepCode ASC"; public static final String ORDER_BY_SQL = " ORDER BY opencps_stepconfig.stepCode ASC"; diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/model/DossierDetailModel.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/model/DossierDetailModel.java index 6c2b9d1fe8..8b90671527 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/model/DossierDetailModel.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/model/DossierDetailModel.java @@ -167,7 +167,8 @@ "originality", "dossierActionId", "dossierName", - "originDossierNo" + "originDossierNo", + "metaData" }) @XmlRootElement(name = "DossierDetailModel") public class DossierDetailModel { @@ -239,6 +240,7 @@ public class DossierDetailModel { protected Integer dossierActionId; protected String dossierName; protected String originDossierNo; + protected String metaData; /** * Gets the value of the dossierId property. @@ -1848,4 +1850,12 @@ public void setOriginDossierNo(String value) { this.originDossierNo = value; } + public String getMetaData() { + return metaData; + } + + public void setMetaData(String metaData) { + this.metaData = metaData; + } + } diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/model/DossierPublishModel.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/model/DossierPublishModel.java index 81a436857b..05c6c1572a 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/model/DossierPublishModel.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/model/DossierPublishModel.java @@ -185,7 +185,8 @@ "processNo", "durationCount", "durationUnit", - "sampleCount" + "sampleCount", + "metaData" }) @XmlRootElement(name = "DossierPublishModel") public class DossierPublishModel { @@ -266,6 +267,7 @@ public class DossierPublishModel { protected Double durationCount; protected Integer durationUnit; protected Long sampleCount; + protected String metaData; /** * Gets the value of the dossierId property. @@ -2091,4 +2093,12 @@ public void setSampleCount(Long value) { this.sampleCount = value; } + public String getMetaData() { + return metaData; + } + + public void setMetaData(String metaData) { + this.metaData = metaData; + } + } diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/utils/OpenCPSConverter.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/utils/OpenCPSConverter.java index 24b6a0021d..362b17c04b 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/utils/OpenCPSConverter.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/utils/OpenCPSConverter.java @@ -815,6 +815,9 @@ public static DossierPublishModel convertDossierPublish(JSONObject jsonObj) { if (jsonObj.has(DossierTerm.DOSSIER_NAME)) { model.setDossierName(jsonObj.getString(DossierTerm.DOSSIER_NAME)); } + if (jsonObj.has(DossierTerm.META_DATA)) { + model.setMetaData(jsonObj.getString(DossierTerm.META_DATA)); + } return model; } @@ -953,6 +956,9 @@ public static DossierDetailModel convertDossierDetail(JSONObject jsonObj) { if (jsonObj.has(DossierTerm.DOSSIER_ACTION_ID)) { model.setDossierActionId(jsonObj.getInt(DossierTerm.DOSSIER_ACTION_ID)); } + if (jsonObj.has(DossierTerm.META_DATA)) { + model.setMetaData(jsonObj.getString(DossierTerm.META_DATA)); + } return model; } diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/impl/CPSDossierBusinessLocalServiceImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/impl/CPSDossierBusinessLocalServiceImpl.java index 33290b4ef9..2bf5f3bbf5 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/impl/CPSDossierBusinessLocalServiceImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/impl/CPSDossierBusinessLocalServiceImpl.java @@ -120,6 +120,8 @@ import org.opencps.dossiermgt.constants.DossierStatusConstants; import org.opencps.dossiermgt.constants.DossierSyncTerm; import org.opencps.dossiermgt.constants.DossierTerm; +import org.opencps.dossiermgt.constants.PaymentConfigTerm; +import org.opencps.dossiermgt.constants.PaymentFileTerm; import org.opencps.dossiermgt.constants.ProcessActionTerm; import org.opencps.dossiermgt.constants.PublishQueueTerm; import org.opencps.dossiermgt.constants.ServerConfigTerm; @@ -3842,11 +3844,22 @@ public Dossier addMultipleDossier(long groupId, Company company, User user, Serv String delegateAddress = jsonDossier.getString(DossierTerm.DELEGATE_ADDRESS); //TODO String delegateCityCode = jsonDossier.getString(DossierTerm.DELEGATE_CITYCODE); - String delegateCityName = jsonDossier.getString(DossierTerm.DELEGATE_CITYNAME); + String delegateCityName = StringPool.BLANK; + if (Validator.isNotNull(delegateCityCode)) { + delegateCityName = getDictItemName(groupId, ADMINISTRATIVE_REGION, delegateCityCode); + } + String delegateDistrictCode = jsonDossier.getString(DossierTerm.DELEGATE_DISTRICTCODE); - String delegateDistrictName = jsonDossier.getString(DossierTerm.DELEGATE_DISTRICTNAME); + String delegateDistrictName = StringPool.BLANK; + if (Validator.isNotNull(delegateDistrictCode)) { + delegateDistrictName = getDictItemName(groupId, ADMINISTRATIVE_REGION, delegateDistrictCode); + } + String delegateWardCode = jsonDossier.getString(DossierTerm.DELEGATE_WARDCODE); - String delegateWardName = jsonDossier.getString(DossierTerm.DELEGATE_WARDNAME); + String delegateWardName = StringPool.BLANK; + if (Validator.isNotNull(delegateWardCode)) { + delegateWardName = getDictItemName(groupId, ADMINISTRATIVE_REGION, delegateWardCode); + } // String dossierName = Validator.isNotNull(jsonDossier.getString(DossierTerm.DOSSIER_NAME)) ? jsonDossier.getString(DossierTerm.DOSSIER_NAME) : serviceName; @@ -4008,7 +4021,7 @@ public Dossier addMultipleDossier(long groupId, Company company, User user, Serv } } } - + /**Create dossier user */ List lstDus = dossierUserLocalService.findByDID(dossier.getDossierId()); List lstProcessRoles = serviceProcessRoleLocalService.findByS_P_ID(process.getServiceProcessId()); @@ -4739,7 +4752,7 @@ public Dossier addDossierPublish(long groupId, Company company, input.getDelegateEmail(), input.getDelegateAddress(), input.getDelegateCityCode(), input.getDelegateCityName(), input.getDelegateDistrictCode(), input.getDelegateDistrictName(), input.getDelegateWardCode(), input.getDelegateWardName(), input.getDurationCount(), - input.getDurationUnit(), input.getDossierName(), input.getProcessNo(), serviceContext); + input.getDurationUnit(), input.getDossierName(), input.getProcessNo(), input.getMetaData(), serviceContext); return dossier; } diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/impl/DossierLocalServiceImpl.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/impl/DossierLocalServiceImpl.java index 0069576156..9dafc9058d 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/impl/DossierLocalServiceImpl.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/impl/DossierLocalServiceImpl.java @@ -2440,6 +2440,7 @@ public Hits searchLucene(LinkedHashMap params, Sort[] sorts, int String register = GetterUtil.getString(params.get(DossierTerm.REGISTER)); Long groupDossierId = GetterUtil.getLong(params.get(DossierTerm.GROUP_DOSSIER_ID)); String applicantFollowIdNo = GetterUtil.getString(params.get(DossierTerm.APPLICANT_FOLLOW_ID_NO)); + String strAssignedUser = GetterUtil.getString(params.get(DossierTerm.ASSIGNED_USER_ID)); //_log.info("follow: "+follow); //_log.info("originality: "+originality); //_log.info("applicantFollowIdNo: "+applicantFollowIdNo); @@ -2473,7 +2474,7 @@ public Hits searchLucene(LinkedHashMap params, Sort[] sorts, int follow, originality, assigned, statusStep, subStatusStep, permission, domain, domainName, applicantName, applicantIdNo, serviceName, fromReleaseDate, toReleaseDate, fromFinishDate, toFinishDate, fromReceiveNotDoneDate, toReceiveNotDoneDate, paymentStatus, origin, fromStatisticDate, toStatisticDate, - originDossierId, time, register, day, groupDossierId, booleanCommon); + originDossierId, time, register, day, groupDossierId, strAssignedUser, booleanCommon); booleanQuery.addRequiredTerm(Field.ENTRY_CLASS_NAME, CLASS_NAME); @@ -2551,6 +2552,7 @@ public long countLucene(LinkedHashMap params, SearchContext sear String register = GetterUtil.getString(params.get(DossierTerm.REGISTER)); Long groupDossierId = GetterUtil.getLong(params.get(DossierTerm.GROUP_DOSSIER_ID)); String applicantFollowIdNo = GetterUtil.getString(params.get(DossierTerm.APPLICANT_FOLLOW_ID_NO)); + String strAssignedUser = GetterUtil.getString(params.get(DossierTerm.ASSIGNED_USER_ID)); Indexer indexer = IndexerRegistryUtil.nullSafeGetIndexer(Dossier.class); @@ -2578,7 +2580,7 @@ public long countLucene(LinkedHashMap params, SearchContext sear follow, originality, assigned, statusStep, subStatusStep, permission, domain, domainName, applicantName, applicantIdNo, serviceName, fromReleaseDate, toReleaseDate, fromFinishDate, toFinishDate, fromReceiveNotDoneDate, toReceiveNotDoneDate, paymentStatus, origin, fromStatisticDate, toStatisticDate, - originDossierId, time, register, day, groupDossierId, booleanCommon); + originDossierId, time, register, day, groupDossierId, strAssignedUser, booleanCommon); booleanQuery.addRequiredTerm(Field.ENTRY_CLASS_NAME, CLASS_NAME); @@ -2680,7 +2682,7 @@ private BooleanQuery processSearchInput(String status, String subStatus, String String toReleaseDate, String fromFinishDate, String toFinishDate, String fromReceiveNotDoneDate, String toReceiveNotDoneDate, String paymentStatus, String origin, String fromStatisticDate, String toStatisticDate, Integer originDossierId, String time, String register, int day, Long groupDossierId, - BooleanQuery booleanQuery) throws ParseException { + String strAssignedUser, BooleanQuery booleanQuery) throws ParseException { if (Validator.isNotNull(status)) { @@ -3386,6 +3388,12 @@ private BooleanQuery processSearchInput(String status, String subStatus, String booleanQuery.add(query, BooleanClauseOccur.MUST); } + if (Validator.isNotNull(strAssignedUser)) { + MultiMatchQuery query = new MultiMatchQuery(strAssignedUser); + query.addField(DossierTerm.ASSIGNED_USER_ID); + booleanQuery.add(query, BooleanClauseOccur.MUST); + } + if (Validator.isNotNull(domain)) { MultiMatchQuery query = new MultiMatchQuery(domain); @@ -4373,7 +4381,7 @@ public Dossier publishDossier(long groupId, long dossierId, String referenceUid, String delegateName, String delegateIdNo, String delegateTelNo, String delegateEmail, String delegateAddress, String delegateCityCode, String delegateCityName, String delegateDistrictCode, String delegateDistrictName, String delegateWardCode, String delegateWardName, double durationCount, - int durationUnit, String dossierName, String processNo, ServiceContext context) throws PortalException { + int durationUnit, String dossierName, String processNo, String metaData, ServiceContext context) throws PortalException { long userId = context.getUserId(); @@ -4473,6 +4481,7 @@ public Dossier publishDossier(long groupId, long dossierId, String referenceUid, dossier.setDurationUnit(durationUnit); dossier.setDossierName(dossierName); dossier.setProcessNo(processNo); + dossier.setMetaData(metaData); dossier = dossierPersistence.update(dossier); } else { @@ -4555,6 +4564,8 @@ public Dossier publishDossier(long groupId, long dossierId, String referenceUid, dossier.setDossierName(dossierName); if (Validator.isNotNull(processNo)) dossier.setProcessNo(processNo); + if (Validator.isNotNull(metaData)) + dossier.setProcessNo(metaData); dossier.setViaPostal(viaPostal); if (viaPostal == 1) { diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/indexer/DossierIndexer.java b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/indexer/DossierIndexer.java index 21d35498c0..39c7a61bae 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/indexer/DossierIndexer.java +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/java/org/opencps/dossiermgt/service/indexer/DossierIndexer.java @@ -5,8 +5,6 @@ import com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.json.JSONFactoryUtil; -import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.search.BaseIndexer; @@ -25,8 +23,10 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import javax.portlet.PortletRequest; import javax.portlet.PortletResponse; @@ -34,7 +34,6 @@ import org.opencps.auth.utils.APIDateTimeUtils; import org.opencps.datamgt.util.TimeComingUtils; import org.opencps.dossiermgt.action.keypay.util.HashFunction; -import org.opencps.dossiermgt.action.util.DossierMgtUtils; import org.opencps.dossiermgt.action.util.DossierOverDueUtils; import org.opencps.dossiermgt.action.util.SpecialCharacterUtils; import org.opencps.dossiermgt.constants.DossierActionUserTerm; @@ -42,23 +41,17 @@ import org.opencps.dossiermgt.constants.PaymentFileTerm; import org.opencps.dossiermgt.constants.ServiceInfoTerm; import org.opencps.dossiermgt.model.ActionConfig; -import org.opencps.dossiermgt.model.Deliverable; import org.opencps.dossiermgt.model.Dossier; import org.opencps.dossiermgt.model.DossierAction; import org.opencps.dossiermgt.model.DossierActionUser; -import org.opencps.dossiermgt.model.DossierFile; -import org.opencps.dossiermgt.model.DossierPart; import org.opencps.dossiermgt.model.DossierRequestUD; import org.opencps.dossiermgt.model.DossierUser; import org.opencps.dossiermgt.model.PaymentFile; import org.opencps.dossiermgt.model.ServiceInfo; import org.opencps.dossiermgt.service.ActionConfigLocalServiceUtil; -import org.opencps.dossiermgt.service.DeliverableLocalServiceUtil; import org.opencps.dossiermgt.service.DossierActionLocalServiceUtil; import org.opencps.dossiermgt.service.DossierActionUserLocalServiceUtil; -import org.opencps.dossiermgt.service.DossierFileLocalServiceUtil; import org.opencps.dossiermgt.service.DossierLocalServiceUtil; -import org.opencps.dossiermgt.service.DossierPartLocalServiceUtil; import org.opencps.dossiermgt.service.DossierRequestUDLocalServiceUtil; import org.opencps.dossiermgt.service.DossierUserLocalServiceUtil; import org.opencps.dossiermgt.service.PaymentFileLocalServiceUtil; @@ -361,6 +354,7 @@ protected Document doGetDocument(Dossier object) throws Exception { // } String currentActionUserStr = StringPool.BLANK; + String assignedUser = StringPool.BLANK; try { List lstDus = DossierActionUserLocalServiceUtil.getListUser(dossierObjectActionId); List lstUsers = new ArrayList<>(); @@ -607,7 +601,37 @@ protected Document doGetDocument(Dossier object) throws Exception { _log.error("Can not get list dossierActions by dossierId " + dossierId, e); } + // Indexing Assigned dossierActionUser + //assigned + //follow + List assignedList = new ArrayList<>(); + try { + List dauList = DossierActionUserLocalServiceUtil.getByDossierId(dossierId); + + if (dauList != null && dauList.size() > 0) { + Map mapAssigned = new HashMap<>(); + int length = dauList.size() - 1; + for (int i = length; i >= 0; i--) { + DossierActionUser dau = dauList.get(i); + String strAssigned = StringPool.BLANK; + if (dau.getAssigned() == 1) { + strAssigned = dau.getUserId() + "_assigned"; + } else if (dau.getAssigned() == 0) { + strAssigned = dau.getUserId() + "_follow"; + } + mapAssigned.put(dau.getUserId(), strAssigned); + } + for (Map.Entry entry : mapAssigned.entrySet()) { + assignedList.add(entry.getValue()); + } + } + + } catch (Exception e) { + _log.error("Can not get list dossierActions by dossierId " + dossierId, e); + } + // _log.info("Action user:" + StringUtil.merge(actionUserIds, StringPool.SPACE)); + document.addTextSortable(DossierTerm.ASSIGNED_USER_ID, StringUtil.merge(assignedList, StringPool.SPACE)); document.addTextSortable(DossierTerm.ACTION_USERIDS, StringUtil.merge(actionUserIds, StringPool.SPACE)); // binhth index dossierId CTN @@ -694,6 +718,7 @@ protected Document doGetDocument(Dossier object) throws Exception { document.addTextSortable(DossierTerm.DELEGATE_DISTRICTNAME, object.getDistrictName()); document.addTextSortable(DossierTerm.DELEGATE_WARDCODE, object.getWardCode()); document.addTextSortable(DossierTerm.DELEGATE_WARDNAME, object.getWardName()); + document.addTextSortable(DossierTerm.META_DATA, object.getMetaData()); //Add payment status PaymentFile paymentFile = PaymentFileLocalServiceUtil.getByDossierId(object.getGroupId(), dossierId); diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/module-hbm.xml b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/module-hbm.xml index 6cbe96a55a..f89b2ee408 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/module-hbm.xml +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/module-hbm.xml @@ -296,6 +296,7 @@ + diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/portlet-model-hints.xml b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/portlet-model-hints.xml index 4bea34a066..59f2a4a48f 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/portlet-model-hints.xml +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/portlet-model-hints.xml @@ -151,7 +151,7 @@ - 255 + 255 @@ -340,6 +340,9 @@ 255 + + 65535 + @@ -710,8 +713,8 @@ 255 - - 65535 + + 65535 diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/sql/indexes.sql b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/sql/indexes.sql index fad7a6364e..780d1dae1e 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/sql/indexes.sql +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/sql/indexes.sql @@ -24,16 +24,16 @@ create index IX_1F0A1772 on opencps_deliverabletyperole (deliverableTypeId); create index IX_396D0046 on opencps_deliverabletyperole (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_8A4E048 on opencps_deliverabletyperole (uuid_[$COLUMN_LENGTH:75$], groupId); -create index IX_43862807 on opencps_documenttype (groupId, typeCode[$COLUMN_LENGTH:75$]); +create index IX_43862807 on opencps_documenttype (groupId, typeCode[$COLUMN_LENGTH:255$]); create unique index IX_FF8B0A54 on opencps_documenttype (uuid_[$COLUMN_LENGTH:75$], groupId); -create index IX_A19EE260 on opencps_dossier (dossierNo[$COLUMN_LENGTH:75$], applicantIdNo[$COLUMN_LENGTH:75$]); +create index IX_A19EE260 on opencps_dossier (dossierNo[$COLUMN_LENGTH:255$], applicantIdNo[$COLUMN_LENGTH:75$]); create index IX_BC4A37EA on opencps_dossier (dossierStatus[$COLUMN_LENGTH:75$], modifiedDate); create index IX_6C6803BB on opencps_dossier (groupId, applicantIdNo[$COLUMN_LENGTH:75$], dossierStatus[$COLUMN_LENGTH:75$]); create index IX_6E05E1CA on opencps_dossier (groupId, applicantIdNo[$COLUMN_LENGTH:75$], serviceCode[$COLUMN_LENGTH:75$], govAgencyCode[$COLUMN_LENGTH:75$], dossierTemplateNo[$COLUMN_LENGTH:75$], originDossierId); create index IX_292E6FC5 on opencps_dossier (groupId, companyId, govAgencyCode[$COLUMN_LENGTH:75$], serviceCode[$COLUMN_LENGTH:75$], dossierTemplateNo[$COLUMN_LENGTH:75$], dossierStatus[$COLUMN_LENGTH:75$]); create index IX_D4ACCBFA on opencps_dossier (groupId, dossierId); -create index IX_D4AF3B20 on opencps_dossier (groupId, dossierNo[$COLUMN_LENGTH:75$]); +create index IX_D4AF3B20 on opencps_dossier (groupId, dossierNo[$COLUMN_LENGTH:255$]); create index IX_5769E47A on opencps_dossier (groupId, dossierStatus[$COLUMN_LENGTH:75$], originality, dossierTemplateNo[$COLUMN_LENGTH:75$]); create index IX_1BC51B84 on opencps_dossier (groupId, dossierStatus[$COLUMN_LENGTH:75$], originality, processNo[$COLUMN_LENGTH:75$]); create index IX_624F4C36 on opencps_dossier (groupId, dossierStatus[$COLUMN_LENGTH:75$], originality, serviceCode[$COLUMN_LENGTH:75$]); @@ -43,13 +43,13 @@ create index IX_F97C2EEB on opencps_dossier (groupId, govAgencyCode[$COLUMN_LENG create index IX_21ACDF2A on opencps_dossier (groupId, govAgencyCode[$COLUMN_LENGTH:75$], serviceCode[$COLUMN_LENGTH:75$], dossierTemplateNo[$COLUMN_LENGTH:75$], dossierStatus[$COLUMN_LENGTH:75$], applicantIdNo[$COLUMN_LENGTH:75$], applicantIdType[$COLUMN_LENGTH:75$], delegateIdNo[$COLUMN_LENGTH:75$], originality); create index IX_7927CDBF on opencps_dossier (groupId, govAgencyCode[$COLUMN_LENGTH:75$], serviceCode[$COLUMN_LENGTH:75$], dossierTemplateNo[$COLUMN_LENGTH:75$], dossierStatus[$COLUMN_LENGTH:75$], applicantIdNo[$COLUMN_LENGTH:75$], delegateIdNo[$COLUMN_LENGTH:75$], originality); create index IX_92D12774 on opencps_dossier (groupId, originDossierId); -create index IX_92D3969A on opencps_dossier (groupId, originDossierNo[$COLUMN_LENGTH:75$]); +create index IX_92D3969A on opencps_dossier (groupId, originDossierNo[$COLUMN_LENGTH:255$]); create index IX_562A1F7A on opencps_dossier (groupId, originality, dossierStatus[$COLUMN_LENGTH:75$], serviceCode[$COLUMN_LENGTH:75$], govAgencyCode[$COLUMN_LENGTH:75$]); create index IX_217868C4 on opencps_dossier (groupId, processNo[$COLUMN_LENGTH:75$]); create index IX_13B226B5 on opencps_dossier (groupId, referenceUid[$COLUMN_LENGTH:75$]); create index IX_C8644976 on opencps_dossier (groupId, serviceCode[$COLUMN_LENGTH:75$]); create index IX_9A7DEA36 on opencps_dossier (groupId, userId); -create index IX_C5B31468 on opencps_dossier (originDossierNo[$COLUMN_LENGTH:75$]); +create index IX_C5B31468 on opencps_dossier (originDossierNo[$COLUMN_LENGTH:255$]); create index IX_CE1517AE on opencps_dossier (originality, dossierStatus[$COLUMN_LENGTH:75$]); create index IX_7B50F925 on opencps_dossier (userId, groupId, govAgencyCode[$COLUMN_LENGTH:75$], serviceCode[$COLUMN_LENGTH:75$], dossierActionId, originality); create index IX_50872872 on opencps_dossier (userId, groupId, govAgencyCode[$COLUMN_LENGTH:75$], serviceCode[$COLUMN_LENGTH:75$], dossierTemplateNo[$COLUMN_LENGTH:75$], dossierStatus[$COLUMN_LENGTH:75$], originality); @@ -57,17 +57,17 @@ create index IX_C4AA04E2 on opencps_dossier (uuid_[$COLUMN_LENGTH:75$], companyI create unique index IX_9525BE4 on opencps_dossier (uuid_[$COLUMN_LENGTH:75$], groupId); create index IX_6DA8BB on opencps_dossier (viaPostal); -create index IX_49AE3BC9 on opencps_dossieraction (dossierId, actionCode[$COLUMN_LENGTH:75$]); -create index IX_FE50C2F2 on opencps_dossieraction (dossierId, fromSequenceNo[$COLUMN_LENGTH:75$]); -create index IX_66DCCD03 on opencps_dossieraction (dossierId, fromStepCode[$COLUMN_LENGTH:75$], dossierActionId); +create index IX_49AE3BC9 on opencps_dossieraction (dossierId, actionCode[$COLUMN_LENGTH:100$]); +create index IX_FE50C2F2 on opencps_dossieraction (dossierId, fromSequenceNo[$COLUMN_LENGTH:255$]); +create index IX_66DCCD03 on opencps_dossieraction (dossierId, fromStepCode[$COLUMN_LENGTH:255$], dossierActionId); create index IX_E4D6634A on opencps_dossieraction (dossierId, nextActionId); create index IX_5637775 on opencps_dossieraction (dossierId, pending); -create index IX_18340D0D on opencps_dossieraction (dossierId, stepCode[$COLUMN_LENGTH:75$], dossierActionId); -create index IX_D1FD26E3 on opencps_dossieraction (dossierId, userId, fromStepCode[$COLUMN_LENGTH:75$]); -create index IX_8965699 on opencps_dossieraction (dossierId, userId, stepCode[$COLUMN_LENGTH:75$]); +create index IX_18340D0D on opencps_dossieraction (dossierId, stepCode[$COLUMN_LENGTH:500$], dossierActionId); +create index IX_D1FD26E3 on opencps_dossieraction (dossierId, userId, fromStepCode[$COLUMN_LENGTH:255$]); +create index IX_8965699 on opencps_dossieraction (dossierId, userId, stepCode[$COLUMN_LENGTH:500$]); create index IX_AD14846 on opencps_dossieraction (dueDate, nextActionId); -create index IX_850662D0 on opencps_dossieraction (groupId, dossierId, fromSequenceNo[$COLUMN_LENGTH:75$]); -create index IX_9252EF06 on opencps_dossieraction (groupId, dossierId, sequenceNo[$COLUMN_LENGTH:75$]); +create index IX_850662D0 on opencps_dossieraction (groupId, dossierId, fromSequenceNo[$COLUMN_LENGTH:255$]); +create index IX_9252EF06 on opencps_dossieraction (groupId, dossierId, sequenceNo[$COLUMN_LENGTH:255$]); create index IX_51E985C1 on opencps_dossieraction (groupId, pending); create index IX_2EFE2E18 on opencps_dossieraction (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_35EB5A9A on opencps_dossieraction (uuid_[$COLUMN_LENGTH:75$], groupId); @@ -77,8 +77,8 @@ create index IX_BBC9CE33 on opencps_dossieractionsync (uuid_[$COLUMN_LENGTH:75$] create unique index IX_4DC64575 on opencps_dossieractionsync (uuid_[$COLUMN_LENGTH:75$], groupId); create index IX_662474BD on opencps_dossieractionuser (dossierActionId); -create index IX_607DAE14 on opencps_dossieractionuser (dossierId, dossierActionId, stepCode[$COLUMN_LENGTH:75$], assigned); -create index IX_D10B6FB4 on opencps_dossieractionuser (dossierId, stepCode[$COLUMN_LENGTH:75$]); +create index IX_607DAE14 on opencps_dossieractionuser (dossierId, dossierActionId, stepCode[$COLUMN_LENGTH:255$], assigned); +create index IX_D10B6FB4 on opencps_dossieractionuser (dossierId, stepCode[$COLUMN_LENGTH:255$]); create index IX_ED82FA21 on opencps_dossieractionuser (dossierId, userId); create index IX_ECE52C69 on opencps_dossieractionuser (userId); create index IX_B06993A5 on opencps_dossieractionuser (uuid_[$COLUMN_LENGTH:75$]); @@ -88,20 +88,20 @@ create index IX_FCE3302B on opencps_dossierdocument (groupId, dossierActionId); create index IX_703C7CE on opencps_dossierdocument (groupId, dossierId, referenceUid[$COLUMN_LENGTH:75$]); create unique index IX_15D0143F on opencps_dossierdocument (uuid_[$COLUMN_LENGTH:75$], groupId); -create index IX_65A9A912 on opencps_dossierfile (deliverableCode[$COLUMN_LENGTH:75$]); -create index IX_32059C0D on opencps_dossierfile (dossierId, dossierPartNo[$COLUMN_LENGTH:75$], removed); +create index IX_65A9A912 on opencps_dossierfile (deliverableCode[$COLUMN_LENGTH:500$]); +create index IX_32059C0D on opencps_dossierfile (dossierId, dossierPartNo[$COLUMN_LENGTH:255$], removed); create index IX_A0D470F4 on opencps_dossierfile (dossierId, dossierPartType, removed); -create index IX_967E0D40 on opencps_dossierfile (dossierId, fileTemplateNo[$COLUMN_LENGTH:75$], dossierPartType, fileEntryId, removed); -create index IX_7FA1EF5F on opencps_dossierfile (dossierId, fileTemplateNo[$COLUMN_LENGTH:75$], dossierPartType, removed); -create index IX_32686D5F on opencps_dossierfile (dossierId, fileTemplateNo[$COLUMN_LENGTH:75$], dossierTemplateNo[$COLUMN_LENGTH:75$]); -create index IX_ECAF32F9 on opencps_dossierfile (dossierId, fileTemplateNo[$COLUMN_LENGTH:75$], removed); +create index IX_967E0D40 on opencps_dossierfile (dossierId, fileTemplateNo[$COLUMN_LENGTH:255$], dossierPartType, fileEntryId, removed); +create index IX_7FA1EF5F on opencps_dossierfile (dossierId, fileTemplateNo[$COLUMN_LENGTH:255$], dossierPartType, removed); +create index IX_32686D5F on opencps_dossierfile (dossierId, fileTemplateNo[$COLUMN_LENGTH:255$], dossierTemplateNo[$COLUMN_LENGTH:255$]); +create index IX_ECAF32F9 on opencps_dossierfile (dossierId, fileTemplateNo[$COLUMN_LENGTH:255$], removed); create index IX_4C1D4556 on opencps_dossierfile (dossierId, isNew, removed); create index IX_AEEE542B on opencps_dossierfile (dossierId, referenceUid[$COLUMN_LENGTH:75$], removed); create index IX_72D2A0C4 on opencps_dossierfile (dossierId, removed); create index IX_C7669357 on opencps_dossierfile (fileEntryId); -create index IX_AF6CB32E on opencps_dossierfile (groupId, dossierId, dossierPartNo[$COLUMN_LENGTH:75$], dossierPartType, displayName[$COLUMN_LENGTH:75$]); -create index IX_9D20E3F0 on opencps_dossierfile (groupId, dossierId, dossierPartNo[$COLUMN_LENGTH:75$], eForm, removed); -create index IX_F9DB3FD4 on opencps_dossierfile (groupId, dossierId, fileTemplateNo[$COLUMN_LENGTH:75$], removed, original); +create index IX_AF6CB32E on opencps_dossierfile (groupId, dossierId, dossierPartNo[$COLUMN_LENGTH:255$], dossierPartType, displayName[$COLUMN_LENGTH:500$]); +create index IX_9D20E3F0 on opencps_dossierfile (groupId, dossierId, dossierPartNo[$COLUMN_LENGTH:255$], eForm, removed); +create index IX_F9DB3FD4 on opencps_dossierfile (groupId, dossierId, fileTemplateNo[$COLUMN_LENGTH:255$], removed, original); create index IX_EF5A17DF on opencps_dossierfile (groupId, dossierId, removed, original); create index IX_6C6A28B9 on opencps_dossierfile (groupId, referenceUid[$COLUMN_LENGTH:75$]); create index IX_E3E31523 on opencps_dossierfile (referenceUid[$COLUMN_LENGTH:75$]); @@ -109,19 +109,19 @@ create index IX_F3B1D05E on opencps_dossierfile (uuid_[$COLUMN_LENGTH:75$], comp create unique index IX_558ED660 on opencps_dossierfile (uuid_[$COLUMN_LENGTH:75$], groupId); create index IX_AD25FC88 on opencps_dossierlog (groupId); -create index IX_653C8C3B on opencps_dossierlog (notificationType[$COLUMN_LENGTH:75$], dossierId); +create index IX_653C8C3B on opencps_dossierlog (notificationType[$COLUMN_LENGTH:200$], dossierId); create index IX_7C31F3D6 on opencps_dossierlog (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_FC3177D8 on opencps_dossierlog (uuid_[$COLUMN_LENGTH:75$], groupId); -create index IX_217E22C8 on opencps_dossiermark (groupId, dossierId, dossierPartNo[$COLUMN_LENGTH:75$]); +create index IX_217E22C8 on opencps_dossiermark (groupId, dossierId, dossierPartNo[$COLUMN_LENGTH:255$]); create index IX_14BA1164 on opencps_dossiermark (groupId, dossierId, fileMark); create index IX_F8E80F2F on opencps_dossiermark (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_DE389571 on opencps_dossiermark (uuid_[$COLUMN_LENGTH:75$], groupId); -create index IX_B54EC54 on opencps_dossierpart (groupId, fileTemplateNo[$COLUMN_LENGTH:75$]); -create index IX_7715C063 on opencps_dossierpart (groupId, templateNo[$COLUMN_LENGTH:75$], fileTemplateNo[$COLUMN_LENGTH:75$]); -create index IX_991D1DC0 on opencps_dossierpart (groupId, templateNo[$COLUMN_LENGTH:75$], partNo[$COLUMN_LENGTH:75$]); -create index IX_72E94D19 on opencps_dossierpart (templateNo[$COLUMN_LENGTH:75$], partNo[$COLUMN_LENGTH:75$], partType, eSign); +create index IX_B54EC54 on opencps_dossierpart (groupId, fileTemplateNo[$COLUMN_LENGTH:500$]); +create index IX_7715C063 on opencps_dossierpart (groupId, templateNo[$COLUMN_LENGTH:75$], fileTemplateNo[$COLUMN_LENGTH:500$]); +create index IX_991D1DC0 on opencps_dossierpart (groupId, templateNo[$COLUMN_LENGTH:75$], partNo[$COLUMN_LENGTH:500$]); +create index IX_72E94D19 on opencps_dossierpart (templateNo[$COLUMN_LENGTH:75$], partNo[$COLUMN_LENGTH:500$], partType, eSign); create index IX_5E4D5D55 on opencps_dossierpart (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_ACC73517 on opencps_dossierpart (uuid_[$COLUMN_LENGTH:75$], groupId); @@ -143,8 +143,8 @@ create index IX_3CD8A2B3 on opencps_dossiersync (groupId, dossierRefUid[$COLUMN_ create index IX_886CA32B on opencps_dossiersync (state_); create unique index IX_27D791BF on opencps_dossiersync (uuid_[$COLUMN_LENGTH:75$], groupId); -create index IX_E5E8009B on opencps_dossiertemplate (groupId, templateName[$COLUMN_LENGTH:75$]); -create unique index IX_7351EDD1 on opencps_dossiertemplate (groupId, templateNo[$COLUMN_LENGTH:75$]); +create index IX_E5E8009B on opencps_dossiertemplate (groupId, templateName[$COLUMN_LENGTH:4000$]); +create unique index IX_7351EDD1 on opencps_dossiertemplate (groupId, templateNo[$COLUMN_LENGTH:255$]); create index IX_3B70A85C on opencps_dossiertemplate (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_167F95DE on opencps_dossiertemplate (uuid_[$COLUMN_LENGTH:75$], groupId); @@ -171,7 +171,7 @@ create index IX_FCA73F43 on opencps_menurole (roleId); create index IX_DA361616 on opencps_menurole (uuid_[$COLUMN_LENGTH:75$]); create index IX_DEC2C7F1 on opencps_paymentconfig (groupId, govAgencyCode[$COLUMN_LENGTH:75$]); -create index IX_1C8F6A99 on opencps_paymentconfig (groupId, invoiceTemplateNo[$COLUMN_LENGTH:75$]); +create index IX_1C8F6A99 on opencps_paymentconfig (groupId, invoiceTemplateNo[$COLUMN_LENGTH:32767$]); create index IX_50A3049F on opencps_paymentconfig (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_C61226E1 on opencps_paymentconfig (uuid_[$COLUMN_LENGTH:75$], groupId); @@ -184,15 +184,15 @@ create index IX_11472582 on opencps_process_plugin (stepCode[$COLUMN_LENGTH:75$] create index IX_8A6577C0 on opencps_process_plugin (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_BA68EE42 on opencps_process_plugin (uuid_[$COLUMN_LENGTH:75$], groupId); -create index IX_E0EDED53 on opencps_processaction (autoEvent[$COLUMN_LENGTH:75$]); -create index IX_17F0C502 on opencps_processaction (groupId, actionCode[$COLUMN_LENGTH:75$], serviceProcessId); -create index IX_84A534F9 on opencps_processaction (groupId, autoEvent[$COLUMN_LENGTH:75$]); -create unique index IX_6689E997 on opencps_processaction (groupId, serviceProcessId, actionCode[$COLUMN_LENGTH:75$], preStepCode[$COLUMN_LENGTH:75$], postStepCode[$COLUMN_LENGTH:75$]); -create index IX_77A1E779 on opencps_processaction (groupId, serviceProcessId, preStepCode[$COLUMN_LENGTH:75$], createDossiers[$COLUMN_LENGTH:75$]); -create index IX_3F5FEA35 on opencps_processaction (postStepCode[$COLUMN_LENGTH:75$], groupId); -create index IX_C791AD26 on opencps_processaction (preStepCode[$COLUMN_LENGTH:75$], groupId); -create index IX_10C9A8BD on opencps_processaction (serviceProcessId, actionCode[$COLUMN_LENGTH:75$], actionName[$COLUMN_LENGTH:75$]); -create index IX_34CDC00 on opencps_processaction (serviceProcessId, preStepCode[$COLUMN_LENGTH:75$], autoEvent[$COLUMN_LENGTH:75$]); +create index IX_E0EDED53 on opencps_processaction (autoEvent[$COLUMN_LENGTH:4000$]); +create index IX_17F0C502 on opencps_processaction (groupId, actionCode[$COLUMN_LENGTH:255$], serviceProcessId); +create index IX_84A534F9 on opencps_processaction (groupId, autoEvent[$COLUMN_LENGTH:4000$]); +create unique index IX_6689E997 on opencps_processaction (groupId, serviceProcessId, actionCode[$COLUMN_LENGTH:255$], preStepCode[$COLUMN_LENGTH:4000$], postStepCode[$COLUMN_LENGTH:4000$]); +create index IX_77A1E779 on opencps_processaction (groupId, serviceProcessId, preStepCode[$COLUMN_LENGTH:4000$], createDossiers[$COLUMN_LENGTH:255$]); +create index IX_3F5FEA35 on opencps_processaction (postStepCode[$COLUMN_LENGTH:4000$], groupId); +create index IX_C791AD26 on opencps_processaction (preStepCode[$COLUMN_LENGTH:4000$], groupId); +create index IX_10C9A8BD on opencps_processaction (serviceProcessId, actionCode[$COLUMN_LENGTH:255$], actionName[$COLUMN_LENGTH:500$]); +create index IX_34CDC00 on opencps_processaction (serviceProcessId, preStepCode[$COLUMN_LENGTH:4000$], autoEvent[$COLUMN_LENGTH:4000$]); create index IX_EBDC8BC on opencps_processaction (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_39594E3E on opencps_processaction (uuid_[$COLUMN_LENGTH:75$], groupId); @@ -202,25 +202,25 @@ create index IX_9D238C20 on opencps_processoption (serviceProcessId, dossierTemp create index IX_DF143D7B on opencps_processoption (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_C5F3E6BD on opencps_processoption (uuid_[$COLUMN_LENGTH:75$], groupId); -create index IX_E3769E4D on opencps_processsequence (groupId, sequenceNo[$COLUMN_LENGTH:75$]); -create index IX_88235576 on opencps_processsequence (groupId, serviceProcessId, sequenceNo[$COLUMN_LENGTH:75$]); +create index IX_E3769E4D on opencps_processsequence (groupId, sequenceNo[$COLUMN_LENGTH:255$]); +create index IX_88235576 on opencps_processsequence (groupId, serviceProcessId, sequenceNo[$COLUMN_LENGTH:255$]); create index IX_C6D26BC7 on opencps_processsequence (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_EBC13809 on opencps_processsequence (uuid_[$COLUMN_LENGTH:75$], groupId); create index IX_66A75140 on opencps_processstep (dossierStatus[$COLUMN_LENGTH:75$], dossierSubStatus[$COLUMN_LENGTH:75$], groupId); create index IX_5562AF73 on opencps_processstep (groupId, serviceProcessId, dossierStatus[$COLUMN_LENGTH:75$], dossierSubStatus[$COLUMN_LENGTH:75$]); -create index IX_B9D0A8CB on opencps_processstep (groupId, serviceProcessId, sequenceNo[$COLUMN_LENGTH:75$]); +create index IX_B9D0A8CB on opencps_processstep (groupId, serviceProcessId, sequenceNo[$COLUMN_LENGTH:255$]); create index IX_2D87C7C7 on opencps_processstep (serviceProcessId); -create index IX_388C6AC8 on opencps_processstep (stepCode[$COLUMN_LENGTH:75$], groupId, serviceProcessId); -create index IX_55196C94 on opencps_processstep (stepCode[$COLUMN_LENGTH:75$], serviceProcessId); +create index IX_388C6AC8 on opencps_processstep (stepCode[$COLUMN_LENGTH:255$], groupId, serviceProcessId); +create index IX_55196C94 on opencps_processstep (stepCode[$COLUMN_LENGTH:255$], serviceProcessId); create index IX_D0400D52 on opencps_processstep (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_F6AFC054 on opencps_processstep (uuid_[$COLUMN_LENGTH:75$], groupId); create index IX_85322B32 on opencps_processsteprole (processStepId); -create index IX_30CABA8B on opencps_processsteprole (roleCode[$COLUMN_LENGTH:75$]); +create index IX_30CABA8B on opencps_processsteprole (roleCode[$COLUMN_LENGTH:255$]); create index IX_134D7D60 on opencps_processsteprole (uuid_[$COLUMN_LENGTH:75$]); -create index IX_3EBC1A0E on opencps_publish_queue (groupId, dossierId, serverNo[$COLUMN_LENGTH:75$], status); +create index IX_3EBC1A0E on opencps_publish_queue (groupId, dossierId, serverNo[$COLUMN_LENGTH:255$], status); create index IX_62B041F5 on opencps_publish_queue (status, modifiedDate); create unique index IX_6E7DABBA on opencps_publish_queue (uuid_[$COLUMN_LENGTH:75$], groupId); @@ -264,14 +264,14 @@ create index IX_3E222E7E on opencps_serviceinfo (serviceCode[$COLUMN_LENGTH:75$] create index IX_D3675C7A on opencps_serviceinfo (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_D630B97C on opencps_serviceinfo (uuid_[$COLUMN_LENGTH:75$], groupId); -create index IX_55C498C3 on opencps_serviceprocess (groupId, processName[$COLUMN_LENGTH:75$]); -create index IX_CE466FF9 on opencps_serviceprocess (groupId, processNo[$COLUMN_LENGTH:75$]); -create index IX_996BC77F on opencps_serviceprocess (groupId, serverNo[$COLUMN_LENGTH:75$]); -create index IX_79BCECBB on opencps_serviceprocess (serverNo[$COLUMN_LENGTH:75$]); +create index IX_55C498C3 on opencps_serviceprocess (groupId, processName[$COLUMN_LENGTH:4000$]); +create index IX_CE466FF9 on opencps_serviceprocess (groupId, processNo[$COLUMN_LENGTH:255$]); +create index IX_996BC77F on opencps_serviceprocess (groupId, serverNo[$COLUMN_LENGTH:255$]); +create index IX_79BCECBB on opencps_serviceprocess (serverNo[$COLUMN_LENGTH:255$]); create index IX_D84A5557 on opencps_serviceprocess (uuid_[$COLUMN_LENGTH:75$], companyId); create unique index IX_8A464599 on opencps_serviceprocess (uuid_[$COLUMN_LENGTH:75$], groupId); -create index IX_645BCD10 on opencps_serviceprocessrole (roleCode[$COLUMN_LENGTH:75$]); +create index IX_645BCD10 on opencps_serviceprocessrole (roleCode[$COLUMN_LENGTH:255$]); create index IX_8F9EE2C2 on opencps_serviceprocessrole (serviceProcessId); create index IX_645000FB on opencps_serviceprocessrole (uuid_[$COLUMN_LENGTH:75$]); diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/sql/tables.sql b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/sql/tables.sql index f81719b6e1..12f61c0c71 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/sql/tables.sql +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/META-INF/sql/tables.sql @@ -9,8 +9,8 @@ create table opencps_actionconfig ( actionCode VARCHAR(75) null, actionName VARCHAR(75) null, extraForm BOOLEAN, - formConfig VARCHAR(75) null, - sampleData VARCHAR(75) null, + formConfig TEXT null, + sampleData TEXT null, insideProcess BOOLEAN, userNote INTEGER, syncType INTEGER, @@ -19,8 +19,8 @@ create table opencps_actionconfig ( pending BOOLEAN, rollbackable BOOLEAN, notificationType VARCHAR(75) null, - documentType VARCHAR(75) null, - mappingAction VARCHAR(75) null, + documentType VARCHAR(255) null, + mappingAction VARCHAR(255) null, dateOption INTEGER ); @@ -62,9 +62,9 @@ create table opencps_deliverable ( applicantIdNo VARCHAR(75) null, applicantName VARCHAR(75) null, subject VARCHAR(75) null, - formData VARCHAR(75) null, - formScript VARCHAR(75) null, - formReport VARCHAR(75) null, + formData TEXT null, + formScript TEXT null, + formReport TEXT null, expireDate DATE null, issueDate DATE null, revalidate DATE null, @@ -86,10 +86,10 @@ create table opencps_deliverablelog ( deliverableId LONG, dossierUid VARCHAR(75) null, author VARCHAR(75) null, - content VARCHAR(75) null, + content TEXT null, deliverableAction INTEGER, actionDate DATE null, - payload VARCHAR(75) null + payload TEXT null ); create table opencps_deliverabletype ( @@ -102,18 +102,18 @@ create table opencps_deliverabletype ( createDate DATE null, modifiedDate DATE null, typeCode VARCHAR(75) null, - typeName VARCHAR(75) null, - formScript VARCHAR(75) null, - formReport VARCHAR(75) null, + typeName VARCHAR(575) null, + formScript TEXT null, + formReport TEXT null, formScriptFileId LONG, formReportFileId LONG, - codePattern VARCHAR(75) null, - dataConfig VARCHAR(75) null, - tableConfig VARCHAR(75) null, + codePattern VARCHAR(275) null, + dataConfig TEXT null, + tableConfig TEXT null, counter LONG, - mappingData VARCHAR(75) null, + mappingData TEXT null, docSync INTEGER, - govAgencies VARCHAR(75) null + govAgencies VARCHAR(255) null ); create table opencps_deliverabletyperole ( @@ -137,11 +137,11 @@ create table opencps_documenttype ( userId LONG, createDate DATE null, modifiedDate DATE null, - typeCode VARCHAR(75) null, + typeCode VARCHAR(255) null, templateClass INTEGER, - documentName VARCHAR(75) null, - codePattern VARCHAR(75) null, - documentScript VARCHAR(75) null, + documentName VARCHAR(255) null, + codePattern VARCHAR(255) null, + documentScript TEXT null, docSync INTEGER ); @@ -151,31 +151,31 @@ create table opencps_dossier ( groupId LONG, companyId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, referenceUid VARCHAR(75) null, counter LONG, - registerBookCode VARCHAR(75) null, + registerBookCode VARCHAR(100) null, registerBookName VARCHAR(75) null, dossierRegister VARCHAR(75) null, processNo VARCHAR(75) null, serviceCode VARCHAR(75) null, serviceName VARCHAR(75) null, govAgencyCode VARCHAR(75) null, - govAgencyName VARCHAR(75) null, - applicantName VARCHAR(75) null, + govAgencyName VARCHAR(255) null, + applicantName VARCHAR(500) null, applicantIdType VARCHAR(75) null, applicantIdNo VARCHAR(75) null, applicantIdDate DATE null, - address VARCHAR(75) null, + address TEXT null, cityCode VARCHAR(75) null, - cityName VARCHAR(75) null, + cityName VARCHAR(255) null, districtCode VARCHAR(75) null, - districtName VARCHAR(75) null, + districtName VARCHAR(255) null, wardCode VARCHAR(75) null, - wardName VARCHAR(75) null, - contactName VARCHAR(75) null, + wardName VARCHAR(255) null, + contactName TEXT null, contactTelNo VARCHAR(75) null, contactEmail VARCHAR(75) null, delegateName VARCHAR(75) null, @@ -190,12 +190,12 @@ create table opencps_dossier ( delegateWardCode VARCHAR(75) null, delegateWardName VARCHAR(75) null, dossierTemplateNo VARCHAR(75) null, - dossierTemplateName VARCHAR(75) null, - dossierNote VARCHAR(75) null, - submissionNote VARCHAR(75) null, - applicantNote VARCHAR(75) null, - briefNote VARCHAR(75) null, - dossierNo VARCHAR(75) null, + dossierTemplateName TEXT null, + dossierNote TEXT null, + submissionNote TEXT null, + applicantNote TEXT null, + briefNote TEXT null, + dossierNo VARCHAR(255) null, submitting BOOLEAN, processDate DATE null, submitDate DATE null, @@ -207,21 +207,21 @@ create table opencps_dossier ( cancellingDate DATE null, correcttingDate DATE null, dossierStatus VARCHAR(75) null, - dossierStatusText VARCHAR(75) null, + dossierStatusText TEXT null, dossierSubStatus VARCHAR(75) null, - dossierSubStatusText VARCHAR(75) null, + dossierSubStatusText TEXT null, folderId LONG, dossierActionId LONG, viaPostal INTEGER, - postalServiceCode VARCHAR(75) null, - postalServiceName VARCHAR(75) null, - postalAddress VARCHAR(75) null, - postalCityCode VARCHAR(75) null, - postalCityName VARCHAR(75) null, - postalDistrictCode VARCHAR(75) null, - postalDistrictName VARCHAR(75) null, - postalWardCode VARCHAR(75) null, - postalWardName VARCHAR(75) null, + postalServiceCode VARCHAR(255) null, + postalServiceName VARCHAR(255) null, + postalAddress VARCHAR(255) null, + postalCityCode VARCHAR(255) null, + postalCityName VARCHAR(255) null, + postalDistrictCode VARCHAR(255) null, + postalDistrictName VARCHAR(255) null, + postalWardCode VARCHAR(255) null, + postalWardName VARCHAR(255) null, postalTelNo VARCHAR(75) null, password_ VARCHAR(75) null, notification BOOLEAN, @@ -229,15 +229,16 @@ create table opencps_dossier ( original BOOLEAN, serverNo VARCHAR(75) null, endorsementDate DATE null, - lockState VARCHAR(75) null, + lockState VARCHAR(200) null, originality INTEGER, originDossierId LONG, sampleCount LONG, durationUnit INTEGER, durationCount DOUBLE, - dossierName VARCHAR(75) null, - originDossierNo VARCHAR(75) null, - groupDossierId LONG + dossierName VARCHAR(1000) null, + originDossierNo VARCHAR(255) null, + groupDossierId LONG, + metaData TEXT null ); create table opencps_dossieraction ( @@ -246,30 +247,30 @@ create table opencps_dossieraction ( companyId LONG, groupId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, dossierId LONG, serviceProcessId LONG, previousActionId LONG, - fromStepCode VARCHAR(75) null, - fromStepName VARCHAR(75) null, - fromSequenceNo VARCHAR(75) null, - actionCode VARCHAR(75) null, - actionUser VARCHAR(75) null, - actionName VARCHAR(75) null, - actionNote VARCHAR(75) null, + fromStepCode VARCHAR(255) null, + fromStepName VARCHAR(255) null, + fromSequenceNo VARCHAR(255) null, + actionCode VARCHAR(100) null, + actionUser VARCHAR(255) null, + actionName VARCHAR(255) null, + actionNote VARCHAR(500) null, actionOverdue INTEGER, - syncActionCode VARCHAR(75) null, + syncActionCode VARCHAR(100) null, pending BOOLEAN, rollbackable BOOLEAN, - stepCode VARCHAR(75) null, - stepName VARCHAR(75) null, - sequenceNo VARCHAR(75) null, + stepCode VARCHAR(500) null, + stepName VARCHAR(500) null, + sequenceNo VARCHAR(255) null, dueDate DATE null, nextActionId LONG, - payload VARCHAR(75) null, - stepInstruction VARCHAR(75) null, + payload TEXT null, + stepInstruction VARCHAR(500) null, state_ INTEGER, eventStatus INTEGER ); @@ -280,16 +281,16 @@ create table opencps_dossieractionsync ( companyId LONG, groupId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, dossierId LONG, dossierActionId LONG, createDossier BOOLEAN, referenceUid VARCHAR(75) null, - actionCode VARCHAR(75) null, - actionUser VARCHAR(75) null, - actionNote VARCHAR(75) null + actionCode VARCHAR(255) null, + actionUser VARCHAR(500) null, + actionNote VARCHAR(500) null ); create table opencps_dossieractionuser ( @@ -297,7 +298,7 @@ create table opencps_dossieractionuser ( dossierActionId LONG not null, userId LONG not null, dossierId LONG, - stepCode VARCHAR(75) null, + stepCode VARCHAR(255) null, moderator INTEGER, assigned INTEGER, visited BOOLEAN, @@ -314,9 +315,9 @@ create table opencps_dossierdocument ( dossierId LONG, referenceUid VARCHAR(75) null, dossierActionId LONG, - documentType VARCHAR(75) null, - documentName VARCHAR(75) null, - documentCode VARCHAR(75) null, + documentType VARCHAR(255) null, + documentName VARCHAR(255) null, + documentCode VARCHAR(100) null, documentFileId LONG, docSync INTEGER ); @@ -327,28 +328,28 @@ create table opencps_dossierfile ( groupId LONG, companyId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, dossierId LONG, referenceUid VARCHAR(75) null, - dossierTemplateNo VARCHAR(75) null, - dossierPartNo VARCHAR(75) null, + dossierTemplateNo VARCHAR(255) null, + dossierPartNo VARCHAR(255) null, dossierPartType INTEGER, - fileTemplateNo VARCHAR(75) null, - displayName VARCHAR(75) null, - formData VARCHAR(75) null, + fileTemplateNo VARCHAR(255) null, + displayName VARCHAR(500) null, + formData TEXT null, fileEntryId LONG, original BOOLEAN, eForm BOOLEAN, isNew BOOLEAN, removed BOOLEAN, signCheck INTEGER, - signInfo VARCHAR(75) null, - formScript VARCHAR(75) null, - formReport VARCHAR(75) null, - formSchema VARCHAR(75) null, - deliverableCode VARCHAR(75) null + signInfo TEXT null, + formScript TEXT null, + formReport TEXT null, + formSchema TEXT null, + deliverableCode VARCHAR(500) null ); create table opencps_dossierlog ( @@ -357,14 +358,14 @@ create table opencps_dossierlog ( groupId LONG, companyId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, dossierId LONG, author VARCHAR(75) null, - content VARCHAR(75) null, - notificationType VARCHAR(75) null, - payload VARCHAR(75) null + content TEXT null, + notificationType VARCHAR(200) null, + payload TEXT null ); create table opencps_dossiermark ( @@ -376,7 +377,7 @@ create table opencps_dossiermark ( createDate DATE null, modifiedDate DATE null, dossierId LONG, - dossierPartNo VARCHAR(75) null, + dossierPartNo VARCHAR(255) null, fileCheck INTEGER, fileMark INTEGER, fileComment VARCHAR(75) null, @@ -393,18 +394,18 @@ create table opencps_dossierpart ( createDate DATE null, modifiedDate DATE null, templateNo VARCHAR(75) null, - partNo VARCHAR(75) null, - partName VARCHAR(75) null, - partTip VARCHAR(75) null, + partNo VARCHAR(500) null, + partName VARCHAR(500) null, + partTip TEXT null, partType INTEGER, multiple BOOLEAN, - formScript VARCHAR(75) null, - formReport VARCHAR(75) null, - sampleData VARCHAR(75) null, + formScript TEXT null, + formReport TEXT null, + sampleData TEXT null, required BOOLEAN, - fileTemplateNo VARCHAR(75) null, + fileTemplateNo VARCHAR(500) null, eSign BOOLEAN, - deliverableType VARCHAR(75) null, + deliverableType VARCHAR(500) null, deliverableAction INTEGER, eForm BOOLEAN, fileMark INTEGER @@ -416,7 +417,7 @@ create table opencps_dossierrequests ( companyId LONG, groupId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, dossierId LONG, @@ -433,7 +434,7 @@ create table opencps_dossierstatistic ( companyId LONG, groupId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, month INTEGER, @@ -457,10 +458,10 @@ create table opencps_dossierstatistic ( overdueCount INTEGER, pausingCount INTEGER, ontimePercentage INTEGER, - govAgencyCode VARCHAR(75) null, - govAgencyName VARCHAR(75) null, - domainCode VARCHAR(75) null, - domainName VARCHAR(75) null, + govAgencyCode VARCHAR(255) null, + govAgencyName VARCHAR(255) null, + domainCode VARCHAR(255) null, + domainName VARCHAR(255) null, reporting BOOLEAN ); @@ -473,7 +474,7 @@ create table opencps_dossiersync ( modifiedDate DATE null, dossierId LONG, dossierRefUid VARCHAR(75) null, - syncRefUid VARCHAR(75) null, + syncRefUid VARCHAR(255) null, dossierActionId LONG, actionCode VARCHAR(75) null, actionName VARCHAR(75) null, @@ -481,12 +482,12 @@ create table opencps_dossiersync ( actionNote VARCHAR(75) null, syncType INTEGER, infoType INTEGER, - payload VARCHAR(75) null, + payload TEXT null, serverNo VARCHAR(75) null, state_ INTEGER, retry INTEGER, - messageText VARCHAR(75) null, - acknowlegement VARCHAR(75) null + messageText TEXT null, + acknowlegement TEXT null ); create table opencps_dossiertemplate ( @@ -495,13 +496,13 @@ create table opencps_dossiertemplate ( groupId LONG, companyId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, - templateName VARCHAR(75) null, - description VARCHAR(75) null, - templateNo VARCHAR(75) null, - newFormScript VARCHAR(75) null + templateName STRING null, + description TEXT null, + templateNo VARCHAR(255) null, + newFormScript TEXT null ); create table opencps_dossieruser ( @@ -563,9 +564,9 @@ create table opencps_menuconfig ( menuName VARCHAR(75) null, order_ INTEGER, menuType INTEGER, - queryParams VARCHAR(75) null, - tableConfig VARCHAR(75) null, - buttonConfig VARCHAR(75) null, + queryParams VARCHAR(500) null, + tableConfig TEXT null, + buttonConfig TEXT null, icon VARCHAR(75) null ); @@ -586,14 +587,14 @@ create table opencps_paymentconfig ( createDate DATE null, modifiedDate DATE null, govAgencyCode VARCHAR(75) null, - govAgencyName VARCHAR(75) null, + govAgencyName TEXT null, govAgencyTaxNo VARCHAR(75) null, - invoiceTemplateNo VARCHAR(75) null, - invoiceIssueNo VARCHAR(75) null, - invoiceLastNo VARCHAR(75) null, - invoiceForm VARCHAR(75) null, - bankInfo VARCHAR(75) null, - epaymentConfig VARCHAR(75) null + invoiceTemplateNo TEXT null, + invoiceIssueNo TEXT null, + invoiceLastNo TEXT null, + invoiceForm TEXT null, + bankInfo STRING null, + epaymentConfig TEXT null ); create table opencps_paymentfile ( @@ -602,36 +603,36 @@ create table opencps_paymentfile ( groupId LONG, companyId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, dossierId LONG, referenceUid VARCHAR(75) null, govAgencyCode VARCHAR(75) null, - govAgencyName VARCHAR(75) null, - paymentFee VARCHAR(75) null, + govAgencyName VARCHAR(500) null, + paymentFee VARCHAR(500) null, advanceAmount LONG, feeAmount LONG, serviceAmount LONG, shipAmount LONG, paymentAmount LONG, - paymentNote VARCHAR(75) null, - epaymentProfile VARCHAR(75) null, - bankInfo VARCHAR(75) null, + paymentNote VARCHAR(500) null, + epaymentProfile STRING null, + bankInfo STRING null, paymentStatus INTEGER, paymentMethod VARCHAR(75) null, confirmDatetime DATE null, - confirmPayload VARCHAR(75) null, + confirmPayload STRING null, confirmFileEntryId LONG, confirmNote VARCHAR(75) null, approveDatetime DATE null, - accountUserName VARCHAR(75) null, - govAgencyTaxNo VARCHAR(75) null, - invoiceTemplateNo VARCHAR(75) null, - invoiceIssueNo VARCHAR(75) null, - invoiceNo VARCHAR(75) null, - invoicePayload VARCHAR(75) null, - einvoice VARCHAR(75) null + accountUserName VARCHAR(500) null, + govAgencyTaxNo VARCHAR(500) null, + invoiceTemplateNo VARCHAR(500) null, + invoiceIssueNo VARCHAR(500) null, + invoiceNo VARCHAR(500) null, + invoicePayload STRING null, + einvoice STRING null ); create table opencps_process_plugin ( @@ -640,16 +641,16 @@ create table opencps_process_plugin ( companyId LONG, groupId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, stepCode VARCHAR(75) null, serviceProcessId LONG, - pluginName VARCHAR(75) null, + pluginName VARCHAR(500) null, pluginType INTEGER, sequenceNo VARCHAR(75) null, - pluginForm VARCHAR(75) null, - sampleData VARCHAR(75) null, + pluginForm TEXT null, + sampleData STRING null, autoRun BOOLEAN ); @@ -659,31 +660,31 @@ create table opencps_processaction ( companyId LONG, groupId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, serviceProcessId LONG, - preStepCode VARCHAR(75) null, - postStepCode VARCHAR(75) null, - autoEvent VARCHAR(75) null, - preCondition VARCHAR(75) null, - actionCode VARCHAR(75) null, - actionName VARCHAR(75) null, + preStepCode STRING null, + postStepCode STRING null, + autoEvent STRING null, + preCondition STRING null, + actionCode VARCHAR(255) null, + actionName VARCHAR(500) null, allowAssignUser INTEGER, assignUserId LONG, requestPayment INTEGER, - paymentFee VARCHAR(75) null, - createDossierFiles VARCHAR(75) null, - returnDossierFiles VARCHAR(75) null, - makeBriefNote VARCHAR(75) null, + paymentFee VARCHAR(500) null, + createDossierFiles STRING null, + returnDossierFiles STRING null, + makeBriefNote VARCHAR(500) null, syncActionCode VARCHAR(75) null, rollbackable BOOLEAN, createDossierNo BOOLEAN, eSignature BOOLEAN, - configNote VARCHAR(75) null, - dossierTemplateNo VARCHAR(75) null, - signatureType VARCHAR(75) null, - createDossiers VARCHAR(75) null, + configNote TEXT null, + dossierTemplateNo VARCHAR(255) null, + signatureType VARCHAR(255) null, + createDossiers VARCHAR(255) null, checkInput INTEGER ); @@ -693,19 +694,19 @@ create table opencps_processoption ( groupId LONG, companyId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, serviceConfigId LONG, optionOrder INTEGER, - optionName VARCHAR(75) null, - autoSelect VARCHAR(75) null, + optionName VARCHAR(500) null, + autoSelect VARCHAR(500) null, dossierTemplateId LONG, serviceProcessId LONG, - instructionNote VARCHAR(75) null, - submissionNote VARCHAR(75) null, + instructionNote TEXT null, + submissionNote TEXT null, sampleCount LONG, - registerBookCode VARCHAR(75) null + registerBookCode VARCHAR(100) null ); create table opencps_processsequence ( @@ -718,9 +719,9 @@ create table opencps_processsequence ( createDate DATE null, modifiedDate DATE null, serviceProcessId LONG, - sequenceNo VARCHAR(75) null, - sequenceName VARCHAR(75) null, - sequenceRole VARCHAR(75) null, + sequenceNo VARCHAR(255) null, + sequenceName VARCHAR(512) null, + sequenceRole VARCHAR(255) null, durationCount DOUBLE ); @@ -730,24 +731,24 @@ create table opencps_processstep ( companyId LONG, groupId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, - stepCode VARCHAR(75) null, + stepCode VARCHAR(255) null, serviceProcessId LONG, - stepName VARCHAR(75) null, - sequenceNo VARCHAR(75) null, + stepName VARCHAR(500) null, + sequenceNo VARCHAR(255) null, dossierStatus VARCHAR(75) null, dossierSubStatus VARCHAR(75) null, durationCount DOUBLE, - customProcessUrl VARCHAR(75) null, - stepInstruction VARCHAR(75) null, - briefNote VARCHAR(75) null, + customProcessUrl VARCHAR(255) null, + stepInstruction TEXT null, + briefNote TEXT null, editable BOOLEAN, - restrictDossier VARCHAR(75) null, - lockState VARCHAR(75) null, - groupName VARCHAR(75) null, - roleAsStep VARCHAR(75) null, + restrictDossier VARCHAR(255) null, + lockState VARCHAR(255) null, + groupName VARCHAR(255) null, + roleAsStep VARCHAR(255) null, checkInput INTEGER ); @@ -755,10 +756,10 @@ create table opencps_processsteprole ( uuid_ VARCHAR(75) null, processStepId LONG not null, roleId LONG not null, - roleCode VARCHAR(75) null, - roleName VARCHAR(75) null, + roleCode VARCHAR(255) null, + roleName VARCHAR(255) null, moderator BOOLEAN, - condition_ VARCHAR(75) null, + condition_ TEXT null, primary key (processStepId, roleId) ); @@ -770,13 +771,13 @@ create table opencps_publish_queue ( createDate DATE null, modifiedDate DATE null, dossierId LONG, - serverNo VARCHAR(75) null, + serverNo VARCHAR(255) null, status INTEGER, retry INTEGER, publishType INTEGER, - publishData VARCHAR(75) null, - messageText VARCHAR(75) null, - acknowlegement VARCHAR(75) null + publishData TEXT null, + messageText TEXT null, + acknowlegement TEXT null ); create table opencps_registration ( @@ -787,26 +788,26 @@ create table opencps_registration ( userId LONG, createDate DATE null, modifiedDate DATE null, - applicantName VARCHAR(75) null, + applicantName VARCHAR(275) null, applicantIdType VARCHAR(75) null, applicantIdNo VARCHAR(75) null, applicantIdDate DATE null, - address VARCHAR(75) null, + address VARCHAR(575) null, cityCode VARCHAR(75) null, - cityName VARCHAR(75) null, + cityName VARCHAR(275) null, districtCode VARCHAR(75) null, - districtName VARCHAR(75) null, + districtName VARCHAR(275) null, wardCode VARCHAR(75) null, - wardName VARCHAR(75) null, - contactName VARCHAR(75) null, - contactTelNo VARCHAR(75) null, - contactEmail VARCHAR(75) null, + wardName VARCHAR(275) null, + contactName VARCHAR(275) null, + contactTelNo VARCHAR(275) null, + contactEmail VARCHAR(275) null, govAgencyCode VARCHAR(75) null, - govAgencyName VARCHAR(75) null, + govAgencyName VARCHAR(275) null, registrationState INTEGER, registrationClass VARCHAR(75) null, submitting BOOLEAN, - representativeEnterprise VARCHAR(75) null + representativeEnterprise VARCHAR(255) null ); create table opencps_registrationform ( @@ -820,10 +821,10 @@ create table opencps_registrationform ( registrationId LONG, referenceUid VARCHAR(75) null, formNo VARCHAR(75) null, - formName VARCHAR(75) null, - formData VARCHAR(75) null, - formScript VARCHAR(75) null, - formReport VARCHAR(75) null, + formName VARCHAR(275) null, + formData TEXT null, + formScript TEXT null, + formReport TEXT null, fileEntryId LONG, isNew BOOLEAN, removed BOOLEAN @@ -838,9 +839,9 @@ create table opencps_registrationlog ( createDate DATE null, modifiedDate DATE null, registrationId LONG, - author VARCHAR(75) null, - content VARCHAR(75) null, - payload VARCHAR(75) null + author TEXT null, + content TEXT null, + payload TEXT null ); create table opencps_registrationtemplate ( @@ -848,17 +849,17 @@ create table opencps_registrationtemplate ( registrationTemplateId LONG not null primary key, groupId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, govAgencyCode VARCHAR(75) null, - govAgencyName VARCHAR(75) null, + govAgencyName VARCHAR(255) null, formNo VARCHAR(75) null, formName VARCHAR(75) null, multiple BOOLEAN, - formScript VARCHAR(75) null, - formReport VARCHAR(75) null, - sampleData VARCHAR(75) null + formScript TEXT null, + formReport TEXT null, + sampleData TEXT null ); create table opencps_serviceconfig ( @@ -867,15 +868,15 @@ create table opencps_serviceconfig ( groupId LONG, companyId LONG, userId LONG, - userName VARCHAR(75) null, + userName VARCHAR(255) null, createDate DATE null, modifiedDate DATE null, serviceInfoId LONG, govAgencyCode VARCHAR(75) null, - govAgencyName VARCHAR(75) null, - serviceInstruction VARCHAR(75) null, + govAgencyName STRING null, + serviceInstruction TEXT null, serviceLevel INTEGER, - serviceUrl VARCHAR(75) null, + serviceUrl VARCHAR(500) null, forCitizen BOOLEAN, forBusiness BOOLEAN, postService BOOLEAN, @@ -892,21 +893,21 @@ create table opencps_serviceinfo ( createDate DATE null, modifiedDate DATE null, serviceCode VARCHAR(75) null, - serviceName VARCHAR(75) null, - processText VARCHAR(75) null, - methodText VARCHAR(75) null, - dossierText VARCHAR(75) null, - conditionText VARCHAR(75) null, - durationText VARCHAR(75) null, - applicantText VARCHAR(75) null, - resultText VARCHAR(75) null, - regularText VARCHAR(75) null, - feeText VARCHAR(75) null, + serviceName STRING null, + processText TEXT null, + methodText TEXT null, + dossierText TEXT null, + conditionText TEXT null, + durationText TEXT null, + applicantText TEXT null, + resultText TEXT null, + regularText TEXT null, + feeText TEXT null, administrationCode VARCHAR(75) null, - administrationName VARCHAR(75) null, + administrationName VARCHAR(500) null, administrationIndex VARCHAR(75) null, domainCode VARCHAR(75) null, - domainName VARCHAR(75) null, + domainName TEXT null, domainIndex VARCHAR(75) null, maxLevel INTEGER, public_ BOOLEAN @@ -921,22 +922,22 @@ create table opencps_serviceprocess ( userName VARCHAR(75) null, createDate DATE null, modifiedDate DATE null, - processNo VARCHAR(75) null, - processName VARCHAR(75) null, - description VARCHAR(75) null, + processNo VARCHAR(255) null, + processName STRING null, + description TEXT null, durationCount DOUBLE, durationUnit INTEGER, counter LONG, generateDossierNo BOOLEAN, - dossierNoPattern VARCHAR(75) null, + dossierNoPattern TEXT null, generateDueDate BOOLEAN, - dueDatePattern VARCHAR(75) null, + dueDatePattern VARCHAR(500) null, generatePassword BOOLEAN, directNotification BOOLEAN, - serverNo VARCHAR(75) null, - serverName VARCHAR(75) null, + serverNo VARCHAR(255) null, + serverName TEXT null, requestPayment BOOLEAN, - paymentFee VARCHAR(75) null, + paymentFee VARCHAR(255) null, dossierGroupPattern VARCHAR(75) null ); @@ -944,8 +945,8 @@ create table opencps_serviceprocessrole ( uuid_ VARCHAR(75) null, serviceProcessId LONG not null, roleId LONG not null, - roleCode VARCHAR(75) null, - roleName VARCHAR(75) null, + roleCode VARCHAR(255) null, + roleName VARCHAR(255) null, moderator BOOLEAN, condition_ VARCHAR(75) null, primary key (serviceProcessId, roleId) @@ -955,7 +956,7 @@ create table opencps_services_filetemplates ( uuid_ VARCHAR(75) null, serviceInfoId LONG not null, fileTemplateNo VARCHAR(75) not null, - templateName VARCHAR(75) null, + templateName VARCHAR(1000) null, fileEntryId LONG, eForm BOOLEAN, formScriptFileId LONG, @@ -980,7 +981,7 @@ create table opencps_stepconfig ( dossierSubStatus VARCHAR(75) null, menuGroup VARCHAR(75) null, menuStepName VARCHAR(75) null, - buttonConfig VARCHAR(75) null + buttonConfig TEXT null ); create table opencps_userinfolog ( diff --git a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/service.properties b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/service.properties index 039b74653f..e371ffaede 100644 --- a/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/service.properties +++ b/modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/service.properties @@ -13,5 +13,5 @@ ## build.namespace=dossiermgt - build.number=1274 - build.date=1562038890284 \ No newline at end of file + build.number=1277 + build.date=1562123085943 \ No newline at end of file