From 3710519603e5499f7aef2c4030279a097c9e9177 Mon Sep 17 00:00:00 2001 From: jingling Date: Wed, 31 Jan 2024 13:46:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9hasSchedule=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/jnpf/mapper/HousingEstateMapper.java | 2 +- .../java/jnpf/service/HousingEstateService.java | 2 +- .../service/impl/HousingEstateServiceImpl.java | 2 +- .../jnpf/controller/HousingEstateController.java | 2 +- .../main/java/jnpf/entity/HousingEstateEntity.java | 4 ++-- .../model/housingestate/HousingEstateConstant.java | 6 +++--- .../model/housingestate/HousingEstateForm.java | 14 +++++++------- .../housingestate/HousingEstatePagination.java | 2 +- .../jnpf-web/src/views/housingestate/Detail.vue | 6 +++--- .../jnpf-web/src/views/housingestate/form.vue | 6 +++--- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/HousingEstateMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/HousingEstateMapper.java index f0b148d..d77c0fa 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/HousingEstateMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/HousingEstateMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 作者： JNPF开发平台组 - * 日期： 2024-01-27 + * 日期： 2024-01-31 */ public interface HousingEstateMapper extends BaseMapper { diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/HousingEstateService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/HousingEstateService.java index 2fa7e3e..759d3e7 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/HousingEstateService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/HousingEstateService.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 作者： JNPF开发平台组 - * 日期： 2024-01-27 + * 日期： 2024-01-31 */ public interface HousingEstateService extends IService { List getList(HousingEstatePagination housingEstatePagination); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/HousingEstateServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/HousingEstateServiceImpl.java index 3fcb2e3..7d09a76 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/HousingEstateServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/HousingEstateServiceImpl.java @@ -36,7 +36,7 @@ import jnpf.permission.entity.UserEntity; * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 作者： JNPF开发平台组 - * 日期： 2024-01-27 + * 日期： 2024-01-31 */ @Service public class HousingEstateServiceImpl extends ServiceImpl implements HousingEstateService{ diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/HousingEstateController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/HousingEstateController.java index 9da214a..a1c0482 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/HousingEstateController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/HousingEstateController.java @@ -34,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-01-27 + * @日期： 2024-01-31 */ @Slf4j @RestController diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java index e459196..77b3624 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java @@ -9,7 +9,7 @@ import java.util.Date; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-01-27 + * @日期： 2024-01-31 */ @Data @TableName("nx_housing_estate") @@ -25,7 +25,7 @@ public class HousingEstateEntity { @TableField(value = "LATITUDE" , updateStrategy = FieldStrategy.IGNORED) private Double latitude; @TableField(value = "HAS_SCHEDULE" , updateStrategy = FieldStrategy.IGNORED) - private Boolean hasSchedule; + private Integer hasSchedule; @TableField(value = "RECYCLE_ADDRESS" , updateStrategy = FieldStrategy.IGNORED) private String recycleAddress; @TableField(value = "APPOINTMENT_TIME_START" , updateStrategy = FieldStrategy.IGNORED) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateConstant.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateConstant.java index 2cf1788..436d6a0 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateConstant.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateConstant.java @@ -9,7 +9,7 @@ import java.util.Map; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-01-27 + * @日期： 2024-01-31 */ public class HousingEstateConstant{ /** 数据库链接 */ @@ -21,7 +21,7 @@ public class HousingEstateConstant{ /** 整个表单配置json */ public static final String getFormData(){ StringBuilder sb = new StringBuilder(); -sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":114,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取消\",\"confirmButtonText\":\"确定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":false,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":false,\"size\":\"default\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"colon\":false,\"fields\":[{\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"noShow\":false,\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706158508359,\"tableName\":\"nx_housing_estate\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"helpMessage\":\"\",\"content\":\"基本信息\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"小区名\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158324661,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"__vModel__\":\"name\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"小区详细地址\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158338195,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"__vModel__\":\"address\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"switch\",\"defaultValue\":1,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用禁用\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158362120,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-switch\",\"tag\":\"JnpfSwitch\",\"regList\":[],\"span\":8},\"activeValue\":1,\"inactiveValue\":0,\"__vModel__\":\"enabledMark\",\"inactiveTxt\":\"关\",\"disabled\":false,\"activeTxt\":\"开\"},{\"controls\":false,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"经度\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158392543,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"__vModel__\":\"longitude\",\"style\":{\"width\":\"100%\"},\"step\":1,\"disabled\":false,\"placeholder\":\"请输入\",\"addonBefore\":\"\"},{\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"纬度\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158425173,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"controls\":false,\"__vModel__\":\"latitude\",\"style\":{\"width\":\"100%\"},\"step\":1,\"disabled\":false,\"placeholder\":\"请输入\",\"thousands\":false,\"isAmountChinese\":false,\"addonBefore\":\"\",\"addonAfter\":\"\"},{\"__config__\":{\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"noShow\":false,\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706158519150,\"tableName\":\"nx_housing_estate\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"helpMessage\":\"\",\"content\":\"定时回收配置\"},{\"__config__\":{\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"switch\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"定时定点回收\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158444857,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-switch\",\"tag\":\"JnpfSwitch\",\"regList\":[],\"span\":24},\"activeValue\":1,\"inactiveValue\":0,\"__vModel__\":\"hasSchedule\",\"inactiveTxt\":\"关\",\"disabled\":false,\"activeTxt\":\"开\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":108,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"定点回收地址\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158500378,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"__vModel__\":\"recycleAddress\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158548055,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"定点回收时间起\",\"trigger\":\"change\",\"startTimeRule\":false,\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"format\":\"HH:mm\",\"__vModel__\":\"appointmentTimeStart\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158575352,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"定点回收时间止\",\"trigger\":\"change\",\"startTimeRule\":false,\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"format\":\"HH:mm\",\"__vModel__\":\"appointmentTimeEnd\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":114,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"来源\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158609968,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"系统导入\",\"id\":\"1\"},{\"fullName\":\"用户自定义\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"sourceType\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}}],\"span\":24}"); return sb.toString(); +sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":116,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取消\",\"confirmButtonText\":\"确定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":false,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":false,\"size\":\"default\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"colon\":false,\"fields\":[{\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"noShow\":false,\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706158508359,\"tableName\":\"nx_housing_estate\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"helpMessage\":\"\",\"content\":\"基本信息\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"小区名\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158324661,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"__vModel__\":\"name\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"小区详细地址\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158338195,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"tag\":\"JnpfInput\",\"regList\":[],\"span\":10},\"readonly\":false,\"__vModel__\":\"address\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"switch\",\"defaultValue\":1,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用禁用\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158362120,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-switch\",\"tag\":\"JnpfSwitch\",\"regList\":[],\"span\":8},\"activeValue\":1,\"inactiveValue\":0,\"__vModel__\":\"enabledMark\",\"inactiveTxt\":\"关\",\"disabled\":false,\"activeTxt\":\"开\"},{\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"纬度\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158425173,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"controls\":false,\"__vModel__\":\"latitude\",\"style\":{\"width\":\"100%\"},\"step\":1,\"disabled\":false,\"placeholder\":\"请输入\",\"thousands\":false,\"isAmountChinese\":false,\"addonBefore\":\"\",\"addonAfter\":\"\"},{\"controls\":false,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"经度\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158392543,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"__vModel__\":\"longitude\",\"style\":{\"width\":\"100%\"},\"step\":1,\"disabled\":false,\"placeholder\":\"请输入\",\"addonBefore\":\"\"},{\"__config__\":{\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"noShow\":false,\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706158519150,\"tableName\":\"nx_housing_estate\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"helpMessage\":\"\",\"content\":\"定时回收配置\"},{\"__config__\":{\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"switch\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"定时定点回收\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158444857,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-switch\",\"tag\":\"JnpfSwitch\",\"regList\":[],\"span\":24},\"activeValue\":1,\"inactiveValue\":0,\"__vModel__\":\"hasSchedule\",\"inactiveTxt\":\"关\",\"disabled\":false,\"activeTxt\":\"开\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":116,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"回收地址\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706678713277,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"recycleAddress\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158548055,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"回收时间起\",\"trigger\":\"change\",\"startTimeRule\":false,\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"format\":\"HH:mm\",\"__vModel__\":\"appointmentTimeStart\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158575352,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"回收时间止\",\"trigger\":\"change\",\"startTimeRule\":false,\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"format\":\"HH:mm\",\"__vModel__\":\"appointmentTimeEnd\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":114,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"来源\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158609968,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"系统导入\",\"id\":\"1\"},{\"fullName\":\"用户自定义\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"sourceType\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}}],\"span\":24}"); return sb.toString(); } /** 列表字段配置json */ public static final String getColumnData(){ @@ -36,6 +36,6 @@ sb.append("{\"hasPage\":true,\"useColumnPermission\":false,\"searchList\":[],\"b /** 表列表 */ public static final String getTableList(){ StringBuilder sb = new StringBuilder(); -sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"nx_housing_estate\",\"tableName\":\"小区信息表\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"自然主键\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"name\",\"field\":\"name\",\"fieldName\":\"小区名\",\"dataType\":\"varchar\",\"dataLength\":\"25\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"address\",\"field\":\"address\",\"fieldName\":\"小区详细地址\",\"dataType\":\"varchar\",\"dataLength\":\"25\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"longitude\",\"field\":\"longitude\",\"fieldName\":\"经度\",\"dataType\":\"double\",\"dataLength\":\"10,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"latitude\",\"field\":\"latitude\",\"fieldName\":\"纬度\",\"dataType\":\"double\",\"dataLength\":\"10,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"has_schedule\",\"field\":\"hasSchedule\",\"fieldName\":\"是否是定时定点回收\",\"dataType\":\"tinyint\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"recycle_address\",\"field\":\"recycleAddress\",\"fieldName\":\"定点回收地址\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"appointment_time_start\",\"field\":\"appointmentTimeStart\",\"fieldName\":\"定点回收时间起\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"appointment_time_end\",\"field\":\"appointmentTimeEnd\",\"fieldName\":\"定点回收时间止\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"is_choosed\",\"field\":\"isChoosed\",\"fieldName\":\"是否已被配置(0-否，1-是)\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"source_type\",\"field\":\"sourceType\",\"fieldName\":\"来源id：1系统导入，2用户自定义\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"enabled_mark\",\"field\":\"enabledMark\",\"fieldName\":\"有效标志(0-禁用，1-启用)\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建人\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"remark\",\"field\":\"remark\",\"fieldName\":\"备注\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_flow_id\",\"field\":\"flowId\",\"fieldName\":\"流程id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]}]"); return sb.toString(); +sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"nx_housing_estate\",\"tableName\":\"小区信息表\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"自然主键\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"name\",\"field\":\"name\",\"fieldName\":\"小区名\",\"dataType\":\"varchar\",\"dataLength\":\"25\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"address\",\"field\":\"address\",\"fieldName\":\"小区详细地址\",\"dataType\":\"varchar\",\"dataLength\":\"25\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"longitude\",\"field\":\"longitude\",\"fieldName\":\"经度\",\"dataType\":\"double\",\"dataLength\":\"10,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"latitude\",\"field\":\"latitude\",\"fieldName\":\"纬度\",\"dataType\":\"double\",\"dataLength\":\"10,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"has_schedule\",\"field\":\"hasSchedule\",\"fieldName\":\"是否是定时定点回收\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"recycle_address\",\"field\":\"recycleAddress\",\"fieldName\":\"定点回收地址\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"appointment_time_start\",\"field\":\"appointmentTimeStart\",\"fieldName\":\"定点回收时间起\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"appointment_time_end\",\"field\":\"appointmentTimeEnd\",\"fieldName\":\"定点回收时间止\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"is_choosed\",\"field\":\"isChoosed\",\"fieldName\":\"是否已被配置(0-否，1-是)\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"source_type\",\"field\":\"sourceType\",\"fieldName\":\"来源id：1系统导入，2用户自定义\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"enabled_mark\",\"field\":\"enabledMark\",\"fieldName\":\"有效标志(0-禁用，1-启用)\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建人\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"remark\",\"field\":\"remark\",\"fieldName\":\"备注\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_flow_id\",\"field\":\"flowId\",\"fieldName\":\"流程id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]}]"); return sb.toString(); } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateForm.java index 73c88f0..b5d950e 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateForm.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateForm.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-01-27 + * @日期： 2024-01-31 */ @Data public class HousingEstateForm { @@ -26,22 +26,22 @@ public class HousingEstateForm { /** 启用禁用 **/ @JsonProperty("enabledMark") private Integer enabledMark; - /** 经度 **/ - @JsonProperty("longitude") - private BigDecimal longitude; /** 纬度 **/ @JsonProperty("latitude") private BigDecimal latitude; + /** 经度 **/ + @JsonProperty("longitude") + private BigDecimal longitude; /** 定时定点回收 **/ @JsonProperty("hasSchedule") private Integer hasSchedule; - /** 定点回收地址 **/ + /** 回收地址 **/ @JsonProperty("recycleAddress") private String recycleAddress; - /** 定点回收时间起 **/ + /** 回收时间起 **/ @JsonProperty("appointmentTimeStart") private String appointmentTimeStart; - /** 定点回收时间止 **/ + /** 回收时间止 **/ @JsonProperty("appointmentTimeEnd") private String appointmentTimeEnd; /** 来源 **/ diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstatePagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstatePagination.java index 9ed6e75..da11151 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstatePagination.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstatePagination.java @@ -11,7 +11,7 @@ import java.util.List; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-01-27 + * @日期： 2024-01-31 */ @Data public class HousingEstatePagination extends Pagination { diff --git a/jnpf-java-boot/jnpf-web/src/views/housingestate/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/housingestate/Detail.vue index a4b945d..3ae15c9 100644 --- a/jnpf-java-boot/jnpf-web/src/views/housingestate/Detail.vue +++ b/jnpf-java-boot/jnpf-web/src/views/housingestate/Detail.vue @@ -59,17 +59,17 @@ - +

{{dataForm.recycleAddress}}

 - +

{{dataForm.appointmentTimeStart}}

 - +

{{dataForm.appointmentTimeEnd}}

 diff --git a/jnpf-java-boot/jnpf-web/src/views/housingestate/form.vue b/jnpf-java-boot/jnpf-web/src/views/housingestate/form.vue index 8978fc3..b7d933d 100644 --- a/jnpf-java-boot/jnpf-web/src/views/housingestate/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/housingestate/form.vue @@ -90,7 +90,7 @@ - + @@ -99,7 +99,7 @@ - + - +