micord/ervu-lkrp-fl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-8817: fix after merge

Browse source
This commit is contained in:
gulnaz 2025-01-31 12:52:07 +03:00
parent f57847eeea
commit f64cb4f894
2 changed files with 165 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/src/main/java/ru/micord/ervu/converter/SummonsResponseDataConverter.java
View file

@ -5,6 +5,8 @@ import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import org.springframework.util.StringUtils;
import proto.ervu.rp.summons.RecruitmentInfo;
import ru.micord.ervu.dto.Restriction;
import ru.micord.ervu.dto.SubpoenaResponseDto;
import org.springframework.stereotype.Component;
@ -29,6 +31,7 @@ public class SummonsResponseDataConverter {
private static final String ACTUAL_ADDRESS_CODE = "_3";
public SubpoenaResponseDto convert(SummonsResponseData responseData) {
RecruitmentInfo recruitmentInfo = responseData.getRecruitmentInfo();
SubpoenaResponseDto.Builder builder = new SubpoenaResponseDto.Builder()
.personName(responseData.getFirstName(), responseData.getMiddleName(),
responseData.getLastName()
@ -40,10 +43,11 @@ public class SummonsResponseDataConverter {
.issueOrg(responseData.getIssueOrg())
.issueIdCode(responseData.getIssueIdCode())
.militaryCommissariatName(responseData.getRecruitmentInfo().getMilitaryCommissariatName())
.recruitmentStatusCode(
Integer.parseInt(responseData.getRecruitmentInfo().getRecruitmentStatusCode()))
.recruitmentStartDate(responseData.getRecruitmentInfo().getRecruitmentStart())
.militaryCommissariatName(recruitmentInfo.getMilitaryCommissariatName())
.recruitmentStatusCode(StringUtils.hasText(recruitmentInfo.getRecruitmentStatusCode())
? Integer.parseInt(recruitmentInfo.getRecruitmentStatusCode())
: 0)
.recruitmentStartDate(recruitmentInfo.getRecruitmentStart())
.residenceAddress(getAddressByCode(responseData.getAddressesList(), RESIDENCE_ADDRESS_CODE))
.stayAddress(getAddressByCode(responseData.getAddressesList(), STAY_ADDRESS_CODE))

499
resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page
View file

@ -1013,12 +1013,6 @@
</value>
</item>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
@ -1329,6 +1323,57 @@
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="57305b6c-cb1c-4d2f-8922-94b08469dab2" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a28b93c3-fbbc-43d2-ab0c-9b0abcae5106","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"IS_NOT_EMPTY"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
@ -1826,12 +1871,6 @@
<value>
<simple>"Запросить выписку"</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
@ -4049,7 +4088,6 @@
<componentRootId>304824d5-9f9f-4af9-9b08-6232f7536774</componentRootId>
<name>FS - 1.1.3 (Воинский учёт)</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="46f20297-81d1-4786-bb17-2a78ca6fda6f">
<properties>
@ -4139,6 +4177,7 @@
<componentRootId>8ae57bdb-4acb-4f34-9641-9b5031b408d3</componentRootId>
<name>VB - 1.1.3.1 (вы состоите на учете) сценаций</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -4643,12 +4682,6 @@
</value>
</item>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
@ -4764,12 +4797,6 @@
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
@ -4929,12 +4956,6 @@
<value>
<simple>"Запросить выписку"</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
@ -5710,7 +5731,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"63871032-9206-4f76-8c93-c8ab1b8200d2","packageName":"component.field","className":"NumberField","type":"TS"}</simple>
<simple>{"objectId":"a28b93c3-fbbc-43d2-ab0c-9b0abcae5106","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -5733,7 +5754,7 @@
<key>staticValue</key>
<value>
<implRef type="TS">
<className>number</className>
<className>string</className>
<packageName></packageName>
</implRef>
<simple>0.0</simple>
@ -5745,7 +5766,7 @@
<entry>
<key>operation</key>
<value>
<simple>"EQUALS"</simple>
<simple>"IS_NOT_EMPTY"</simple>
</value>
</entry>
</complex>
@ -5754,7 +5775,24 @@
</complex>
</value>
</item>
<item id="7d9187ca-f2e5-48ff-8670-93d9fc8bcf85" removed="false">
<item id="7d9187ca-f2e5-48ff-8670-93d9fc8bcf85" removed="true"/>
<item id="94f9c8a4-2825-4ab1-874f-b7141e206799" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>group</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="9f0c2f9b-3ee6-48fe-88be-b42fb236e578" removed="false">
<value>
<complex>
<entry>
@ -5801,6 +5839,74 @@
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="9159dca3-746f-49f0-bc84-db0ee17ed9cb" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"63871032-9206-4f76-8c93-c8ab1b8200d2","packageName":"component.field","className":"NumberField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>number</className>
<packageName></packageName>
</implRef>
<simple>0.0</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
@ -5815,6 +5921,22 @@
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="aed64e39-e66a-44b0-bd2a-7afe960e78d3" removed="true"/>
<item id="3404b012-e85d-4507-b479-ba8720fb7e98" removed="true"/>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>"AND"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
@ -7173,313 +7295,6 @@
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="315c5087-825a-4ade-99d9-7dbe09f87226">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>315c5087-825a-4ade-99d9-7dbe09f87226</componentRootId>
<name>AC - для найденного пользователя в ерву</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>elseActions</key>
<value>
<item id="15082312-b39c-473a-b08a-f0690c5d37d2" removed="true"/>
</value>
</entry>
<entry>
<key>eventRefs</key>
<value>
<item id="ca97a9f3-5f25-4f75-b4a0-c98aac1b1e57" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a28b93c3-fbbc-43d2-ab0c-9b0abcae5106","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"valueChangeEvent"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="ff5d074b-77d4-48c6-a7c4-3ca7e585d8c9" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a28b93c3-fbbc-43d2-ab0c-9b0abcae5106","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"null"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"IS_NOT_EMPTY"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="af4102d7-698c-420e-a7fe-ca9bf69a29a7" removed="true"/>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="7654b087-130d-4441-9acf-cdd831c65374" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"cfb60860-1b04-4eb5-9ccf-1e6436c27b09","packageName":"component.button","className":"Button","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="83e45626-89e0-4dd6-9caf-a17d6c474a72" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"dd701bad-b22d-40c9-b00b-b92f070890db","packageName":"ervu.component.textwithdialoglinks","className":"TextWithDialogLinks","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="8d08e1aa-8fdc-4c49-b995-f1e1f40452d1" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"d68b5c38-9ed6-4596-9b0c-dd1dc542c5ef","packageName":"component.button","className":"Button","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="d0250c79-e72e-4997-8d8e-0dcd9ea93f42" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"fea5aebc-c206-48bc-a613-ab31813fd639","packageName":"component.container","className":"HBox","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="9d3d9d9b-772e-4db7-841d-63d12caa1422" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"d5fa2655-8dd8-4004-9dec-217a41e5b9ed","packageName":"component","className":"Text","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>