✨ 完善核销用户记录和毛利报表导出日志

This commit is contained in:
caojia
2026-10-19 16:43:14 +08:00
parent a754e8dcc6
commit 383ef55e00
14 changed files with 103 additions and 24 deletions
@@ -140,14 +140,14 @@ public class PrcProfitReportController extends BaseController
public TableDataInfo exports() public TableDataInfo exports()
{ {
startPage(); startPage();
return getDataTable(profitReportService.selectExports(getUsername())); return getDataTable(profitReportService.selectExports());
} }
@PreAuthorize("@ss.hasPermi('report:profit:export')") @PreAuthorize("@ss.hasPermi('report:profit:export')")
@GetMapping("/exports/{exportId}/download") @GetMapping("/exports/{exportId}/download")
public void downloadExport(@PathVariable Long exportId, HttpServletResponse response) throws Exception public void downloadExport(@PathVariable Long exportId, HttpServletResponse response) throws Exception
{ {
PrcProfitReportExport export = profitReportService.selectExport(exportId, getUsername()); PrcProfitReportExport export = profitReportService.selectExport(exportId);
if (export == null || !"SUCCESS".equals(export.getExportStatus()) if (export == null || !"SUCCESS".equals(export.getExportStatus())
|| export.getStorageKey() == null || export.getStorageKey().isBlank()) || export.getStorageKey() == null || export.getStorageKey().isBlank())
{ {
@@ -65,6 +65,12 @@ public class ArBalanceWriteoff extends BaseEntity
/** 核销备注 */ /** 核销备注 */
private String remark; private String remark;
/** 执行核销的用户主键 */
private Long createUserId;
/** 执行反核销的用户主键 */
private Long cancelUserId;
/** 反核销人 */ /** 反核销人 */
private String cancelBy; private String cancelBy;
@@ -27,6 +27,7 @@ public interface ArBalanceWriteoffMapper
int updateCancelled(@Param("writeoffId") Long writeoffId, int updateCancelled(@Param("writeoffId") Long writeoffId,
@Param("reverseFlowId") Long reverseFlowId, @Param("reverseFlowId") Long reverseFlowId,
@Param("cancelBy") String cancelBy, @Param("cancelBy") String cancelBy,
@Param("cancelUserId") Long cancelUserId,
@Param("cancelRemark") String cancelRemark, @Param("cancelRemark") String cancelRemark,
@Param("status") String status, @Param("status") String status,
@Param("effectiveStatus") String effectiveStatus); @Param("effectiveStatus") String effectiveStatus);
@@ -116,6 +116,7 @@ public class ArBalanceWriteoffServiceImpl implements IArBalanceWriteoffService {
} }
String operator = SecurityUtils.getUsername(); String operator = SecurityUtils.getUsername();
Long operatorUserId = SecurityUtils.getUserId();
String requestId = IdUtils.fastSimpleUUID(); String requestId = IdUtils.fastSimpleUUID();
String currency = StringUtils.hasText(bill.getCurrency()) ? bill.getCurrency().trim().toUpperCase() : "CNY"; String currency = StringUtils.hasText(bill.getCurrency()) ? bill.getCurrency().trim().toUpperCase() : "CNY";
Date writeoffDate = cmd.getWriteoffDate() != null ? cmd.getWriteoffDate() : new Date(); Date writeoffDate = cmd.getWriteoffDate() != null ? cmd.getWriteoffDate() : new Date();
@@ -133,6 +134,7 @@ public class ArBalanceWriteoffServiceImpl implements IArBalanceWriteoffService {
writeoff.setWriteoffDate(writeoffDate); writeoff.setWriteoffDate(writeoffDate);
writeoff.setStatus(ArBalanceWriteoffStatus.EFFECTIVE.getCode()); writeoff.setStatus(ArBalanceWriteoffStatus.EFFECTIVE.getCode());
writeoff.setRemark(StringUtils.hasText(cmd.getRemark()) ? cmd.getRemark().trim() : null); writeoff.setRemark(StringUtils.hasText(cmd.getRemark()) ? cmd.getRemark().trim() : null);
writeoff.setCreateUserId(operatorUserId);
writeoff.setCreateBy(operator); writeoff.setCreateBy(operator);
writeoffMapper.insertArBalanceWriteoff(writeoff); writeoffMapper.insertArBalanceWriteoff(writeoff);
@@ -177,6 +179,7 @@ public class ArBalanceWriteoffServiceImpl implements IArBalanceWriteoffService {
} }
String operator = SecurityUtils.getUsername(); String operator = SecurityUtils.getUsername();
Long operatorUserId = SecurityUtils.getUserId();
String requestId = IdUtils.fastSimpleUUID(); String requestId = IdUtils.fastSimpleUUID();
String cancelRemark = StringUtils.hasText(remark) ? remark.trim() : "取消余额核销"; String cancelRemark = StringUtils.hasText(remark) ? remark.trim() : "取消余额核销";
String fromStatus = bill.getStatus(); String fromStatus = bill.getStatus();
@@ -195,7 +198,7 @@ public class ArBalanceWriteoffServiceImpl implements IArBalanceWriteoffService {
} }
// 3. 核销单置为CANCELLED(口径变更后无回补流水,reverse_flow_id 置空) // 3. 核销单置为CANCELLED(口径变更后无回补流水,reverse_flow_id 置空)
if (writeoffMapper.updateCancelled(writeoffId, null, operator, cancelRemark, if (writeoffMapper.updateCancelled(writeoffId, null, operator, operatorUserId, cancelRemark,
ArBalanceWriteoffStatus.CANCELLED.getCode(), ArBalanceWriteoffStatus.EFFECTIVE.getCode()) != 1) { ArBalanceWriteoffStatus.CANCELLED.getCode(), ArBalanceWriteoffStatus.EFFECTIVE.getCode()) != 1) {
throw new ServiceException("核销记录状态已变化,请刷新后重试"); throw new ServiceException("核销记录状态已变化,请刷新后重试");
} }
@@ -22,6 +22,8 @@ public class PrcProfitReportExport implements Serializable
private Integer rowCount; private Integer rowCount;
/** PROCESSING 生成中,SUCCESS 成功,FAILED 失败。 */ /** PROCESSING 生成中,SUCCESS 成功,FAILED 失败。 */
private String exportStatus; private String exportStatus;
/** 发起导出的用户主键。 */
private Long exportUserId;
private String exportBy; private String exportBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date exportTime; private Date exportTime;
@@ -23,8 +23,7 @@ public interface PrcProfitReportMapper
int markExportFailed(@Param("exportId") Long exportId, @Param("remark") String remark); int markExportFailed(@Param("exportId") Long exportId, @Param("remark") String remark);
List<PrcProfitReportExport> selectExportsByUser(String exportBy); List<PrcProfitReportExport> selectExports();
PrcProfitReportExport selectExportByIdAndUser(@Param("exportId") Long exportId, PrcProfitReportExport selectExportById(@Param("exportId") Long exportId);
@Param("exportBy") String exportBy);
} }
@@ -23,9 +23,9 @@ public interface IPrcProfitReportService
int failExport(Long exportId, String remark); int failExport(Long exportId, String remark);
List<PrcProfitReportExport> selectExports(String exportBy); List<PrcProfitReportExport> selectExports();
PrcProfitReportExport selectExport(Long exportId, String exportBy); PrcProfitReportExport selectExport(Long exportId);
/* 提成比例维护暂停使用。 /* 提成比例维护暂停使用。
List<PrcProfitCommissionRate> selectCommissionRates(); List<PrcProfitCommissionRate> selectCommissionRates();
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
// 提成功能暂停使用:import org.springframework.transaction.annotation.Transactional; // 提成功能暂停使用:import org.springframework.transaction.annotation.Transactional;
import com.bms.common.annotation.DataScope; import com.bms.common.annotation.DataScope;
import com.bms.common.exception.ServiceException; import com.bms.common.exception.ServiceException;
// 提成功能暂停使用:import com.bms.common.utils.SecurityUtils; import com.bms.common.utils.SecurityUtils;
// 提成功能暂停使用:import com.bms.price.domain.PrcProfitCommissionRate; // 提成功能暂停使用:import com.bms.price.domain.PrcProfitCommissionRate;
// 提成功能暂停使用:import com.bms.price.mapper.PrcProfitCommissionRateMapper; // 提成功能暂停使用:import com.bms.price.mapper.PrcProfitCommissionRateMapper;
import com.bms.price.domain.PrcProfitReportExport; import com.bms.price.domain.PrcProfitReportExport;
@@ -61,6 +61,7 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
@Override @Override
public int createExport(PrcProfitReportExport export) public int createExport(PrcProfitReportExport export)
{ {
export.setExportUserId(SecurityUtils.getUserId());
return profitReportMapper.insertExport(export); return profitReportMapper.insertExport(export);
} }
@@ -77,15 +78,15 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
} }
@Override @Override
public List<PrcProfitReportExport> selectExports(String exportBy) public List<PrcProfitReportExport> selectExports()
{ {
return profitReportMapper.selectExportsByUser(exportBy); return profitReportMapper.selectExports();
} }
@Override @Override
public PrcProfitReportExport selectExport(Long exportId, String exportBy) public PrcProfitReportExport selectExport(Long exportId)
{ {
return profitReportMapper.selectExportByIdAndUser(exportId, exportBy); return profitReportMapper.selectExportById(exportId);
} }
/** 将报表的多行输入拆分为去重后的查询条件,支持换行、空格、逗号和分号分隔。 */ /** 将报表的多行输入拆分为去重后的查询条件,支持换行、空格、逗号和分号分隔。 */
@@ -19,8 +19,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="writeoffDate" column="writeoff_date"/> <result property="writeoffDate" column="writeoff_date"/>
<result property="status" column="status"/> <result property="status" column="status"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
<result property="createUserId" column="create_user_id"/>
<result property="createBy" column="create_by"/> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
<result property="cancelUserId" column="cancel_user_id"/>
<result property="cancelBy" column="cancel_by"/> <result property="cancelBy" column="cancel_by"/>
<result property="cancelTime" column="cancel_time"/> <result property="cancelTime" column="cancel_time"/>
<result property="cancelRemark" column="cancel_remark"/> <result property="cancelRemark" column="cancel_remark"/>
@@ -31,8 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectColumns"> <sql id="selectColumns">
select w.writeoff_id, w.writeoff_no, w.ar_bill_id, w.bill_no, w.customer_id, w.receipt_id, w.account_id, select w.writeoff_id, w.writeoff_no, w.ar_bill_id, w.bill_no, w.customer_id, w.receipt_id, w.account_id,
w.currency, w.writeoff_amount, w.balance_flow_id, w.reverse_flow_id, w.currency, w.writeoff_amount, w.balance_flow_id, w.reverse_flow_id,
w.writeoff_date, w.status, w.remark, w.create_by, w.create_time, w.writeoff_date, w.status, w.remark, w.create_user_id, w.create_by, w.create_time,
w.cancel_by, w.cancel_time, w.cancel_remark, w.cancel_user_id, w.cancel_by, w.cancel_time, w.cancel_remark,
b.bill_name, b.customer_name b.bill_name, b.customer_name
from ar_balance_writeoff w from ar_balance_writeoff w
left join ar_bill b on b.ar_bill_id = w.ar_bill_id left join ar_bill b on b.ar_bill_id = w.ar_bill_id
@@ -43,11 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into ar_balance_writeoff ( insert into ar_balance_writeoff (
writeoff_no, ar_bill_id, bill_no, customer_id, receipt_id, account_id, currency, writeoff_no, ar_bill_id, bill_no, customer_id, receipt_id, account_id, currency,
writeoff_amount, balance_flow_id, reverse_flow_id, writeoff_date, writeoff_amount, balance_flow_id, reverse_flow_id, writeoff_date,
status, remark, create_by, create_time status, remark, create_user_id, create_by, create_time
) values ( ) values (
#{writeoffNo}, #{arBillId}, #{billNo}, #{customerId}, #{receiptId}, #{accountId}, #{currency}, #{writeoffNo}, #{arBillId}, #{billNo}, #{customerId}, #{receiptId}, #{accountId}, #{currency},
#{writeoffAmount}, #{balanceFlowId}, #{reverseFlowId}, #{writeoffDate}, #{writeoffAmount}, #{balanceFlowId}, #{reverseFlowId}, #{writeoffDate},
#{status}, #{remark}, #{createBy}, sysdate() #{status}, #{remark}, #{createUserId}, #{createBy}, sysdate()
) )
</insert> </insert>
@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update ar_balance_writeoff update ar_balance_writeoff
set status = #{status}, set status = #{status},
reverse_flow_id = #{reverseFlowId}, reverse_flow_id = #{reverseFlowId},
cancel_user_id = #{cancelUserId},
cancel_by = #{cancelBy}, cancel_by = #{cancelBy},
cancel_time = sysdate(), cancel_time = sysdate(),
cancel_remark = #{cancelRemark} cancel_remark = #{cancelRemark}
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="storageKey" column="storage_key"/> <result property="storageKey" column="storage_key"/>
<result property="rowCount" column="row_count"/> <result property="rowCount" column="row_count"/>
<result property="exportStatus" column="export_status"/> <result property="exportStatus" column="export_status"/>
<result property="exportUserId" column="export_user_id"/>
<result property="exportBy" column="export_by"/> <result property="exportBy" column="export_by"/>
<result property="exportTime" column="export_time"/> <result property="exportTime" column="export_time"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
@@ -18,15 +19,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="profitReportExportColumns"> <sql id="profitReportExportColumns">
select export_id, dimension, file_name, storage_key, row_count, select export_id, dimension, file_name, storage_key, row_count,
export_status, export_by, export_time, remark export_status, export_user_id, export_by, export_time, remark
from prc_profit_report_export from prc_profit_report_export
</sql> </sql>
<insert id="insertExport" parameterType="PrcProfitReportExport" useGeneratedKeys="true" keyProperty="exportId"> <insert id="insertExport" parameterType="PrcProfitReportExport" useGeneratedKeys="true" keyProperty="exportId">
insert into prc_profit_report_export ( insert into prc_profit_report_export (
dimension, file_name, storage_key, row_count, export_status, export_by, export_time, remark dimension, file_name, storage_key, row_count, export_status, export_user_id, export_by, export_time, remark
) values ( ) values (
#{dimension}, #{fileName}, #{storageKey}, #{rowCount}, #{exportStatus}, #{exportBy}, sysdate(), #{remark} #{dimension}, #{fileName}, #{storageKey}, #{rowCount}, #{exportStatus}, #{exportUserId}, #{exportBy}, sysdate(), #{remark}
) )
</insert> </insert>
@@ -43,15 +44,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where export_id = #{exportId} and export_status = 'PROCESSING' where export_id = #{exportId} and export_status = 'PROCESSING'
</update> </update>
<select id="selectExportsByUser" resultMap="PrcProfitReportExportResult"> <select id="selectExports" resultMap="PrcProfitReportExportResult">
<include refid="profitReportExportColumns"/> <include refid="profitReportExportColumns"/>
where export_by = #{exportBy}
order by export_time desc, export_id desc order by export_time desc, export_id desc
</select> </select>
<select id="selectExportByIdAndUser" resultMap="PrcProfitReportExportResult"> <select id="selectExportById" resultMap="PrcProfitReportExportResult">
<include refid="profitReportExportColumns"/> <include refid="profitReportExportColumns"/>
where export_id = #{exportId} and export_by = #{exportBy} where export_id = #{exportId}
</select> </select>
<resultMap type="PrcProfitReportOrderRow" id="PrcProfitReportOrderResult"> <resultMap type="PrcProfitReportOrderRow" id="PrcProfitReportOrderResult">
@@ -0,0 +1,30 @@
-- 为余额核销记录增加核销人与反核销人用户主键。
-- 本脚本仅调整表结构;历史记录保持 NULL,新操作由服务写入当前登录用户ID。
SET @column_exists := (
SELECT COUNT(1) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'ar_balance_writeoff'
AND COLUMN_NAME = 'create_user_id'
);
SET @sql := IF(@column_exists = 0,
'ALTER TABLE `ar_balance_writeoff` ADD COLUMN `create_user_id` bigint(20) DEFAULT NULL COMMENT ''核销人用户ID'' AFTER `remark`',
'ALTER TABLE `ar_balance_writeoff` MODIFY COLUMN `create_user_id` bigint(20) DEFAULT NULL COMMENT ''核销人用户ID'' AFTER `remark`'
);
PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
SET @column_exists := (
SELECT COUNT(1) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'ar_balance_writeoff'
AND COLUMN_NAME = 'cancel_user_id'
);
SET @sql := IF(@column_exists = 0,
'ALTER TABLE `ar_balance_writeoff` ADD COLUMN `cancel_user_id` bigint(20) DEFAULT NULL COMMENT ''反核销人用户ID'' AFTER `create_time`',
'ALTER TABLE `ar_balance_writeoff` MODIFY COLUMN `cancel_user_id` bigint(20) DEFAULT NULL COMMENT ''反核销人用户ID'' AFTER `create_time`'
);
PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
+3
View File
@@ -25,8 +25,10 @@ CREATE TABLE `ar_balance_writeoff` (
`writeoff_date` date NOT NULL COMMENT '核销日期', `writeoff_date` date NOT NULL COMMENT '核销日期',
`status` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '状态:EFFECTIVE=有效(已扣减客户余额),CANCELLED=已反核销(已回补客户余额)', `status` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '状态:EFFECTIVE=有效(已扣减客户余额),CANCELLED=已反核销(已回补客户余额)',
`remark` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '核销备注', `remark` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '核销备注',
`create_user_id` bigint(20) DEFAULT NULL COMMENT '核销人用户ID',
`create_by` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '创建人', `create_by` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '创建人',
`create_time` datetime NOT NULL COMMENT '创建时间', `create_time` datetime NOT NULL COMMENT '创建时间',
`cancel_user_id` bigint(20) DEFAULT NULL COMMENT '反核销人用户ID',
`cancel_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '反核销人', `cancel_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '反核销人',
`cancel_time` datetime DEFAULT NULL COMMENT '反核销时间', `cancel_time` datetime DEFAULT NULL COMMENT '反核销时间',
`cancel_remark` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '反核销原因', `cancel_remark` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '反核销原因',
@@ -2268,6 +2270,7 @@ CREATE TABLE IF NOT EXISTS `prc_profit_report_export` (
`storage_key` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '下载目录下的文件Key', `storage_key` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '下载目录下的文件Key',
`row_count` int(11) DEFAULT NULL COMMENT '导出记录数', `row_count` int(11) DEFAULT NULL COMMENT '导出记录数',
`export_status` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'PROCESSING生成中,SUCCESS成功,FAILED失败', `export_status` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'PROCESSING生成中,SUCCESS成功,FAILED失败',
`export_user_id` bigint(20) DEFAULT NULL COMMENT '导出人用户ID',
`export_by` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '导出人', `export_by` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '导出人',
`export_time` datetime NOT NULL COMMENT '导出时间', `export_time` datetime NOT NULL COMMENT '导出时间',
`remark` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '失败原因', `remark` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '失败原因',
@@ -6,6 +6,7 @@ CREATE TABLE IF NOT EXISTS `prc_profit_report_export` (
`storage_key` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '下载目录下的文件Key', `storage_key` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '下载目录下的文件Key',
`row_count` int(11) DEFAULT NULL COMMENT '导出记录数', `row_count` int(11) DEFAULT NULL COMMENT '导出记录数',
`export_status` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'PROCESSING生成中,SUCCESS成功,FAILED失败', `export_status` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'PROCESSING生成中,SUCCESS成功,FAILED失败',
`export_user_id` bigint(20) DEFAULT NULL COMMENT '导出人用户ID',
`export_by` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '导出人', `export_by` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '导出人',
`export_time` datetime NOT NULL COMMENT '导出时间', `export_time` datetime NOT NULL COMMENT '导出时间',
`remark` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '失败原因', `remark` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '失败原因',
@@ -13,3 +14,18 @@ CREATE TABLE IF NOT EXISTS `prc_profit_report_export` (
KEY `idx_profit_report_export_user_time` (`export_by`, `export_time`), KEY `idx_profit_report_export_user_time` (`export_by`, `export_time`),
KEY `idx_profit_report_export_status` (`export_status`) KEY `idx_profit_report_export_status` (`export_status`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='毛利报表导出日志'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='毛利报表导出日志';
-- 已存在的表补充导出用户ID;再次执行时仅校正字段位置与定义。
SET @column_exists := (
SELECT COUNT(1) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'prc_profit_report_export'
AND COLUMN_NAME = 'export_user_id'
);
SET @sql := IF(@column_exists = 0,
'ALTER TABLE `prc_profit_report_export` ADD COLUMN `export_user_id` bigint(20) DEFAULT NULL COMMENT ''导出人用户ID'' AFTER `export_status`',
'ALTER TABLE `prc_profit_report_export` MODIFY COLUMN `export_user_id` bigint(20) DEFAULT NULL COMMENT ''导出人用户ID'' AFTER `export_status`'
);
PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
+15
View File
@@ -24,6 +24,7 @@ CREATE TABLE IF NOT EXISTS `prc_profit_report_export` (
`storage_key` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '下载目录下的文件Key', `storage_key` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '下载目录下的文件Key',
`row_count` int(11) DEFAULT NULL COMMENT '导出记录数', `row_count` int(11) DEFAULT NULL COMMENT '导出记录数',
`export_status` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'PROCESSING生成中,SUCCESS成功,FAILED失败', `export_status` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'PROCESSING生成中,SUCCESS成功,FAILED失败',
`export_user_id` bigint(20) DEFAULT NULL COMMENT '导出人用户ID',
`export_by` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '导出人', `export_by` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '导出人',
`export_time` datetime NOT NULL COMMENT '导出时间', `export_time` datetime NOT NULL COMMENT '导出时间',
`remark` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '失败原因', `remark` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '失败原因',
@@ -32,6 +33,20 @@ CREATE TABLE IF NOT EXISTS `prc_profit_report_export` (
KEY `idx_profit_report_export_status` (`export_status`) KEY `idx_profit_report_export_status` (`export_status`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='毛利报表导出日志'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='毛利报表导出日志';
SET @column_exists := (
SELECT COUNT(1) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = 'prc_profit_report_export'
AND COLUMN_NAME = 'export_user_id'
);
SET @sql := IF(@column_exists = 0,
'ALTER TABLE `prc_profit_report_export` ADD COLUMN `export_user_id` bigint(20) DEFAULT NULL COMMENT ''导出人用户ID'' AFTER `export_status`',
'ALTER TABLE `prc_profit_report_export` MODIFY COLUMN `export_user_id` bigint(20) DEFAULT NULL COMMENT ''导出人用户ID'' AFTER `export_status`'
);
PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
SET @index_exists := ( SET @index_exists := (
SELECT COUNT(1) FROM information_schema.STATISTICS SELECT COUNT(1) FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'prc_order_bill' WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'prc_order_bill'