Merge remote-tracking branch 'origin/dev' into dev

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;
 

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;
 

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<SysFieldDifferent> 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);
     }
 

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<SysFieldDifferent> 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);
     }
 

ruoyi-admin/src/main/resources/mapper/system/SysCompanyBankInfoMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertSysCompanyBankInfo" parameterType="SysCompanyBankInfo">
+    <insert id="insertSysCompanyBankInfo" parameterType="SysCompanyBankInfo" useGeneratedKeys="true" keyProperty="id">
         insert into sys_company_bank_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

ruoyi-admin/src/main/resources/mapper/system/SysCompanyInformationMapper.xml

@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rmbRegisteredCapital != null">rmb_registered_capital,</if>
             <if test="foreignCurrencyRegistration != null">foreign_currency_registration,</if>
             <if test="registeredCapital != null">registered_capital,</if>
-            first_add_time,
+            <if test="firstAddTime != null">first_add_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="enterpriseName != null">#{enterpriseName},</if>
@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rmbRegisteredCapital != null">#{rmbRegisteredCapital},</if>
             <if test="foreignCurrencyRegistration != null">#{foreignCurrencyRegistration},</if>
             <if test="registeredCapital != null">#{registeredCapital},</if>
-            now(),
+            <if test="firstAddTime != null">#{firstAddTime},</if>
          </trim>
     </insert>
 
@@ -147,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rmbRegisteredCapital != null">rmb_registered_capital = #{rmbRegisteredCapital},</if>
             <if test="foreignCurrencyRegistration != null">foreign_currency_registration = #{foreignCurrencyRegistration},</if>
             <if test="registeredCapital != null">registered_capital = #{registeredCapital},</if>
-            update_info_time = CONCAT_WS(',',NOW(),update_info_time),
+            <if test="updateInfoTime != null">update_info_time = #{updateInfoTime},</if>
         </trim>
         where company_id = #{companyId}
     </update>

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 '<span style="color:#337ab7; cursor: pointer;">' + value + '</span>';
+                            } else {
+                                return value;
+                            }
+                        }
                     },
                 {
                     title: '操作',

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) {
+                        if (value){
-                            return " ";
+                            return '<span style="color:#337ab7; cursor: pointer;">' + value + '</span>';
                         } else {
-                            var vArr = value.split(',')
+                            return value;
-                            return vArr[0];
                         }
                     }
                 },

ruoyi-common/src/main/java/com/ruoyi/common/constant/BusinessKeysConstants.java

@@ -32,4 +32,10 @@ public class BusinessKeysConstants {
     /** 仓库库存查询信息*/
     public static final String WAREHOUSE_INQUIRY = "7";
 
+    /** 基础资料公司信息*/
+    public static final String SYS_COMPANY_INFORMATION = "8";
+
+    /** 基础资料公司银行账号信息*/
+    public static final String SYS_COMPANY_BANK_INFO = "9";
+
 }