yinzuomei
|
c7d7f06971
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
e0a03528ed
|
灵山卫客户
|
4 years ago |
|
yinzuomei
|
741342d3d3
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
sunyuchao
|
a493a1cc18
|
Merge branch 'dev_routine_work' into dev
|
4 years ago |
|
sunyuchao
|
20aa12201d
|
bug修改
|
4 years ago |
wangxianzhang
|
a6829ccbc1
|
修改：
1。网格员数据统计-分页被手误的注释掉了
|
4 years ago |
jianjun
|
74a0d3a696
|
Merge remote-tracking branch 'remotes/origin/dev_hotfix' into dev
|
4 years ago |
|
yinzuomei
|
4dd690055b
|
评价内容审核非空
|
4 years ago |
|
wangxianzhang
|
6167404194
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
47c9e92540
|
修改：
1.CustomerOrgRedis中未找到网格不抛异常，改由业务代码处理
|
4 years ago |
|
yinzuomei
|
de8c8f1dfd
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
c7ab35741b
|
查询修改下，赋值areaName
|
4 years ago |
|
wangxianzhang
|
fcc25cdce8
|
Merge branch 'dev_routine_work' into dev
|
4 years ago |
|
wangxianzhang
|
ae19eea8e2
|
修改：
1.工作人员工作统计：导出excel，bean中数据类型修改
|
4 years ago |
|
yinzuomei
|
04a868e0fb
|
根组织不修改areaCode
|
4 years ago |
|
yinzuomei
|
8cdeaa6ead
|
bugfix
|
4 years ago |
|
yinzuomei
|
b6e0edfe4b
|
修改组织测试下
|
4 years ago |
|
jianjun
|
46b332bdf1
|
Merge remote-tracking branch 'remotes/origin/dev_ic_mp' into dev
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
|
4 years ago |
|
yinzuomei
|
deade0aeff
|
修改组织测试下
|
4 years ago |
|
sunyuchao
|
0aab5c5639
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
11e6566b8a
|
......
|
4 years ago |
zxc
|
9edee12fa3
|
边框
|
4 years ago |
|
jianjun
|
f059a9ccf9
|
巡查显示小时分钟 没有为0
|
4 years ago |
|
zxc
|
be0c5f97a3
|
预约时间段
|
4 years ago |
|
jianjun
|
89c8b9b644
|
巡查显示小时分钟
|
4 years ago |
|
jianjun
|
1a8730d7ed
|
Merge branch 'dev_routine_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_routine_work
|
4 years ago |
|
jianjun
|
c30dd19903
|
巡查显示小时分钟
|
4 years ago |
|
zxc
|
36484f8fa1
|
emm
|
4 years ago |
|
sunyuchao
|
05ad8a7928
|
代码调整
|
4 years ago |
zhaoqifeng
|
ba2341a9c1
|
【网格员工作统计】项目列表导出
|
4 years ago |
|
zxc
|
8a94bdf6a5
|
mingzi
|
4 years ago |
|
zhaoqifeng
|
e16cc96043
|
【网格员工作统计】项目列表导出
|
4 years ago |
|
wangxianzhang
|
a0647dec93
|
Merge remote-tracking branch 'origin/dev_routine_work' into dev_routine_work
|
4 years ago |
|
wangxianzhang
|
7e038381c3
|
修改：
1.网格员工作统计，巡查时长单位改为h
|
4 years ago |
|
zhaoqifeng
|
6bc5f8ecec
|
【网格员工作统计】项目列表导出
|
4 years ago |
|
zhaoqifeng
|
b5bd230be6
|
【网格员工作统计】项目列表
|
4 years ago |
|
wangxianzhang
|
542e5a7c0e
|
修改：
1.由于线上提前修改表结构，此处作废flyway中的部分sql脚本语句
|
4 years ago |
|
jianjun
|
2e848062c8
|
统计例行工作脚本
|
4 years ago |
|
yinzuomei
|
4c89b5c531
|
居民端报事，工作端回复后。 居民端我的报事-》进入处理中
|
4 years ago |
|
wangxianzhang
|
5931d46f4a
|
Merge branches 'dev' and 'dev_routine_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_routine_work
|
4 years ago |
|
yinzuomei
|
db83e7b7c1
|
pc完成情况修改
|
4 years ago |
|
sunyuchao
|
1abf21dd9d
|
bug修改
|
4 years ago |
|
yinzuomei
|
5c42840d8d
|
志愿者注册修改提示
|
4 years ago |
|
yinzuomei
|
72681bc1c2
|
/heart/icresidemanddict/subcodelist返回awardPoint
|
4 years ago |
|
zhaoqifeng
|
0ba51f8ff2
|
【网格员工作统计】项目列表
|
4 years ago |
|
yinzuomei
|
f5636ae46b
|
钉钉报错处理screen_party_user_rank_data
|
4 years ago |
|
wangxianzhang
|
26a70dcf74
|
Merge remote-tracking branch 'origin/dev_routine_work' into dev_routine_work
|
4 years ago |
|
wangxianzhang
|
fc8dccb286
|
修改：
1.入参时间格式修改为：yyyyMMdd
|
4 years ago |
|
zhaoqifeng
|
d504ebd164
|
【网格员工作统计】项目列表导出
|
4 years ago |
|
wangxianzhang
|
fb8b5af362
|
修改：
1.网格员工作统计查询，时间范围调整为包含endTime；放弃使用全量方式查询，改用sum(增量)方式统计，以防止漏掉
|
4 years ago |
