wangxianzhang
|
f064264383
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
94adfbfada
|
修改：
1.居民搜索，keyword条件sql位置调整
|
4 years ago |
zxc
|
e54ded8341
|
饼图修改
|
4 years ago |
|
zxc
|
d9f35290c6
|
添加查询居民分类配置show的并warn等于1的
|
4 years ago |
|
zxc
|
65b1bce49b
|
人员预警右侧列表小架子
人员类别配置添加
常用功能添加
|
4 years ago |
sunyuchao
|
ca3f532dbd
|
【基础信息】变更记录
|
4 years ago |
|
sunyuchao
|
1e3a213867
|
人员新增接口调整判断身份证号唯一，新增变更记录、变更明细数据
|
4 years ago |
|
sunyuchao
|
6c5f40867f
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
sunyuchao
|
84fa402af1
|
漏提文件
|
4 years ago |
|
zxc
|
ab11db590d
|
预警pie
|
4 years ago |
|
sunyuchao
|
2632dd99ca
|
人员调动
|
4 years ago |
|
wangxianzhang
|
83deccbc55
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
e895d2315c
|
新增：
1.社区查询-搜索居民 /icresiuser/search
|
4 years ago |
|
zxc
|
9fa6f05860
|
人员分类管理，常用功能
|
4 years ago |
yinzuomei
|
a739d1dfad
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
yinzuomei
|
f7c717741d
|
新建service_item_dict、需求分类删除居民积分+共建部分。删除需求记录sql
|
4 years ago |
|
wangxianzhang
|
1a1cca8aff
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
e24d9db24d
|
新增：
1.社区查询-搜索需求
修复：
2.社区查询-搜索房屋
|
4 years ago |
|
yinzuomei
|
5846ce237a
|
服务事项
|
4 years ago |
|
zxc
|
ebbb4539bc
|
新代码生成
删除文件生成顶部renren介绍
|
4 years ago |
|
zxc
|
d1b2889537
|
文件生成服务账户密码修改成root
|
4 years ago |
|
wangxianzhang
|
b52c18ff6f
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
83ee95ed24
|
新增：
1.社区查询-搜索房屋
|
4 years ago |
|
sunyuchao
|
8281ad1adb
|
调动、变更记录、变更明细表代码生成
|
4 years ago |
|
sunyuchao
|
3fae4181be
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
494f75aa27
|
分页方法调用调整
|
4 years ago |
|
zxc
|
64620db2ec
|
议题表决日统计
|
4 years ago |
jianjun
|
7b0260362d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3fc9b0b077
|
去掉mock数据
|
4 years ago |
|
jianjun
|
6d1e55e7ca
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_project_catagory' into dev
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
|
4 years ago |
|
jianjun
|
c31f526c0b
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
a023ee03eb
|
项目分类分析右侧列表所属网格调整为所属组织
|
4 years ago |
|
sunyuchao
|
6b1b3a4449
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
sunyuchao
|
062a1e5f8d
|
again
|
4 years ago |
zhaoqifeng
|
1a34993e41
|
脚本
|
4 years ago |
|
wangxianzhang
|
32b1be10dc
|
谁误删了.gitignore，这里找回来了
|
4 years ago |
|
jianjun
|
772752b9be
|
数字社区平台 1级项目分类数量 从业务库直接查询
|
4 years ago |
|
sunyuchao
|
28268653a5
|
..
|
4 years ago |
|
zhaoqifeng
|
2e85c54acf
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
zhaoqifeng
|
6396bd646b
|
备注
|
4 years ago |
|
sunyuchao
|
763edcd766
|
项目机关日统计程序优化
|
4 years ago |
|
zhaoqifeng
|
0fad17e961
|
计算两个日期之间的时间差(只包括工作日) 修改
|
4 years ago |
|
yinzuomei
|
41b5936dfe
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
d03f5f73a2
|
ic_user_demand_service添加server_name；指派和接单接口赋值
|
4 years ago |
|
yinzuomei
|
82c064db11
|
ic_user_demand_service添加server_name；指派和接单接口赋值
|
4 years ago |
|
zxc
|
bdc99114b7
|
groupAgencyDaily方法优化
|
4 years ago |
|
zxc
|
320757ed8b
|
statsGroupGridDailyTask优化
|
4 years ago |
|
zhaoqifeng
|
3215e83a7f
|
项目列表bug修改
项目添加项目耗时字段
|
4 years ago |
|
sunyuchao
|
15216eccf6
|
机关项目日统计程序调整优化
|
4 years ago |
|
sunyuchao
|
3943cf716e
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
Conflicts:
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
