From be9235e4b328af93bf2530ad93f530b2fe6b811d Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 27 Dec 2024 15:58:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20=E5=9F=BA=E7=A1=80=E8=B5=84?= =?UTF-8?q?=E6=96=99=20=E4=BF=AE=E5=A4=8D=E5=85=AC=E5=8F=B8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=90=8E=E4=BC=9A=E9=80=9A=E8=BF=87=E9=80=97=E5=8F=B7?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=87=BA=E8=A1=8C=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E4=BF=A1=E6=81=AF=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E6=97=B6=E9=97=B4=E4=B8=8D=E5=AF=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B=20=E9=80=9A=E7=94=A8=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=B8=B8=E9=87=8F=E7=B1=BB=E6=96=B0=E5=A2=9E=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5=E4=B8=BA8=20=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E5=92=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=96=B9=E6=B3=95=E5=BC=95=E5=85=A5=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=20=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/domain/SysCompanyInformation.java | 27 +++++++++++++ .../SysCompanyInformationServiceImpl.java | 38 ++++++++++++++++++- .../system/SysCompanyInformationMapper.xml | 6 +-- .../companyInformation.html | 15 ++++++-- .../constant/BusinessKeysConstants.java | 3 ++ 5 files changed, 81 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCompanyInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCompanyInformation.java index d2a21d8d..800b1afb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCompanyInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCompanyInformation.java @@ -1,5 +1,6 @@ package com.ruoyi.system.domain; +import com.ruoyi.common.annotation.FieldCompare; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -19,106 +20,132 @@ public class SysCompanyInformation extends BaseEntity private Long companyId; /** 企业名称 */ + @FieldCompare(chineseName = "企业名称") @Excel(name = "企业名称") private String enterpriseName; /** 英文名称 */ + @FieldCompare(chineseName = "英文名称") @Excel(name = "英文名称") private String englishName; /** 公司地址 */ + @FieldCompare(chineseName = "公司地址") @Excel(name = "公司地址") private String companyAddress; /** 公司邮编 */ + @FieldCompare(chineseName = "公司邮编") @Excel(name = "公司邮编") private String companyPostalCode; /** 国家 */ + @FieldCompare(chineseName = "国家") @Excel(name = "国家") private String country; /** 法人代表 */ + @FieldCompare(chineseName = "法人代表") @Excel(name = "法人代表") private String legalRepresentative; /** 联系人 */ + @FieldCompare(chineseName = "联系人") @Excel(name = "联系人") private String contacts; /** 联系电话 */ + @FieldCompare(chineseName = "联系电话") @Excel(name = "联系电话") private String contactNumber; /** 传真 */ + @FieldCompare(chineseName = "传真") @Excel(name = "传真") private String companyFax; /** 企业海关代码 */ + @FieldCompare(chineseName = "企业海关代码") @Excel(name = "企业海关代码") private String enterpriseCustomsCode; /** 企业组织代码 */ + @FieldCompare(chineseName = "企业组织代码") @Excel(name = "企业组织代码") private String enterpriseOrganizationCode; /** 行业代码 */ + @FieldCompare(chineseName = "行业代码") @Excel(name = "行业代码") private String industryCode; /** 企业性质 */ + @FieldCompare(chineseName = "企业性质") @Excel(name = "企业性质") private String enterpriseNature; /** 成立日期 */ + @FieldCompare(chineseName = "成立日期") @Excel(name = "成立日期") private String establishedTime; /** 结汇银行 */ + @FieldCompare(chineseName = "结汇银行") @Excel(name = "结汇银行") private String settlementBank; /** 结汇账号 */ + @FieldCompare(chineseName = "结汇账号") @Excel(name = "结汇账号") private String exchangeSettlementAccount; /** 开户银行 */ + @FieldCompare(chineseName = "开户银行") @Excel(name = "开户银行") private String depositBank; /** 开户银行账号 */ + @FieldCompare(chineseName = "开户银行账号") @Excel(name = "开户银行账号") private String bankAccount; /** 邮箱 */ + @FieldCompare(chineseName = "邮箱") @Excel(name = "邮箱") private String companyEmail; /** 网站 */ + @FieldCompare(chineseName = "网站") @Excel(name = "网站") private String website; /** 进口报关员 */ + @FieldCompare(chineseName = "进口报关员") @Excel(name = "进口报关员") private String importDeclarant; /** 出口报关员 */ + @FieldCompare(chineseName = "出口报关员") @Excel(name = "出口报关员") private String exportDeclarant; /** 主管外汇局 */ + @FieldCompare(chineseName = "主管外汇局") @Excel(name = "主管外汇局") private String exchangeOffice; /** RMB注册资金 */ + @FieldCompare(chineseName = "RMB注册资金") @Excel(name = "RMB注册资金") private String rmbRegisteredCapital; /** 外币注册 */ + @FieldCompare(chineseName = "外币注册") @Excel(name = "外币注册") private String foreignCurrencyRegistration; /** 外币注册资金 */ + @FieldCompare(chineseName = "外币注册资金") @Excel(name = "外币注册资金") private String registeredCapital; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCompanyInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCompanyInformationServiceImpl.java index b38e935a..faff91ba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCompanyInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCompanyInformationServiceImpl.java @@ -1,15 +1,24 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.constant.BusinessKeysConstants; +import com.ruoyi.common.core.domain.entity.SysFieldDifferent; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.exception.BusinessException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.FieldCompareUtil; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.stock.domain.StockInfo; import com.ruoyi.system.domain.SysCompanyInformation; +import com.ruoyi.system.domain.SysDiffLog; import com.ruoyi.system.mapper.SysCompanyInformationMapper; import com.ruoyi.system.service.ISysCompanyInformationService; +import com.ruoyi.system.service.ISysDiffLogService; +import lombok.SneakyThrows; import org.mybatis.logging.Logger; import org.mybatis.logging.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.List; import java.util.function.Supplier; @@ -28,6 +37,9 @@ public class SysCompanyInformationServiceImpl implements ISysCompanyInformationS @Autowired private SysCompanyInformationMapper sysCompanyInformationMapper; + @Autowired + private ISysDiffLogService diffLogService; + /** * 查询公司信息 * @@ -61,7 +73,19 @@ public class SysCompanyInformationServiceImpl implements ISysCompanyInformationS @Override public int insertSysCompanyInformation(SysCompanyInformation sysCompanyInformation) { - return sysCompanyInformationMapper.insertSysCompanyInformation(sysCompanyInformation); + + sysCompanyInformation.setFirstAddTime(DateUtils.getDate()); + int result = sysCompanyInformationMapper.insertSysCompanyInformation(sysCompanyInformation); + + SysDiffLog sysDiffLog = new SysDiffLog(); + Long companyId = sysCompanyInformation.getCompanyId(); + sysDiffLog.setBusinessId(companyId); + sysDiffLog.setBusinessKey(BusinessKeysConstants.SYS_COMPANY_INFORMATION); + int insertSysDiffLog = diffLogService.insertSysDiffLog(sysDiffLog); + if (insertSysDiffLog <= 0){ + throw new BusinessException("新增仓库信息数据修改记录失败"); + } + return result; } /** @@ -70,9 +94,21 @@ public class SysCompanyInformationServiceImpl implements ISysCompanyInformationS * @param sysCompanyInformation 公司信息 * @return 结果 */ + @SneakyThrows @Override public int updateSysCompanyInformation(SysCompanyInformation sysCompanyInformation) { + + Long companyId = sysCompanyInformation.getCompanyId(); + SysCompanyInformation oldCompanyInformation = sysCompanyInformationMapper.selectSysCompanyInformationById(companyId); + List compare = FieldCompareUtil.compare(SysCompanyInformation.class, sysCompanyInformation, oldCompanyInformation); + if (!CollectionUtils.isEmpty(compare)){ + int updateSysDiffLog = diffLogService.updateSysDiffLogByBusiness(companyId,BusinessKeysConstants.STOCK_INFO,compare); + if (updateSysDiffLog <= 0){ + throw new RuntimeException("修改仓库信息数据修改记录失败"); + } + } + sysCompanyInformation.setUpdateInfoTime(DateUtils.getDate()); return sysCompanyInformationMapper.updateSysCompanyInformation(sysCompanyInformation); } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCompanyInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCompanyInformationMapper.xml index d6ea8241..a3222965 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCompanyInformationMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCompanyInformationMapper.xml @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rmb_registered_capital, foreign_currency_registration, registered_capital, - first_add_time, + first_add_time, #{enterpriseName}, @@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{rmbRegisteredCapital}, #{foreignCurrencyRegistration}, #{registeredCapital}, - now(), + #{firstAddTime}, @@ -147,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rmb_registered_capital = #{rmbRegisteredCapital}, foreign_currency_registration = #{foreignCurrencyRegistration}, registered_capital = #{registeredCapital}, - update_info_time = CONCAT_WS(',',NOW(),update_info_time), + update_info_time = #{updateInfoTime}, where company_id = #{companyId} diff --git a/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html b/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html index 1d495dbe..53941b7c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html +++ b/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html @@ -69,6 +69,14 @@ fixedColumns:true, fixedRightNumber:1, modalName: "公司信息", + onDblClickCell: function (field, value, row, $element) { + var businessId = row.companyId; + var businessKey = "2"; + if (field == "updateInfoTime"){ + var url = ctx + "system/diffLog/getDiffDataList/" + businessId + "/" + businessKey; + $.modal.open("数据修改记录", url); + } + }, columns: [{ checkbox: true }, @@ -211,11 +219,10 @@ field: 'updateInfoTime', title: '上次更新时间', formatter: function (value, row, index) { - if (value == null) { - return " "; + if (value){ + return '' + value + ''; } else { - var vArr = value.split(',') - return vArr[0]; + return value; } } }, diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/BusinessKeysConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/BusinessKeysConstants.java index f36db051..98436336 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/BusinessKeysConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/BusinessKeysConstants.java @@ -32,4 +32,7 @@ public class BusinessKeysConstants { /** 仓库库存查询信息*/ public static final String WAREHOUSE_INQUIRY = "7"; + /** 基础资料公司信息*/ + public static final String SYS_COMPANY_INFORMATION = "8"; + } From 0b661d04b091935dfc290ac8ec992e3a287f9af2 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 27 Dec 2024 16:24:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[fix]=20=E5=9F=BA=E7=A1=80=E8=B5=84?= =?UTF-8?q?=E6=96=99=20=E9=80=9A=E7=94=A8=E4=B8=9A=E5=8A=A1=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=E7=B1=BB=E6=96=B0=E5=A2=9E=E5=85=AC=E5=8F=B8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=93=B6=E8=A1=8C=E8=B4=A6=E5=8F=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=BA9=20=E5=85=AC=E5=8F=B8=E9=93=B6?= =?UTF-8?q?=E8=A1=8C=E8=B4=A6=E5=8F=B7=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=92=8C=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E9=93=B6=E8=A1=8C=E8=B4=A6=E5=8F=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/domain/SysCompanyBankInfo.java | 6 ++++ .../impl/SysCompanyBankInfoServiceImpl.java | 34 ++++++++++++++++++- .../system/SysCompanyBankInfoMapper.xml | 2 +- .../companyBankInfo/companyBankInfo.html | 15 ++++++++ .../constant/BusinessKeysConstants.java | 3 ++ 5 files changed, 58 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCompanyBankInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCompanyBankInfo.java index 9eae067a..c684b9e9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCompanyBankInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCompanyBankInfo.java @@ -1,5 +1,6 @@ package com.ruoyi.system.domain; +import com.ruoyi.common.annotation.FieldCompare; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -22,22 +23,27 @@ public class SysCompanyBankInfo extends BaseEntity private Long companyId; /** 公司名称 */ + @FieldCompare(chineseName = "公司名称") @Excel(name = "公司名称") private String enterpriseName; /** 英文名称 */ + @FieldCompare(chineseName = "英文名称") @Excel(name = "英文名称") private String englishName; /** 借方科目 */ + @FieldCompare(chineseName = "借方科目") @Excel(name = "借方科目") private String debitAccount; /** 开户银行 */ + @FieldCompare(chineseName = "开户银行") @Excel(name = "开户银行") private String depositBank; /** 开户银行账号 */ + @FieldCompare(chineseName = "开户银行账号") @Excel(name = "开户银行账号") private String bankAccount; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCompanyBankInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCompanyBankInfoServiceImpl.java index f715f1ec..885cc7b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCompanyBankInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCompanyBankInfoServiceImpl.java @@ -1,14 +1,24 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.common.constant.BusinessKeysConstants; +import com.ruoyi.common.core.domain.entity.SysFieldDifferent; +import com.ruoyi.common.exception.BusinessException; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.FieldCompareUtil; import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.system.domain.SysCompanyInformation; +import com.ruoyi.system.domain.SysDiffLog; +import com.ruoyi.system.service.ISysDiffLogService; +import lombok.SneakyThrows; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.SysCompanyBankInfoMapper; import com.ruoyi.system.domain.SysCompanyBankInfo; import com.ruoyi.system.service.ISysCompanyBankInfoService; import com.ruoyi.common.core.text.Convert; +import org.springframework.util.CollectionUtils; /** * 公司银行账户信息Service业务层处理 @@ -22,6 +32,9 @@ public class SysCompanyBankInfoServiceImpl implements ISysCompanyBankInfoService @Autowired private SysCompanyBankInfoMapper sysCompanyBankInfoMapper; + @Autowired + private ISysDiffLogService diffLogService; + /** * 查询公司银行账户信息 * @@ -58,7 +71,16 @@ public class SysCompanyBankInfoServiceImpl implements ISysCompanyBankInfoService String loginName = ShiroUtils.getLoginName(); sysCompanyBankInfo.setCreateBy(loginName); sysCompanyBankInfo.setCreateTime(DateUtils.getNowDate()); - return sysCompanyBankInfoMapper.insertSysCompanyBankInfo(sysCompanyBankInfo); + int result = sysCompanyBankInfoMapper.insertSysCompanyBankInfo(sysCompanyBankInfo); + SysDiffLog sysDiffLog = new SysDiffLog(); + Long id = sysCompanyBankInfo.getId(); + sysDiffLog.setBusinessId(id); + sysDiffLog.setBusinessKey(BusinessKeysConstants.SYS_COMPANY_BANK_INFO); + int insertSysDiffLog = diffLogService.insertSysDiffLog(sysDiffLog); + if (insertSysDiffLog <= 0){ + throw new BusinessException("新增仓库信息数据修改记录失败"); + } + return result; } /** @@ -67,12 +89,22 @@ public class SysCompanyBankInfoServiceImpl implements ISysCompanyBankInfoService * @param sysCompanyBankInfo 公司银行账户信息 * @return 结果 */ + @SneakyThrows @Override public int updateSysCompanyBankInfo(SysCompanyBankInfo sysCompanyBankInfo) { String loginName = ShiroUtils.getLoginName(); sysCompanyBankInfo.setUpdateBy(loginName); sysCompanyBankInfo.setUpdateTime(DateUtils.getNowDate()); + Long id = sysCompanyBankInfo.getId(); + SysCompanyBankInfo oldSysCompanyBankInfo = sysCompanyBankInfoMapper.selectSysCompanyBankInfoById(id); + List compare = FieldCompareUtil.compare(SysCompanyBankInfo.class, sysCompanyBankInfo, oldSysCompanyBankInfo); + if (!CollectionUtils.isEmpty(compare)){ + int updateSysDiffLog = diffLogService.updateSysDiffLogByBusiness(id,BusinessKeysConstants.STOCK_INFO,compare); + if (updateSysDiffLog <= 0){ + throw new RuntimeException("修改仓库信息数据修改记录失败"); + } + } return sysCompanyBankInfoMapper.updateSysCompanyBankInfo(sysCompanyBankInfo); } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCompanyBankInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCompanyBankInfoMapper.xml index 6b6fa598..facb229e 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCompanyBankInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCompanyBankInfoMapper.xml @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into sys_company_bank_info id, diff --git a/ruoyi-admin/src/main/resources/templates/system/companyBankInfo/companyBankInfo.html b/ruoyi-admin/src/main/resources/templates/system/companyBankInfo/companyBankInfo.html index 15877a37..a886fa11 100644 --- a/ruoyi-admin/src/main/resources/templates/system/companyBankInfo/companyBankInfo.html +++ b/ruoyi-admin/src/main/resources/templates/system/companyBankInfo/companyBankInfo.html @@ -59,6 +59,14 @@ restoreUrl: prefix + "/restore/{id}", exportUrl: prefix + "/export", modalName: "公司银行账户信息", + onDblClickCell: function (field, value, row, $element) { + var businessId = row.id; + var businessKey = "2"; + if (field == "updateTime"){ + var url = ctx + "system/diffLog/getDiffDataList/" + businessId + "/" + businessKey; + $.modal.open("数据修改记录", url); + } + }, columns: [{ checkbox: true }, @@ -112,6 +120,13 @@ title: '更新时间', align: 'center', field: 'updateTime', + formatter: function (value, row, index) { + if (value){ + return '' + value + ''; + } else { + return value; + } + } }, { title: '操作', diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/BusinessKeysConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/BusinessKeysConstants.java index 98436336..968b109a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/BusinessKeysConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/BusinessKeysConstants.java @@ -35,4 +35,7 @@ public class BusinessKeysConstants { /** 基础资料公司信息*/ public static final String SYS_COMPANY_INFORMATION = "8"; + /** 基础资料公司银行账号信息*/ + public static final String SYS_COMPANY_BANK_INFO = "9"; + }