jianjun
|
4cd7e07fff
|
去掉拦截器里面的 更新人和更新时间默认取创建里的值得逻辑
|
3 years ago |
|
jianjun
|
36247a9363
|
更新时间设置为空 利用拦截器统一填充
|
3 years ago |
|
jianjun
|
db2ea6e75c
|
避免空指针
|
3 years ago |
|
jianjun
|
6847bccdcd
|
居民导出 获取支部
|
3 years ago |
wangxianzhang
|
6e954ca9d1
|
修改：【居民信息导入】所属支部的查询调整
|
3 years ago |
zhangyuan
|
53fc5eb722
|
Merge branch 'feature/statistical_zhy'
|
3 years ago |
|
zhangyuan
|
3be8476f5d
|
防止空指针
|
3 years ago |
|
zhangyuan
|
eb05d02cf1
|
Merge branch 'feature/statistical_zhy'
|
3 years ago |
|
zhangyuan
|
3890c7da3e
|
调整合计的位置
|
3 years ago |
sunyuchao
|
4f06cbdc05
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
sunyuchao
|
75cebe497d
|
Merge branch 'dev_bugfix_ljj'
|
3 years ago |
|
wangxianzhang
|
a2bcf00622
|
Merge branch 'bugfix_resiimport_agencyerror'
|
3 years ago |
|
sunyuchao
|
58d959362c
|
居民信息修改 bug修复
|
3 years ago |
|
jianjun
|
c547f89630
|
Merge remote-tracking branch 'remotes/origin/dev_zhili'
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
|
3 years ago |
|
wangxianzhang
|
891aae733a
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into bugfix_resiimport_agencyerror
|
3 years ago |
zhaoqifeng
|
aa1c85c2a2
|
Merge branch 'dev_party_mange'
|
3 years ago |
zxc
|
27e2ad1f33
|
协办单位微调
|
3 years ago |
|
zhangyuan
|
679afd76cd
|
fly位置错误
|
3 years ago |
|
zhangyuan
|
dddc7d8342
|
fly名称修改
|
3 years ago |
|
zhangyuan
|
f2df81452f
|
flyway脚本
|
3 years ago |
|
zhangyuan
|
798cbc69a9
|
同步原型图
|
3 years ago |
|
zhangyuan
|
f08ccb7512
|
到处判断
|
3 years ago |
|
zhaoqifeng
|
59709ee239
|
根据身份证判断居民在小程序端是否是志愿者
|
3 years ago |
yinzuomei
|
468fc146c8
|
Merge remote-tracking branch 'origin/dev_zhili'
|
3 years ago |
|
zhangyuan
|
bbfcb88f7b
|
增加合计
|
3 years ago |
|
zhangyuan
|
b04805b471
|
完善导出
|
3 years ago |
|
zhaoqifeng
|
85c48ee54b
|
根据身份证判断居民在小程序端是否是志愿者
|
3 years ago |
|
zhangyuan
|
3727208391
|
调整统计的结果
|
3 years ago |
|
yinzuomei
|
11ca6505d5
|
detail
|
3 years ago |
|
zhangyuan
|
0397fc16e0
|
sql调整
|
3 years ago |
|
zhangyuan
|
76dbe9aecd
|
无日期查询当日
|
3 years ago |
|
wangxianzhang
|
6ff124cd4a
|
【居民信息导入】AGENCY_ID应该取所属网格的上级，而不是从当前登录人员的agencyId中取
|
3 years ago |
|
zhangyuan
|
985b257a17
|
bug
|
3 years ago |
|
jianjun
|
2053cd7eb0
|
Merge remote-tracking branch 'remotes/origin/dev_party_mange'
|
3 years ago |
|
zhangyuan
|
5d842bacc6
|
完善页面查询
|
3 years ago |
|
zhangyuan
|
b783eb4b01
|
修改统计逻辑
|
3 years ago |
|
zhaoqifeng
|
77fc8e3e24
|
党员相关bug修改
|
3 years ago |
|
zhangyuan
|
c3ec06ec2c
|
网格判断del=0
|
3 years ago |
HAHA
|
d6b5fb9766
|
更新flyaway，删除经纬度逻辑
|
3 years ago |
|
HAHA
|
f20dcaa5f5
|
删除IcVolunteerPolyCategory表经纬度
|
3 years ago |
|
zhangyuan
|
43bcadeffc
|
dim表筛选数据
|
3 years ago |
|
jianjun
|
73c382d6b7
|
Merge remote-tracking branch 'remotes/origin/dev_party_mange'
|
3 years ago |
|
zhangyuan
|
c88dc8873f
|
灵活统计
|
3 years ago |
|
HAHA
|
a66304cb76
|
编辑注释
|
3 years ago |
|
jianjun
|
7a426a491e
|
Merge remote-tracking branch 'remotes/origin/dev_party_mange'
|
3 years ago |
|
HAHA
|
c5ce744a15
|
饼图枚举类
|
3 years ago |
Jackwang
|
ec3f9fa678
|
新增一级党组织bug修改
|
3 years ago |
|
jianjun
|
4c11923f2e
|
Merge remote-tracking branch 'remotes/origin/dev_party_mange'
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
# epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
3 years ago |
|
jianjun
|
37c819b738
|
Merge remote-tracking branch 'remotes/origin/dev_zhili'
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
|
3 years ago |
|
zhangyuan
|
2024ff0127
|
sql bug
|
3 years ago |
