+ property_type, fix property

This commit is contained in:
r.gaztdinov 2025-09-12 11:03:57 +03:00
parent eca7424c45
commit 608faf9424
9 changed files with 396 additions and 5 deletions

View file

@ -119,5 +119,25 @@
"name" : "DB_ARCHIVE_PASSWORD",
"value" : "readonly",
"description" : ""
}, {
"name" : "DB_NSI_HOST",
"value" : "172.30.66.35",
"description" : ""
}, {
"name" : "DB_NSI_PORT",
"value" : "5432",
"description" : ""
}, {
"name" : "DB_NSI_NAME",
"value" : "ervu_nsi",
"description" : ""
}, {
"name" : "DB_NSI_USERNAME",
"value" : "readonly",
"description" : ""
}, {
"name" : "DB_NSI_PASSWORD",
"value" : "readonly",
"description" : ""
} ]
}

View file

@ -119,5 +119,25 @@
"name" : "DB_ARCHIVE_PASSWORD",
"value" : "Encrypted 2beebdaaa1ac8978aaa54aa72ce93bcc9",
"description" : ""
}, {
"name" : "DB_NSI_HOST",
"value" : "nsi-dbhost",
"description" : ""
}, {
"name" : "DB_NSI_PORT",
"value" : "7777",
"description" : ""
}, {
"name" : "DB_NSI_NAME",
"value" : "nsi-dbname",
"description" : ""
}, {
"name" : "DB_NSI_USERNAME",
"value" : "nsi-dbuser",
"description" : ""
}, {
"name" : "DB_NSI_PASSWORD",
"value" : "Encrypted 2beebdaaa1ac8978aaa54aa72ce93bcc9",
"description" : ""
} ]
}

View file

@ -0,0 +1,158 @@
<?xml version="1.0" encoding="UTF-8"?>
<pipeline>
<info>
<name>property_type</name>
<name_sync_with_filename>Y</name_sync_with_filename>
<description/>
<extended_description/>
<pipeline_version/>
<pipeline_type>Normal</pipeline_type>
<parameters>
</parameters>
<capture_transform_performance>N</capture_transform_performance>
<transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
<transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
<created_user>-</created_user>
<created_date>2025/09/11 17:31:37.874</created_date>
<modified_user>-</modified_user>
<modified_date>2025/09/11 17:31:37.874</modified_date>
</info>
<notepads>
</notepads>
<order>
<hop>
<from>Table input</from>
<to>Insert / update</to>
<enabled>Y</enabled>
</hop>
</order>
<transform>
<name>Insert / update</name>
<type>InsertUpdate</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<commit>100</commit>
<connection>ervu-dashboard</connection>
<lookup>
<key>
<condition>=</condition>
<field>code</field>
<name>code</name>
<name2/>
</key>
<schema>ervu_dashboard</schema>
<table>property_type</table>
<value>
<name>code</name>
<rename>code</rename>
<update>N</update>
</value>
<value>
<name>name</name>
<rename>name</rename>
<update>Y</update>
</value>
<value>
<name>type</name>
<rename>type</rename>
<update>Y</update>
</value>
<value>
<name>created_at</name>
<rename>created_at</rename>
<update>Y</update>
</value>
<value>
<name>updated_at</name>
<rename>updated_at</rename>
<update>Y</update>
</value>
<value>
<name>hidden</name>
<rename>hidden</rename>
<update>Y</update>
</value>
</lookup>
<update_bypassed>N</update_bypassed>
<attributes/>
<GUI>
<xloc>640</xloc>
<yloc>320</yloc>
</GUI>
</transform>
<transform>
<name>Table input</name>
<type>TableInput</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<connection>ervu_nsi</connection>
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>-- недвижимость
SELECT
key AS code,
value->'value' #>> '{}' AS name,
'realty' AS type,
created_at,
updated_at,
hidden
FROM public.classifier_records where code = 'propertyRealtyTypeOfRight'
UNION ALL
-- наземный транспорт
SELECT
key AS code,
value->'value' #>> '{}' AS name,
'ground_transportation' AS type,
created_at,
updated_at,
hidden
FROM public.classifier_records where code = 'propertyTypeOfVehicles'
UNION ALL
-- воздушный транспорт
SELECT
key AS code,
value->'value' #>> '{}' AS name,
'air_vehicles' AS type,
created_at,
updated_at,
hidden
FROM public.classifier_records where code = 'propertyTypeOfAircraft'
UNION ALL
-- водный транспорт
SELECT
key AS code,
value->'value' #>> '{}' AS name,
'water_vehicles' AS type,
created_at,
updated_at,
hidden
FROM public.classifier_records where code = 'propertyTypeOfWaterTransport'</sql>
<variables_active>N</variables_active>
<attributes/>
<GUI>
<xloc>416</xloc>
<yloc>336</yloc>
</GUI>
</transform>
<transform_error_handling>
</transform_error_handling>
<attributes/>
</pipeline>

