Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/upgrade' into upgrade

Browse Source
This commit is contained in:
Renpc-kilig 2023-11-13 17:51:01 +08:00
commit d5df028eca
8 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/cm/population/controller/api/populationinfo/PopulationInfoController.java
View File

@ -111,7 +111,7 @@ public class PopulationInfoController extends AbstractController {
final int[] starNumber = {1}; final int[] starNumber = {1};
final int[] notData = {0}; final int[] notData = {0};
final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
final List<DataDictionaryDTO> idcardTypeList = iDataDictionaryService.listDictionaryByParentId("360d6062-754d-4d43-95ba-cb9938102050");//证件类型下拉选择 final List<DataDictionaryDTO> idcardTypeList = iDataDictionaryService.listDictionaryByParentId("76c5044f-805a-4313-b1e8-79e966b97c0d");//证件类型下拉选择
final List<DataDictionaryDTO> sexList = iDataDictionaryService.listDictionaryByParentId("4ef46940-76ab-4758-b5f0-0cbc93ffc660");//性别下拉选择 final List<DataDictionaryDTO> sexList = iDataDictionaryService.listDictionaryByParentId("4ef46940-76ab-4758-b5f0-0cbc93ffc660");//性别下拉选择
final List<DataDictionaryDTO> nationList = iDataDictionaryService.listDictionaryByParentId("a981579c-572b-4fd1-8e76-5d17df97f6a4");//民族下拉选择 final List<DataDictionaryDTO> nationList = iDataDictionaryService.listDictionaryByParentId("a981579c-572b-4fd1-8e76-5d17df97f6a4");//民族下拉选择
final List<DataDictionaryDTO> educationList = iDataDictionaryService.listDictionaryByParentId("d6b9f026-6ea9-456a-b48b-0c18d502523b");//文化程度下拉选择择 final List<DataDictionaryDTO> educationList = iDataDictionaryService.listDictionaryByParentId("d6b9f026-6ea9-456a-b48b-0c18d502523b");//文化程度下拉选择择

3
src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java
View File

@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.Period; import java.time.Period;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@ApiModel @ApiModel
@ -70,7 +71,7 @@ public class PopulationInfoBaseDTO {
private String creator; private String creator;
public List<PopulationInfoLabelDTO> getLabelList() { public List<PopulationInfoLabelDTO> getLabelList() {
return labelList; return labelList == null ? new ArrayList<>() : labelList;
} }
public void setLabelList(List<PopulationInfoLabelDTO> labelList) { public void setLabelList(List<PopulationInfoLabelDTO> labelList) {

2
src/main/resources/templates/dispute/save.html
View File

@ -1019,7 +1019,7 @@
// 初始化证件类型下拉选择 // 初始化证件类型下拉选择
function initPartyIdcardTypeSelect(selectValue) { function initPartyIdcardTypeSelect(selectValue) {
top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) { top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('partyIdcardTypeSelectTemplate').innerHTML).render(data, function(html) { laytpl(document.getElementById('partyIdcardTypeSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('partyIdcardTypeSelectTemplateBox').innerHTML = html; document.getElementById('partyIdcardTypeSelectTemplateBox').innerHTML = html;
}); });

2
src/main/resources/templates/dispute/update.html
View File

@ -986,7 +986,7 @@
// 初始化证件类型下拉选择 // 初始化证件类型下拉选择
function initPartyIdcardTypeSelect(selectValue) { function initPartyIdcardTypeSelect(selectValue) {
top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) { top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('partyIdcardTypeSelectTemplate').innerHTML).render(data, function(html) { laytpl(document.getElementById('partyIdcardTypeSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('partyIdcardTypeSelectTemplateBox').innerHTML = html; document.getElementById('partyIdcardTypeSelectTemplateBox').innerHTML = html;
}); });

2
src/main/resources/templates/house/list-popu.html
View File

@ -82,7 +82,7 @@
// 初始化证件类型下拉选择 // 初始化证件类型下拉选择
function initIdcardTypeSelect() { function initIdcardTypeSelect() {
top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) { top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) { laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html; document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html;
}); });

2
src/main/resources/templates/populationinfo/list-creator.html
View File

@ -112,7 +112,7 @@
// 初始化证件类型下拉选择 // 初始化证件类型下拉选择
function initIdcardTypeSelect() { function initIdcardTypeSelect() {
top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) { top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) { laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html; document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html;
}); });

2
src/main/resources/templates/populationinfo/list.html
View File

@ -112,7 +112,7 @@
// 初始化证件类型下拉选择 // 初始化证件类型下拉选择
function initIdcardTypeSelect() { function initIdcardTypeSelect() {
top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) { top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) { laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html; document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html;
}); });

2
src/main/resources/templates/populationinfo/query.html
View File

@ -82,7 +82,7 @@
// 初始化证件类型下拉选择 // 初始化证件类型下拉选择
function initIdcardTypeSelect() { function initIdcardTypeSelect() {
top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) { top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) { laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html; document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html;
}); });