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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Zaripov Emil 2024-10-31 12:38:59 +03:00
commit 18b9c33ba0
7 changed files with 118 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<groupId>ru.micord.ervu.lkrp</groupId>
<artifactId>fl</artifactId>
<version>1.9.0-SNAPSHOT</version>
<version>1.9.0</version>
</parent>
<groupId>ru.micord.ervu.lkrp.fl</groupId>
<artifactId>backend</artifactId>

13
backend/src/main/java/ru/micord/ervu/dto/SubpoenaResponseDto.java
View file

@ -3,6 +3,7 @@ package ru.micord.ervu.dto;
import java.util.ArrayList;
import java.util.List;
import static org.springframework.util.StringUtils.hasText;
import static ru.micord.ervu.util.DateUtil.convertToLocalDate;
import static ru.micord.ervu.util.DateUtil.convertToString;
@ -55,7 +56,15 @@ public record SubpoenaResponseDto(String personName, String birthDate, String do
}
public Builder personName(String firstName, String middleName, String lastName) {
this.personName = lastName + " " + firstName + " " + middleName;
StringBuilder stringBuilder = new StringBuilder(lastName)
.append(" ")
.append(firstName);
if (hasText(middleName)) {
stringBuilder.append(" ")
.append(middleName);
}
this.personName = stringBuilder.toString();
return this;
}
@ -70,7 +79,7 @@ public record SubpoenaResponseDto(String personName, String birthDate, String do
}
public Builder docNumber(String series, String number) {
this.docNumber = series + " " + number;
this.docNumber = hasText(series) ? series + " " + number : number;
return this;
}

2
distribution/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<groupId>ru.micord.ervu.lkrp</groupId>
<artifactId>fl</artifactId>
<version>1.9.0-SNAPSHOT</version>
<version>1.9.0</version>
</parent>
<groupId>ru.micord.ervu.lkrp.fl</groupId>

2
frontend/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<groupId>ru.micord.ervu.lkrp</groupId>
<artifactId>fl</artifactId>
<version>1.9.0-SNAPSHOT</version>
<version>1.9.0</version>
</parent>
<groupId>ru.micord.ervu.lkrp.fl</groupId>

2
pom.xml
View file

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ru.micord.ervu.lkrp</groupId>
<artifactId>fl</artifactId>
<version>1.9.0-SNAPSHOT</version>
<version>1.9.0</version>
<packaging>pom</packaging>
<modules>
<module>backend</module>

2
resources/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<groupId>ru.micord.ervu.lkrp</groupId>
<artifactId>fl</artifactId>
<version>1.9.0-SNAPSHOT</version>
<version>1.9.0</version>
</parent>
<groupId>ru.micord.ervu.lkrp.fl</groupId>

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

@ -385,6 +385,51 @@
<value>
<simple>"recruitmentStatusCode"</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="67e56ae6-215f-4fc5-a32d-b03eba1c2b15">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>67e56ae6-215f-4fc5-a32d-b03eba1c2b15</componentRootId>
<name>первая мера</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>collectible</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
<scripts id="b8cae061-9de3-4256-9dcf-c73c0d106b24">
<classRef type="JAVA">
<className>SubpoenaFieldLoadComponent</className>
<packageName>ru.micord.ervu.component.field</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
<properties>
<entry>
<key>fieldId</key>
<value>
<simple>"firstRestrictionName"</simple>
</value>
</entry>
</properties>
</scripts>
@ -1917,7 +1962,6 @@
<componentRootId>26f019a0-e782-4632-a5f7-e69e7232542f</componentRootId>
<name>HB заголовок - 1.1.2.1 </name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3489,12 +3533,64 @@
</complex>
</value>
</item>
<item id="4a893f2e-5fd2-43c6-afa4-aabd87017dd3" 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":"67e56ae6-215f-4fc5-a32d-b03eba1c2b15","packageName":"component","className":"Text","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>
</item>
<item id="046371ea-5280-4d00-8303-513e4cd062d3" removed="true"/>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>null</simple>
<simple>"AND"</simple>
</value>
</entry>
</complex>
@ -3814,7 +3910,7 @@
<entry>
<key>logicalOperation</key>
<value>
<simple>null</simple>
<simple>"AND"</simple>
</value>
</entry>
</complex>
@ -6866,6 +6962,7 @@
<componentRootId>f88a6360-1760-436e-9459-6af705752f54</componentRootId>
<name>Диалоговые окна (информационные)</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -7581,7 +7678,6 @@
<componentRootId>e40b27e3-8df0-4e8c-adeb-6e24de6f18d2</componentRootId>
<name>Временные меры</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
@ -8335,6 +8431,7 @@
<componentRootId>5777f90d-5b51-4c1b-b0cc-4ace05faa8f3</componentRootId>
<name>Диалог - Отрицательное количество дней до явки в военкомат</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
@ -8648,6 +8745,7 @@
<componentRootId>2452bb18-95f0-4bfc-a40d-52b59e3c5cd6</componentRootId>
<name>AC - на вызов диалоговых окон</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>