Merge branch 'develop2' of 10.10.31.70:/ervu-dashboard into develop2

backend/src/main/resources/config/v_1.10/20251113-appeals.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+					  
+	<changeSet id="0001" author="r.gaztdinov">
+        <comment>review_progress</comment>
+		<sql>
+			CREATE TABLE IF NOT EXISTS appeals.review_progress
+			(
+			    id_review_progress bigserial NOT NULL,
+			    recruitment_id uuid NOT NULL,
+			    schema character varying(64) NOT NULL DEFAULT 'empty'::character varying,
+			    recording_date date NOT NULL DEFAULT now(),
+			    in_work numeric,
+			    decided numeric,
+			    revoked numeric,
+			    in_work_percent numeric,
+			    decided_percent numeric,
+			    revoked_percent numeric,
+			    total_appeals numeric,
+			    CONSTRAINT review_progress_pkey PRIMARY KEY (id_review_progress, recruitment_id, schema, recording_date)
+			);
+
+			COMMENT ON TABLE appeals.review_progress
+			    IS 'Ход рассмотрения';
+
+			COMMENT ON COLUMN appeals.review_progress.in_work
+			    IS 'в работе';
+
+			COMMENT ON COLUMN appeals.review_progress.decided
+			    IS 'решено';
+
+			COMMENT ON COLUMN appeals.review_progress.revoked
+			    IS 'отозвано';
+
+			DROP TABLE IF EXISTS appeals.reasons_appeal CASCADE;
+
+	    ALTER TABLE IF EXISTS appeals.topic_appeal
+	    ADD COLUMN IF NOT EXISTS recruitment_campaign numeric;
+	    COMMENT ON COLUMN appeals.topic_appeal.recruitment_campaign IS 'Решения призывной комиссии';
+
+	    ALTER TABLE IF EXISTS appeals.topic_appeal
+	    ADD COLUMN IF NOT EXISTS recruitment_campaign_percent numeric;
+
+	    ALTER TABLE IF EXISTS appeals.topic_appeal
+	    ADD COLUMN IF NOT EXISTS making_changes numeric;
+	    COMMENT ON COLUMN appeals.topic_appeal.making_changes IS 'Внесение изменений';
+
+	    ALTER TABLE IF EXISTS appeals.topic_appeal
+	    ADD COLUMN IF NOT EXISTS making_changes_percent numeric;
+
+	    ALTER TABLE IF EXISTS appeals.topic_appeal
+	    DROP COLUMN IF EXISTS sabpoena;
+
+	    ALTER TABLE IF EXISTS appeals.topic_appeal
+	    DROP COLUMN IF EXISTS appear;
+
+	    ALTER TABLE IF EXISTS appeals.topic_appeal
+	    ADD COLUMN IF NOT EXISTS total_appeals numeric;
+
+	    ALTER TABLE IF EXISTS appeals.review_rating 
+			DROP CONSTRAINT IF EXISTS unique_review_rating;   
+
+		</sql>
+	</changeSet>
+
+</databaseChangeLog>

backend/src/main/resources/config/v_1.10/changelog-1.10.xml

@@ -32,5 +32,6 @@
   <include file="20251003-deferment_unified_data.xml" relativeToChangelogFile="true"/>
   <include file="20251004-ERVU.xml" relativeToChangelogFile="true"/>
   <include file="20251030-SUPPORT-9523.xml" relativeToChangelogFile="true"/>
+  <include file="20251113-appeals.xml" relativeToChangelogFile="true"/>
 
 </databaseChangeLog>