diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizMeetingInfo.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizMeetingInfo.java index ffe828e9..7dc2f11a 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizMeetingInfo.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizMeetingInfo.java @@ -44,7 +44,7 @@ import java.io.Serial; @Column(name = "ustatus", attrName = "ustatus", label = "会议状态"), @Column(name = "remark", attrName = "remark", label = "补充说明", isQuery = false), @Column(name = "create_user", attrName = "createUser", label = "创建人员", isUpdate = false), - @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true), + @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false), @Column(name = "f_tenant_id", attrName = "ftenantId", label = "租户id", isUpdate = false, isQuery = false), @Column(name = "f_flow_id", attrName = "fflowId", label = "流程id", isUpdate = false, isQuery = false), @Column(name = "f_flow_task_id", attrName = "fflowTaskId", label = "流程任务主键", isUpdate = false, isQuery = false), @@ -83,11 +83,11 @@ public class BizMeetingInfo extends DataEntity implements Serial @ExcelField(title = "会议内容", attrName = "meetingContent", align = Align.CENTER, sort = 50), @ExcelField(title = "参会人员", attrName = "meetingUser", align = Align.CENTER, sort = 60), @ExcelField(title = "其他人员", attrName = "otherUser", align = Align.CENTER, sort = 70), - @ExcelField(title = "会议类型", attrName = "meetingType", align = Align.CENTER, sort = 80), + @ExcelField(title = "会议类型", attrName = "meetingType", dictType = "meeting_type", align = Align.CENTER, sort = 80), @ExcelField(title = "开始时间", attrName = "startTime", align = Align.CENTER, sort = 90, dataFormat = "yyyy-MM-dd hh:mm"), @ExcelField(title = "结束时间", attrName = "endTime", align = Align.CENTER, sort = 100, dataFormat = "yyyy-MM-dd hh:mm"), @ExcelField(title = "会议地点", attrName = "meetingLocation", align = Align.CENTER, sort = 110), - @ExcelField(title = "会议状态", attrName = "ustatus", align = Align.CENTER, sort = 120), + @ExcelField(title = "会议状态", attrName = "ustatus", dictType = "meeting_status", align = Align.CENTER, sort = 120), @ExcelField(title = "补充说明", attrName = "remark", align = Align.CENTER, sort = 130), @ExcelField(title = "创建人员", attrName = "createUser", align = Align.CENTER, sort = 140), @ExcelField(title = "更新时间", attrName = "updateTime", align = Align.CENTER, sort = 150, dataFormat = "yyyy-MM-dd hh:mm"), diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizCalendarScheduleController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizCalendarScheduleController.java index 4678b190..af556cd8 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizCalendarScheduleController.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizCalendarScheduleController.java @@ -106,7 +106,6 @@ public class BizCalendarScheduleController extends BaseController { } bizCalendarSchedule.setCreatorUser(user.getLoginCode()); bizCalendarSchedule.setParticipantName(fUser.getUserName()); - bizCalendarSchedule.setUpdateTime(vDate.getUpdateTime(bizCalendarSchedule.getIsNewRecord())); bizCalendarScheduleService.save(bizCalendarSchedule); return renderResult(Global.TRUE, text("保存日程信息成功！")); } diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizDbConfigController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizDbConfigController.java index 4c1898ac..d0c08ffe 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizDbConfigController.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizDbConfigController.java @@ -88,7 +88,6 @@ public class BizDbConfigController extends BaseController { @PostMapping(value = "save") @ResponseBody public String save(@Validated BizDbConfig bizDbConfig) { - bizDbConfig.setUpdateTime(vDate.getUpdateTime(bizDbConfig.getIsNewRecord())); bizDbConfigService.save(bizDbConfig); return renderResult(Global.TRUE, text("保存连接信息成功！")); } diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizMonitorAccountController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizMonitorAccountController.java index 46705dcc..efc5eed4 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizMonitorAccountController.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizMonitorAccountController.java @@ -93,7 +93,6 @@ public class BizMonitorAccountController extends BaseController { if (bizMonitorAccount.getIsNewRecord()) { bizMonitorAccount.setSshPassword(vo.getEncode(bizMonitorAccount.getSshPassword())); } else { - bizMonitorAccount.setUpdateTime(new Date()); BizMonitorAccount account = bizMonitorAccountService.get(bizMonitorAccount.getAccountId()); if (!account.getSshPassword().equals(bizMonitorAccount.getSshPassword())) { bizMonitorAccount.setSshPassword(vo.getEncode(bizMonitorAccount.getSshPassword())); diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizMonitorHostController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizMonitorHostController.java index 80819e34..2a6f028d 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizMonitorHostController.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizMonitorHostController.java @@ -89,7 +89,6 @@ public class BizMonitorHostController extends BaseController { @PostMapping(value = "save") @ResponseBody public String save(@Validated BizMonitorHost bizMonitorHost) { - bizMonitorHost.setUpdateTime(vDate.getUpdateTime(bizMonitorHost.getIsNewRecord())); bizMonitorHostService.save(bizMonitorHost); return renderResult(Global.TRUE, text("保存主机信息成功！")); } diff --git a/web-vue/packages/biz/views/biz/calendarSchedule/form.vue b/web-vue/packages/biz/views/biz/calendarSchedule/form.vue index eb4e1628..30b7990c 100644 --- a/web-vue/packages/biz/views/biz/calendarSchedule/form.vue +++ b/web-vue/packages/biz/views/biz/calendarSchedule/form.vue @@ -28,6 +28,7 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; import { BizCalendarSchedule, bizCalendarScheduleSave, bizCalendarScheduleForm } from '@jeesite/biz/api/biz/calendarSchedule'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -174,7 +175,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord, diff --git a/web-vue/packages/biz/views/biz/dbConfig/form.vue b/web-vue/packages/biz/views/biz/dbConfig/form.vue index 51558917..98995020 100644 --- a/web-vue/packages/biz/views/biz/dbConfig/form.vue +++ b/web-vue/packages/biz/views/biz/dbConfig/form.vue @@ -28,6 +28,7 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; import { BizDbConfig, bizDbConfigSave, bizDbConfigForm } from '@jeesite/biz/api/biz/dbConfig'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -141,7 +142,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord, diff --git a/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/form.vue b/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/form.vue index 22c7ec45..f4d5dc7f 100644 --- a/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/form.vue +++ b/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/form.vue @@ -28,6 +28,7 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; import { BizMonitorAccount, bizMonitorAccountSave, bizMonitorAccountForm } from '@jeesite/biz/api/biz/monitorAccount'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -134,7 +135,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord, diff --git a/web-vue/packages/biz/views/biz/hostInfo/monitorHost/form.vue b/web-vue/packages/biz/views/biz/hostInfo/monitorHost/form.vue index d86602d7..7ffb3478 100644 --- a/web-vue/packages/biz/views/biz/hostInfo/monitorHost/form.vue +++ b/web-vue/packages/biz/views/biz/hostInfo/monitorHost/form.vue @@ -28,6 +28,7 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; import { BizMonitorHost, bizMonitorHostSave, bizMonitorHostForm } from '@jeesite/biz/api/biz/monitorHost'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -164,7 +165,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord, diff --git a/web-vue/packages/biz/views/biz/listItem/form.vue b/web-vue/packages/biz/views/biz/listItem/form.vue index 1d1c6008..aa4cbd4c 100644 --- a/web-vue/packages/biz/views/biz/listItem/form.vue +++ b/web-vue/packages/biz/views/biz/listItem/form.vue @@ -28,6 +28,7 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; import { BizListItem, bizListItemSave, bizListItemForm } from '@jeesite/biz/api/biz/listItem'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -139,7 +140,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord, diff --git a/web-vue/packages/biz/views/biz/meetingInfo/form.vue b/web-vue/packages/biz/views/biz/meetingInfo/form.vue index 5b17b05a..5e443bf9 100644 --- a/web-vue/packages/biz/views/biz/meetingInfo/form.vue +++ b/web-vue/packages/biz/views/biz/meetingInfo/form.vue @@ -37,6 +37,7 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; import { BizMeetingInfo, bizMeetingInfoSave, bizMeetingInfoForm } from '@jeesite/biz/api/biz/meetingInfo'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -196,7 +197,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord, diff --git a/web-vue/packages/biz/views/biz/municipalities/form.vue b/web-vue/packages/biz/views/biz/municipalities/form.vue index adf94742..ee7cf444 100644 --- a/web-vue/packages/biz/views/biz/municipalities/form.vue +++ b/web-vue/packages/biz/views/biz/municipalities/form.vue @@ -30,6 +30,7 @@ import { bizCitiesListAll } from '@jeesite/biz/api/biz/cities'; import { bizProvinceListAll } from '@jeesite/biz/api/biz/province'; import { BizMunicipalities, bizMunicipalitiesSave, bizMunicipalitiesForm } from '@jeesite/biz/api/biz/municipalities'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -159,7 +160,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord, diff --git a/web-vue/packages/biz/views/biz/projectRequirements/form.vue b/web-vue/packages/biz/views/biz/projectRequirements/form.vue index 8148156a..b5d2b57b 100644 --- a/web-vue/packages/biz/views/biz/projectRequirements/form.vue +++ b/web-vue/packages/biz/views/biz/projectRequirements/form.vue @@ -28,6 +28,7 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; import { BizProjectRequirements, bizProjectRequirementsSave, bizProjectRequirementsForm } from '@jeesite/biz/api/biz/projectRequirements'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -163,7 +164,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord, diff --git a/web-vue/packages/biz/views/biz/settingInfo/account/form.vue b/web-vue/packages/biz/views/biz/settingInfo/account/form.vue index 0138f096..906ad3bc 100644 --- a/web-vue/packages/biz/views/biz/settingInfo/account/form.vue +++ b/web-vue/packages/biz/views/biz/settingInfo/account/form.vue @@ -28,6 +28,7 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; import { BizMailAccount, bizMailAccountSave, bizMailAccountForm } from '@jeesite/biz/api/biz/mailAccount'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -163,7 +164,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord, diff --git a/web-vue/packages/biz/views/biz/settingInfo/quickLogin/form.vue b/web-vue/packages/biz/views/biz/settingInfo/quickLogin/form.vue index 6fa1dd0e..23c50051 100644 --- a/web-vue/packages/biz/views/biz/settingInfo/quickLogin/form.vue +++ b/web-vue/packages/biz/views/biz/settingInfo/quickLogin/form.vue @@ -28,6 +28,7 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; import { BizQuickLogin, bizQuickLoginSave, bizQuickLoginForm } from '@jeesite/biz/api/biz/quickLogin'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -146,7 +147,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord, diff --git a/web-vue/packages/erp/views/erp/account/form.vue b/web-vue/packages/erp/views/erp/account/form.vue index 5d0ec50f..a205ba6c 100644 --- a/web-vue/packages/erp/views/erp/account/form.vue +++ b/web-vue/packages/erp/views/erp/account/form.vue @@ -28,6 +28,7 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; import { ErpAccount, erpAccountSave, erpAccountForm } from '@jeesite/erp/api/erp/account'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -120,7 +121,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord, diff --git a/web-vue/packages/erp/views/erp/category/form.vue b/web-vue/packages/erp/views/erp/category/form.vue index 5c7aa2ed..bfa51e34 100644 --- a/web-vue/packages/erp/views/erp/category/form.vue +++ b/web-vue/packages/erp/views/erp/category/form.vue @@ -28,6 +28,7 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; import { ErpCategory, erpCategorySave, erpCategoryForm } from '@jeesite/erp/api/erp/category'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -119,7 +120,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord, diff --git a/web-vue/packages/erp/views/erp/transactionFlow/form.vue b/web-vue/packages/erp/views/erp/transactionFlow/form.vue index 663842f5..8d25028d 100644 --- a/web-vue/packages/erp/views/erp/transactionFlow/form.vue +++ b/web-vue/packages/erp/views/erp/transactionFlow/form.vue @@ -29,6 +29,7 @@ import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category'; import { ErpTransactionFlow, erpTransactionFlowSave, erpTransactionFlowForm } from '@jeesite/erp/api/erp/transactionFlow'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -130,7 +131,11 @@ async function handleSubmit() { try { - const data = await validate(); + const orgData = await validate(); + const data = { + ... orgData, + updateTime: formatToDateTime(new Date()) , + } setModalProps({ confirmLoading: true }); const params: any = { isNewRecord: record.value.isNewRecord,