commit
This commit is contained in:
@@ -181,7 +181,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
|
|||||||
this.updateDict(latestSourceList);
|
this.updateDict(latestSourceList);
|
||||||
|
|
||||||
// 人员的单位数据和数据库的单位数据比较,如果人员里面有单位不存在,去更新单位数据
|
// 人员的单位数据和数据库的单位数据比较,如果人员里面有单位不存在,去更新单位数据
|
||||||
List<String> sourceUnitIds = latestSourceList.stream().map(Sys_user_source::getUnitId).distinct().toList();
|
/* List<String> sourceUnitIds = latestSourceList.stream().map(Sys_user_source::getUnitId).distinct().toList();
|
||||||
Sql sql = Sqls.create("select id from sys_unit group by id");
|
Sql sql = Sqls.create("select id from sys_unit group by id");
|
||||||
sql.setCallback(Sqls.callback.strList());
|
sql.setCallback(Sqls.callback.strList());
|
||||||
dao().execute(sql);
|
dao().execute(sql);
|
||||||
@@ -190,7 +190,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
|
|||||||
if (!new HashSet<>(unitIds).containsAll(sourceUnitIds)) {
|
if (!new HashSet<>(unitIds).containsAll(sourceUnitIds)) {
|
||||||
log.info("单位需要更新,正在同步更新");
|
log.info("单位需要更新,正在同步更新");
|
||||||
sysDataUnitPullService.updateUnits(unitIds);
|
sysDataUnitPullService.updateUnits(unitIds);
|
||||||
}
|
}*/
|
||||||
return nowDate;
|
return nowDate;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new BaseException("数据拉取失败,{}", e.getMessage());
|
throw new BaseException("数据拉取失败,{}", e.getMessage());
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ const stats = {
|
|||||||
template: /*language=HTML*/ `
|
template: /*language=HTML*/ `
|
||||||
<div class="stats-section">
|
<div class="stats-section">
|
||||||
<div class="stats-family">
|
<div class="stats-family">
|
||||||
<img src="/assets/platform/img/home/family.png"/>
|
<!-- <img src="/assets/platform/img/home/family.png"/>-->
|
||||||
</div>
|
</div>
|
||||||
<div class="stats-grid">
|
<div class="stats-grid">
|
||||||
<!-- 待办 -->
|
<!-- 待办 -->
|
||||||
|
|||||||
+2
-2
@@ -229,8 +229,8 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
|
|||||||
unions: [],
|
unions: [],
|
||||||
units: [],
|
units: [],
|
||||||
sexTypeOptions: [
|
sexTypeOptions: [
|
||||||
{ code: "男性", name: "男性" },
|
{ code: "男", name: "男" },
|
||||||
{ code: "女性", name: "女性" }
|
{ code: "女", name: "女" }
|
||||||
],
|
],
|
||||||
pickerOptions: {
|
pickerOptions: {
|
||||||
disabledDate: (time) => {
|
disabledDate: (time) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user