View file

@ -289,6 +289,11 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
<subject>is_water_transport</subject>
<type>MAX</type>
</field>
<field>
<aggregate>has_possibility_reg_residence</aggregate>
<subject>is_possibility_reg_residence</subject>
<type>MAX</type>
</field>
</fields>
<give_back_row>N</give_back_row>
<group>
@ -415,7 +420,7 @@ all_data as(
base.recruit_id,
property_data->>'naimVidPrav' AS kind_right, -- Исправлено название поля
property_data->'adrObSob'->>'adrObSobTekst' AS address,
NULL AS vehicle_type, -- Добавлено для соответствия числа столбцов
property_data->>'kodVidPrav' AS vehicle_type,
NULL AS issue_year,
NULL AS brand_model,
NULL AS reg_plate,
@ -638,6 +643,10 @@ from all_data</sql>
<name>has_water_transport</name>
<rename>has_water_transport</rename>
</value>
<value>
<name>has_possibility_reg_residence</name>
<rename>has_possibility_reg_residence</rename>
</value>
</lookup>
<skip_lookup>N</skip_lookup>
<use_batch>Y</use_batch>
@ -690,6 +699,14 @@ from all_data</sql>
<value_precision>-1</value_precision>
<replace_field/>
</formula>
<formula>
<field_name>has_possibility_reg_residence</field_name>
<formula_string>has_possibility_reg_residence_raw == 1</formula_string>
<value_type>Boolean</value_type>
<value_length>-1</value_length>
<value_precision>-1</value_precision>
<replace_field/>
</formula>
<attributes/>
<GUI>
<xloc>1104</xloc>

View file

@ -292,6 +292,11 @@ and recruitment_id = '${IDM_ID}';</sql>
<subject>is_water_transport</subject>
<type>MAX</type>
</field>
<field>
<aggregate>has_possibility_reg_residence_raw</aggregate>
<subject>is_possibility_reg_residence</subject>
<type>MAX</type>
</field>
</fields>
<give_back_row>N</give_back_row>
<group>
@ -518,7 +523,7 @@ all_data as(
base.recruit_id,
property_data->>'naimVidPrav' AS kind_right, -- Исправлено название поля
property_data->'adrObSob'->>'adrObSobTekst' AS address,
NULL AS vehicle_type, -- Добавлено для соответствия числа столбцов
property_data->>'kodVidPrav' AS vehicle_type,
NULL AS issue_year,
NULL AS brand_model,
NULL AS reg_plate,
@ -659,6 +664,10 @@ from all_data</sql>
<name>has_water_transport</name>
<rename>has_water_transport</rename>
</value>
<value>
<name>has_possibility_reg_residence</name>
<rename>has_possibility_reg_residence</rename>
</value>
</lookup>
<skip_lookup>N</skip_lookup>
<use_batch>Y</use_batch>
@ -711,6 +720,14 @@ from all_data</sql>
<value_precision>-1</value_precision>
<replace_field/>
</formula>
<formula>
<field_name>has_possibility_reg_residence</field_name>
<formula_string>has_possibility_reg_residence_raw == 1</formula_string>
<value_type>Boolean</value_type>
<value_length>-1</value_length>
<value_precision>-1</value_precision>
<replace_field/>
</formula>
<attributes/>
<GUI>
<xloc>1168</xloc>

View file

@ -307,6 +307,11 @@ DO UPDATE SET
<subject>is_water_transport</subject>
<type>MAX</type>
</field>
<field>
<aggregate>has_possibility_reg_residence_raw</aggregate>
<subject>is_possibility_reg_residence</subject>
<type>MAX</type>
</field>
</fields>
<give_back_row>N</give_back_row>
<group>
@ -532,7 +537,7 @@ all_data as(
base.recruit_id,
property_data->>'naimVidPrav' AS kind_right, -- Исправлено название поля
property_data->'adrObSob'->>'adrObSobTekst' AS address,
NULL AS vehicle_type, -- Добавлено для соответствия числа столбцов
property_data->>'kodVidPrav' AS vehicle_type,
NULL AS issue_year,
NULL AS brand_model,
NULL AS reg_plate,
@ -673,6 +678,10 @@ from all_data</sql>
<name>has_water_transport</name>
<rename>has_water_transport</rename>
</value>
<value>
<name>has_possibility_reg_residence</name>
<rename>has_possibility_reg_residence</rename>
</value>
</lookup>
<skip_lookup>N</skip_lookup>
<use_batch>Y</use_batch>
@ -725,6 +734,14 @@ from all_data</sql>
<value_precision>-1</value_precision>
<replace_field/>
</formula>
<formula>
<field_name>has_possibility_reg_residence</field_name>
<formula_string>has_possibility_reg_residence_raw == 1</formula_string>
<value_type>Boolean</value_type>
<value_length>-1</value_length>
<value_precision>-1</value_precision>
<replace_field/>
</formula>
<attributes/>
<GUI>
<xloc>1088</xloc>

View file

@ -63,6 +63,8 @@
<create_parent_folder>N</create_parent_folder>
<exec_per_row>N</exec_per_row>
<filename>${PROJECT_HOME}/info_recruits/citizen_tables/property/checkpoints/check_if_property_job_exists.hpl</filename>
<logext/>
<logfile/>
<loglevel>Basic</loglevel>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>
@ -158,8 +160,6 @@
<create_parent_folder>N</create_parent_folder>
<exec_per_row>N</exec_per_row>
<filename>${PROJECT_HOME}/info_recruits/citizen_tables/property/check_if_need_to_repeat_job.hpl</filename>
<logext/>
<logfile/>
<loglevel>Basic</loglevel>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>

View file

@ -0,0 +1,116 @@
<?xml version="1.0" encoding="UTF-8"?>
<pipeline>
<info>
<name>reasons_deferment</name>
<name_sync_with_filename>Y</name_sync_with_filename>
<description/>
<extended_description/>
<pipeline_version/>
<pipeline_type>Normal</pipeline_type>
<parameters>
</parameters>
<capture_transform_performance>N</capture_transform_performance>
<transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
<transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
<created_user>-</created_user>
<created_date>2025/09/11 15:41:52.488</created_date>
<modified_user>-</modified_user>
<modified_date>2025/09/11 15:41:52.488</modified_date>
</info>
<notepads>
</notepads>
<order>
<hop>
<from>Table input</from>
<to>Insert / update</to>
<enabled>Y</enabled>
</hop>
</order>
<transform>
<name>Insert / update</name>
<type>InsertUpdate</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<commit>100</commit>
<connection>ervu-dashboard</connection>
<lookup>
<key>
<condition>=</condition>
<field>code</field>
<name>code</name>
<name2/>
</key>
<schema>ervu_dashboard</schema>
<table>reasons_deferment</table>
<value>
<name>code</name>
<rename>code</rename>
<update>N</update>
</value>
<value>
<name>name</name>
<rename>name</rename>
<update>Y</update>
</value>
<value>
<name>created_at</name>
<rename>created_at</rename>
<update>Y</update>
</value>
<value>
<name>updated_at</name>
<rename>updated_at</rename>
<update>Y</update>
</value>
<value>
<name>hidden</name>
<rename>hidden</rename>
<update>Y</update>
</value>
</lookup>
<update_bypassed>N</update_bypassed>
<attributes/>
<GUI>
<xloc>880</xloc>
<yloc>288</yloc>
</GUI>
</transform>
<transform>
<name>Table input</name>
<type>TableInput</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<connection>ervu_nsi</connection>
<execute_each_row>N</execute_each_row>
<limit>0</limit>
<sql>SELECT
key AS code,
value->'value' #>> '{}' AS name,
created_at,
updated_at,
hidden
FROM public.classifier_records
WHERE code = 'ervuReasonForDeferment'</sql>
<variables_active>N</variables_active>
<attributes/>
<GUI>
<xloc>496</xloc>
<yloc>288</yloc>
</GUI>
</transform>
<transform_error_handling>
</transform_error_handling>
<attributes/>
</pipeline>

View file

@ -0,0 +1,26 @@
{
"rdbms": {
"POSTGRESQL": {
"databaseName": "${DB_NSI_NAME}",
"pluginId": "POSTGRESQL",
"accessType": 0,
"hostname": "${DB_NSI_HOST}",
"password": "${DB_NSI_PASSWORD}",
"pluginName": "PostgreSQL",
"port": "${DB_NSI_PORT}",
"attributes": {
"SUPPORTS_TIMESTAMP_DATA_TYPE": "Y",
"QUOTE_ALL_FIELDS": "N",
"SUPPORTS_BOOLEAN_DATA_TYPE": "Y",
"FORCE_IDENTIFIERS_TO_LOWERCASE": "N",
"PRESERVE_RESERVED_WORD_CASE": "Y",
"SQL_CONNECT": "",
"FORCE_IDENTIFIERS_TO_UPPERCASE": "N",
"PREFERRED_SCHEMA_NAME": ""
},
"manualUrl": "",
"username": "${DB_NSI_USERNAME}"
}
},
"name": "ervu_nsi"
}