Skip to content

A
amos-boot-biz
Commit 0dbaea7a authored by 王鹿鹿's avatar 王鹿鹿
Browse files
Options

任务 8236 8235 8220 8209

parent eeab6994
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 29 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/PeopleBasicInfoDto.java
View file @ 0dbaea7a
...@@ -68,12 +68,18 @@ public class PeopleBasicInfoDto { ...@@ -68,12 +68,18 @@ public class PeopleBasicInfoDto {
@ApiModelProperty(value = "籍贯/户口所在地") @ApiModelProperty(value = "籍贯/户口所在地")
private String nativePlace; private String nativePlace;
@ApiModelProperty(value = "籍贯/户口所在地")
private String nativePlaceCode;
@ApiModelProperty(value = "现居住地") @ApiModelProperty(value = "现居住地")
private String residence; private String residence;
@ApiModelProperty(value = "现居住地详情") @ApiModelProperty(value = "现居住地")
private String residenceDetails; private String residenceDetails;
@ApiModelProperty(value = "现居住地")
private String residenceDetailsCode;
@ApiModelProperty(value = "机场住宿情况") @ApiModelProperty(value = "机场住宿情况")
private String airportAccommodation; private String airportAccommodation;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/StroageTankEnum.java deleted 100644 → 0
View file @ eeab6994
package com.yeejoin.equipmanage.common.enums;
import lombok.Getter;
@Getter
public enum StroageTankEnum {
SSDW("所属单位","belongUnitId");
StroageTankEnum(String name, String code) {
this.name = name;
this.code = code;
}
private String name;
private String code;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java
View file @ 0dbaea7a
...@@ -233,7 +233,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi ...@@ -233,7 +233,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
OrgUsr orgUsr = orgUsrService.peopleSaveOrgUsr(peopleInfoDto.getFirefighters()); OrgUsr orgUsr = orgUsrService.peopleSaveOrgUsr(peopleInfoDto.getFirefighters());
OrgPersonDto orgPersonDto = new OrgPersonDto(); OrgPersonDto orgPersonDto = new OrgPersonDto();
BeanUtils.copyProperties(orgUsr, orgPersonDto); BeanUtils.copyProperties(orgUsr, orgPersonDto);
List<DynamicFormInstance> dynamicFormInstances = orgUsrService.dynamicFormColumn(peopleInfoDto.getFirefighters()); List<DynamicFormInstance> dynamicFormInstances = orgUsrService.dynamicFormColumn(peopleInfoDto.getFirefighters(), false);
orgPersonDto.setDynamicFormValue(dynamicFormInstances); orgPersonDto.setDynamicFormValue(dynamicFormInstances);
try { try {
orgUsrService.updateByIdOrgPerson(orgPersonDto, id); orgUsrService.updateByIdOrgPerson(orgPersonDto, id);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ 0dbaea7a
...@@ -2888,11 +2888,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -2888,11 +2888,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
} }
private OrgUsrDto saveDynamicformInstance(OrgUsr orgUsr, PeopleBasicInfoDto peopleBasicInfoDto) { private OrgUsrDto saveDynamicformInstance(OrgUsr orgUsr, PeopleBasicInfoDto peopleBasicInfoDto) {
List<DynamicFormInstance> dynamicFormInstancelist = dynamicFormColumn(peopleBasicInfoDto); List<DynamicFormInstance> dynamicFormInstancelist = dynamicFormColumn(peopleBasicInfoDto, true);
return saveOrgUsrDynamicFormInstance(orgUsr, dynamicFormInstancelist); return saveOrgUsrDynamicFormInstance(orgUsr, dynamicFormInstancelist);
} }
public List<DynamicFormInstance> dynamicFormColumn(PeopleBasicInfoDto peopleBasicInfoDto){ public List<DynamicFormInstance> dynamicFormColumn(PeopleBasicInfoDto peopleBasicInfoDto, boolean flag){
// 动态字段填充 // 动态字段填充
List<DynamicFormInitDto> dynamicFormColumn = dynamicFormColumnServiceImpl.getFormlist("246"); List<DynamicFormInitDto> dynamicFormColumn = dynamicFormColumnServiceImpl.getFormlist("246");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
...@@ -2928,7 +2928,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -2928,7 +2928,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
dynamicFormInstanceDto.setFieldValue(value.toString()); dynamicFormInstanceDto.setFieldValue(value.toString());
dynamicFormInstanceDto.setFieldValueLabel(o.toString()); dynamicFormInstanceDto.setFieldValueLabel(o.toString());
} else { } else {
dynamicFormInstanceDto.setFieldValue(value.toString()); if(flag) {
dynamicFormInstanceDto.setFieldValue(value.toString());
}
} }
if ("birthdayTime".equals(key)) { if ("birthdayTime".equals(key)) {
SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java
View file @ 0dbaea7a
...@@ -1186,7 +1186,7 @@ public class TopographyController extends AbstractBaseController { ...@@ -1186,7 +1186,7 @@ public class TopographyController extends AbstractBaseController {
Date dDate = DateUtils.getCurrentMonthEndTime(DateUtils.dateParse(DateUtils.dateToStringY(beginDate) + "-" + i,DateUtils.MONTH_PATTERN)); Date dDate = DateUtils.getCurrentMonthEndTime(DateUtils.dateParse(DateUtils.dateToStringY(beginDate) + "-" + i,DateUtils.MONTH_PATTERN));
for (String dat : dates) { for (String dat : dates) {
if (DateUtils.belongCalendar(dateParse(dat), bDate, dDate)) { if (DateUtils.belongCalendar(dateParse(dat), bDate, dDate)) {
if (null != timeAndValue.get(dat)) { if ("True".equals(timeAndValue.get(dat))) {
num++; num++;
} }
} }
...@@ -1232,7 +1232,7 @@ public class TopographyController extends AbstractBaseController { ...@@ -1232,7 +1232,7 @@ public class TopographyController extends AbstractBaseController {
for (String dat : dates) { for (String dat : dates) {
if (DateUtils.belongCalendar(dateParse(dat), bDate, dDate)) { if (DateUtils.belongCalendar(dateParse(dat), bDate, dDate)) {
if (null != timeAndValue.get(dat)) { if ("True".equals(timeAndValue.get(dat))) {
num++; num++;
} }
} }
...@@ -1282,13 +1282,13 @@ public class TopographyController extends AbstractBaseController { ...@@ -1282,13 +1282,13 @@ public class TopographyController extends AbstractBaseController {
if (i == datesFinal.size() - 1) { if (i == datesFinal.size() - 1) {
if (DateUtils.belongCalendar(dateParse(dat), datesFinal.get(i), if (DateUtils.belongCalendar(dateParse(dat), datesFinal.get(i),
DateUtils.getCurrentDayEndTime(datesFinal.get(i)))) { DateUtils.getCurrentDayEndTime(datesFinal.get(i)))) {
if (null != timeAndValue.get(dat)) { if ("True".equals(timeAndValue.get(dat))) {
num++; num++;
} }
} }
} else { } else {
if (DateUtils.belongCalendar(dateParse(dat), datesFinal.get(i), datesFinal.get(i + 1))) { if (DateUtils.belongCalendar(dateParse(dat), datesFinal.get(i), datesFinal.get(i + 1))) {
if (null != timeAndValue.get(dat)) { if ("True".equals(timeAndValue.get(dat))) {
num++; num++;
} }
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
View file @ 0dbaea7a
...@@ -1242,12 +1242,19 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i ...@@ -1242,12 +1242,19 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
@Override @Override
public Map<String, String> getStorageTankCodeByBelongUnitId(String belongUnitId, String groupCode) { public Map<String, String> getStorageTankCodeByBelongUnitId(String belongUnitId, String groupCode) {
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("field_name", StroageTankEnum.SSDW.getCode()); map.put("code", belongUnitId);
map.put("field_value", belongUnitId);
List<Map<String, Object>> list = iFormInstanceService.queryForMapList(groupCode, map); List<Map<String, Object>> list = iFormInstanceService.queryForMapList(groupCode, map);
if (list.size() > 0) { if (list.size() > 0) {
map.clear(); map.clear();
map.put("storageTankCode", stroageTankCode(belongUnitId, list.size() + 1)); int count = iFormInstanceService.count((new QueryWrapper<FormInstance>().eq("field_value", stroageTankCode(belongUnitId, list.size() + 1)).eq("field_name", "code")));
if(count > 0) {
String code = list.get(0).get("code").toString();
String subEnd = code.substring(code.length() - 6, code.length() -1);
String subStart = code.substring(0, code.length() -6);
map.put("storageTankCode", subStart + (Integer.parseInt(subEnd) + 1 ));
} else {
map.put("storageTankCode", stroageTankCode(belongUnitId, list.size() + 1));
}
} else { } else {
map.clear(); map.clear();
map.put("storageTankCode", belongUnitId + "0001"); map.put("storageTankCode", belongUnitId + "0001");
......
amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
View file @ 0dbaea7a
...@@ -155,4 +155,10 @@ ...@@ -155,4 +155,10 @@
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '消防水池' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '消防水池' ROW_FORMAT = Dynamic;
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="litw" id="2022-0804equ-ltw">
<comment>更新表wl_form_group_column属性字段值</comment>
<sql>
UPDATE `wl_form_group_column` SET `field_name` = 'code', `field_label` = '储罐编号', `data_type` = 'String', `group_id` = 132828674824, `query_strategy` = 'like', `not_null` = b'0', `group_code` = 'r_tank', `creator_id` = 2581805, `create_date` = '2022-08-04 03:04:01' WHERE `id` = 133000000335;
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ 0dbaea7a
...@@ -3315,6 +3315,18 @@ ...@@ -3315,6 +3315,18 @@
ADD biz_org_name varchar(104) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构/部门名称'; ADD biz_org_name varchar(104) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构/部门名称';
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="litw" id="2022-0804jcs-ltw">
<comment>更新表cb_dynamic_form_column属性字段值</comment>
<sql>
UPDATE `cb_dynamic_form_column` SET `field_code` = 'nativePlaceCode', `field_name` = '户籍所在地', `field_type` = 'antdTreeSelect', `group_id` = 9, `query_strategy` = 'eq', `not_null` = b'0', `block` = b'0', `group_code` = '246', `column_config` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = '2022-08-04 02:02:36', `is_delete` = b'0', `remark` = NULL, `sort` = 20, `org_code` = NULL WHERE `sequence_nbr` = 132828674812103;
</sql>
</changeSet>
<changeSet author="litw" id="2022-0804jcs-ltw1">
<comment>更新表cb_dynamic_form_column属性字段值</comment>
<sql>
UPDATE `cb_dynamic_form_column` SET `field_code` = 'residenceDetailsCode', `field_name` = '现居住地', `field_type` = 'antdTreeSelect', `group_id` = 9, `query_strategy` = 'eq', `not_null` = b'0', `block` = b'0', `group_code` = '246', `column_config` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = '2022-08-04 02:02:39', `is_delete` = b'0', `remark` = NULL, `sort` = 23, `org_code` = NULL WHERE `sequence_nbr` = 132828674812106;
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment