elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'develop' into release_temp

dev
sunyuchao 4 years ago
parent
0029f59f1f fada3d2dc8
commit
9af8088e41
3 changed files with 30 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.6__ic_often_use_function.sql
  2. 7
      epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.13__ic_individual_category_manage.sql
  3. 44
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java

10
epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.6__ic_often_use_function.sql
View File

@ -20,14 +20,14 @@ SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for ic_often_use_function
-- ----------------------------
DROP TABLE IF EXISTS `ic_often_use_function`;
-- DROP TABLE IF EXISTS `ic_often_use_function`;
CREATE TABLE `ic_often_use_function` (
`ID` varchar(32) NOT NULL,
`CUSTOMER_ID` varchar(255) NOT NULL COMMENT '客户ID',
`USER_ID` varchar(255) NOT NULL COMMENT '用户ID',
`MENU_ID` varchar(255) NOT NULL COMMENT '菜单ID',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
`USER_ID` varchar(64) NOT NULL COMMENT '用户ID',
`MENU_ID` varchar(64) NOT NULL COMMENT '菜单ID',
`SORT` int(11) NOT NULL COMMENT '排序',
`DEL_FLAG` int(11) NOT NULL COMMENT '删除标记',
`DEL_FLAG` char(1) NOT NULL COMMENT '删除标记',
`REVISION` varchar(32) NOT NULL COMMENT '乐观锁',
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间',

7
epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.13__ic_individual_category_manage.sql
View File

@ -20,14 +20,13 @@ SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for ic_individual_category_manage
-- ----------------------------
DROP TABLE IF EXISTS `ic_individual_category_manage`;
CREATE TABLE `ic_individual_category_manage` (
`ID` varchar(32) NOT NULL COMMENT 'ID',
`CUSTOMER_ID` varchar(255) NOT NULL COMMENT '客户ID',
`USER_ID` varchar(255) NOT NULL COMMENT '用户ID',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
`USER_ID` varchar(64) NOT NULL COMMENT '用户ID',
`COLUMN_ID` varchar(255) DEFAULT NULL,
`SORT` int(11) NOT NULL COMMENT '排序',
`DEL_FLAG` int(11) NOT NULL COMMENT '删除标记',
`DEL_FLAG` char(1) NOT NULL COMMENT '删除标记',
`REVISION` varchar(32) NOT NULL COMMENT '乐观锁',
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间',

44
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
View File

@ -221,29 +221,29 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
}
if (subList.size() > NumConstant.ZERO) {
detailedList.addAll(subList);
if (!hash.containsKey(map.get("CREATED_BY"))) {
CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, map.get("CREATED_BY"));
//被删除或被移除的工作人员，名字为空
hash.put(map.get("CREATED_BY"), null != staffInfoCache ? staffInfoCache.getRealName() : "");
}
change = new IcUserChangeRecordEntity();
change.setId(changeId);
change.setCustomerId(customerId);
change.setOperatorId(map.get("CREATED_BY"));
change.setIcUserId(map.get("ID"));
change.setOperatorName(hash.get(map.get("CREATED_BY")));
change.setIcUserName(map.get("NAME"));
change.setType("add");
change.setTypeName("新增");
change.setBeforeChangeName("-");
change.setAfterChangeName("-");
change.setChangeTime(sdf.parse(map.get("CREATED_TIME")));
change.setCreatedBy(map.get("CREATED_BY"));
change.setCreatedTime(sdf.parse(map.get("CREATED_TIME")));
change.setUpdatedBy("APP_USER");
change.setUpdatedTime(new Date());
changeList.add(change);
}
if (!hash.containsKey(map.get("CREATED_BY"))) {
CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, map.get("CREATED_BY"));
//被删除或被移除的工作人员，名字为空
hash.put(map.get("CREATED_BY"), null != staffInfoCache ? staffInfoCache.getRealName() : "");
}
change = new IcUserChangeRecordEntity();
change.setId(changeId);
change.setCustomerId(customerId);
change.setOperatorId(map.get("CREATED_BY"));
change.setIcUserId(map.get("ID"));
change.setOperatorName(hash.get(map.get("CREATED_BY")));
change.setIcUserName(map.get("NAME"));
change.setType("add");
change.setTypeName("新增");
change.setBeforeChangeName("-");
change.setAfterChangeName("-");
change.setChangeTime(sdf.parse(map.get("CREATED_TIME")));
change.setCreatedBy(map.get("CREATED_BY"));
change.setCreatedTime(sdf.parse(map.get("CREATED_TIME")));
change.setUpdatedBy("APP_USER");
change.setUpdatedTime(new Date());
changeList.add(change);
}
} while (icUserList.size() == NumConstant.ONE_THOUSAND);
//4.批量新增数据,先删后增【只删除新增节点的历史数据】

Write Preview
Loading…
Cancel
Save