Merge remote-tracking branch 'origin/tmp_makets/ERVU-329' into tmp_makets/ERVU-329

# Conflicts:
#	resources/src/main/resources/business-model/ervu-business-metrics/removal_military_registration.page

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/CitizenAppeals.java

@@ -109,6 +109,12 @@ public class CitizenAppeals extends TableImpl<CitizenAppealsRecord> {
      */
     public final TableField<CitizenAppealsRecord, Long> COUNT_ACCEPTED_ON_TIME = createField(DSL.name("count_accepted_on_time"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "Принято в срок");
 
+    /**
+     * The column <code>metrics.citizen_appeals.average_response_time</code>.
+     * Средний срок ответа
+     */
+    public final TableField<CitizenAppealsRecord, Long> AVERAGE_RESPONSE_TIME = createField(DSL.name("average_response_time"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "Средний срок ответа");
+
     private CitizenAppeals(Name alias, Table<CitizenAppealsRecord> aliased) {
         this(alias, aliased, (Field<?>[]) null, null);
     }

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/CitizenAppealsRecord.java

@@ -157,6 +157,22 @@ public class CitizenAppealsRecord extends UpdatableRecordImpl<CitizenAppealsReco
         return (Long) get(8);
     }
 
+    /**
+     * Setter for <code>metrics.citizen_appeals.average_response_time</code>.
+     * Средний срок ответа
+     */
+    public void setAverageResponseTime(Long value) {
+        set(9, value);
+    }
+
+    /**
+     * Getter for <code>metrics.citizen_appeals.average_response_time</code>.
+     * Средний срок ответа
+     */
+    public Long getAverageResponseTime() {
+        return (Long) get(9);
+    }
+
     // -------------------------------------------------------------------------
     // Primary key information
     // -------------------------------------------------------------------------
@@ -180,7 +196,7 @@ public class CitizenAppealsRecord extends UpdatableRecordImpl<CitizenAppealsReco
     /**
      * Create a detached, initialised CitizenAppealsRecord
      */
-    public CitizenAppealsRecord(Long citizenAppealsId, String recruitmentId, Timestamp updateDate, Date infoDate, Long countSubmitted, Long countSatisfided, Long countNotSatisfided, Long countAcceptedExpired, Long countAcceptedOnTime) {
+    public CitizenAppealsRecord(Long citizenAppealsId, String recruitmentId, Timestamp updateDate, Date infoDate, Long countSubmitted, Long countSatisfided, Long countNotSatisfided, Long countAcceptedExpired, Long countAcceptedOnTime, Long averageResponseTime) {
         super(CitizenAppeals.CITIZEN_APPEALS);
 
         setCitizenAppealsId(citizenAppealsId);
@@ -192,6 +208,7 @@ public class CitizenAppealsRecord extends UpdatableRecordImpl<CitizenAppealsReco
         setCountNotSatisfided(countNotSatisfided);
         setCountAcceptedExpired(countAcceptedExpired);
         setCountAcceptedOnTime(countAcceptedOnTime);
+        setAverageResponseTime(averageResponseTime);
         resetChangedOnNotNull();
     }
 }