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"; + }