朱园亮 / xingyun-erp · Commits

Commit 0897753fb1521a3be86978779823bb1eb4e25e2c

Authored by 房远帅
2 parents 8dc8bcf5 eea1eeb4

Merge branch 'master_after20' into master_cj_zq

Inline Side-by-side
Showing 3 changed files with 6 additions and 2 deletions
1 alter table base_data_customer modify column mnemonic_code varchar(100) null; 1 alter table base_data_customer modify column mnemonic_code varchar(100) null;
2 2
  3 +ALTER TABLE sys_site_message
  4 + MODIFY receiver_id VARCHAR(100) DEFAULT NULL COMMENT '接收人';
  5 +
3 ALTER TABLE base_data_customer 6 ALTER TABLE base_data_customer
4 MODIFY COLUMN `code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '编号', 7 MODIFY COLUMN `code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '编号',
5 MODIFY COLUMN `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '名称', 8 MODIFY COLUMN `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '名称',
@@ -612,7 +615,7 @@ CREATE TABLE IF NOT EXISTS order_info_change_record ( @@ -612,7 +615,7 @@ CREATE TABLE IF NOT EXISTS order_info_change_record (
612 `workshop_id` varchar(50) DEFAULT NULL COMMENT '生产厂ID', 615 `workshop_id` varchar(50) DEFAULT NULL COMMENT '生产厂ID',
613 `customer_credit_id` varchar(50) DEFAULT NULL COMMENT '客户资信ID', 616 `customer_credit_id` varchar(50) DEFAULT NULL COMMENT '客户资信ID',
614 `total_quantity` double DEFAULT NULL COMMENT '总数量', 617 `total_quantity` double DEFAULT NULL COMMENT '总数量',
615 - `packaging_fee` decimal(15,4) DEFAULT NULL COMMENT '包装费', 618 + `packaging_fee` varchar(100) DEFAULT NULL COMMENT '包装费',
616 `examine_status` varchar(50) DEFAULT NULL COMMENT '审核状态', 619 `examine_status` varchar(50) DEFAULT NULL COMMENT '审核状态',
617 `order_id` varchar(32) NOT NULL COMMENT '订货单ID', 620 `order_id` varchar(32) NOT NULL COMMENT '订货单ID',
618 `output` bool DEFAULT NULL comment '已产出', 621 `output` bool DEFAULT NULL comment '已产出',
@@ -55,6 +55,7 @@ public class TransactorHandler { @@ -55,6 +55,7 @@ public class TransactorHandler {
55 log.info("================== listTransactorsByRoleCode roleUserId:{}", id); 55 log.info("================== listTransactorsByRoleCode roleUserId:{}", id);
56 List<String> userIds = userIdMap.get(id); 56 List<String> userIds = userIdMap.get(id);
57 log.info("================== listTransactorsByRoleCode userDeptUserId size:{}", CollectionUtils.isEmpty(userIds) ? 0 : userIds.size()); 57 log.info("================== listTransactorsByRoleCode userDeptUserId size:{}", CollectionUtils.isEmpty(userIds) ? 0 : userIds.size());
  58 + log.info("================== listTransactorsByRoleCode userIds:{}", userIds);
58 if (CollectionUtils.isNotEmpty(userIds) && userIds.contains(userId)) { 59 if (CollectionUtils.isNotEmpty(userIds) && userIds.contains(userId)) {
59 result.add(id); 60 result.add(id);
60 } 61 }
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 AND tb.create_time &gt;= #{vo.applicationDateStart} 68 AND tb.create_time &gt;= #{vo.applicationDateStart}
69 </if> 69 </if>
70 <if test="vo.applicationDateEnd != null"> 70 <if test="vo.applicationDateEnd != null">
71 - AND tb.create_time &lt;= #{vo.applicationDateEnd} 71 + AND tb.create_time &lt;= CONCAT(DATE(#{vo.applicationDateEnd}), ' 23:59:59')
72 </if> 72 </if>
73 <if test="vo.searchKey != null and vo.searchKey != ''"> 73 <if test="vo.searchKey != null and vo.searchKey != ''">
74 AND (tb.code LIKE CONCAT('%', #{vo.searchKey},'%') OR cu.name LIKE CONCAT('%', #{vo.searchKey},'%')) 74 AND (tb.code LIKE CONCAT('%', #{vo.searchKey},'%') OR cu.name LIKE CONCAT('%', #{vo.searchKey},'%'))