Commits · 36a36de7ba90a2b68323248832d6bd26ad55f744 · 王衍超 / cloud-fb · GitLab

31 May, 2021 2 commits
- 运输记录查询条件别名未设置 · 36a36de7
  高晓磊 authored May 31, 2021
  
  36a36de7 Browse Files
- 运输记录查询条件别名未设置 · b50c1974
  高晓磊 authored May 31, 2021
  
  b50c1974 Browse Files
30 May, 2021 3 commits
- 采砂许可证非作业时间报警和进入告警区报警 · 89a098c6
  高晓磊 authored May 30, 2021
  
  89a098c6 Browse Files
- 综合BI 专题 · 6d9b0025
  高晓磊 authored May 30, 2021
  
  6d9b0025 Browse Files
- 修改OA同步接口 · bbef2a0e
  shiwenbo authored May 30, 2021
  
  bbef2a0e Browse Files
28 May, 2021 8 commits
- 增加OA同步接口 · cb38293e
  shiwenbo authored May 28, 2021
  
  cb38293e Browse Files
- Merge branch 'feature/form_statistics_05' into 'develop' · b4e6a606
```
项目专题及部分合同专题查询组件

See merge request kunlun/xyst_dinas/xyst_dinas_backend!45
```
  史文博 authored May 28, 2021
  b4e6a606 Browse Files
- 项目专题及部分合同专题查询组件 · 45f22a15
  wukaiqiang authored May 28, 2021
  
  45f22a15 Browse Files
- 运输公司增加筛选条件 · db2abcd2
  高晓磊 authored May 28, 2021
  
  db2abcd2 Browse Files
- 价格趋势图排序 · 9d7d9c42
  高晓磊 authored May 28, 2021
  
  9d7d9c42 Browse Files
- 添加昆仑负责部门功能的功能树权限 · 42423d5e
  shiwenbo authored May 28, 2021
  
  42423d5e Browse Files
- 价格权限mk jmx修改 · a6c135ef
  高晓磊 authored May 28, 2021
  
  a6c135ef Browse Files
- 运输记录列表运输记录分析流域监控 mk提交 · 5a04229e
  高晓磊 authored May 28, 2021
  
  5a04229e Browse Files
27 May, 2021 24 commits
- 禁采区也不能有预警设置 · 37c09ea0
  高晓磊 authored May 27, 2021
  
  37c09ea0 Browse Files
- 运输记录统计(按照区域公司统计和按照砂石类型统计) · 78236d1f
  高晓磊 authored May 27, 2021
  
  78236d1f Browse Files
- 运输记录添加编码(流水号)字段 · a7d65a10
  高晓磊 authored May 27, 2021
  
  a7d65a10 Browse Files
- 采砂超采预警记录判断parentId错误 · 7b8ba62e
  高晓磊 authored May 27, 2021
  
  7b8ba62e Browse Files
- 流域类型的采区不新增预警设置 · 15fa4f4b
  高晓磊 authored May 27, 2021
  
  15fa4f4b Browse Files
- Merge branch 'feature/form_statistics_05' into 'develop' · 2b8acfdb
```
Feature/form statistics 05

See merge request kunlun/xyst_dinas/xyst_dinas_backend!44
```
  史文博 authored May 27, 2021
  2b8acfdb Browse Files
- 删除统计库下无用引用 · 52c001fe
  wukaiqiang authored May 27, 2021
  
  52c001fe Browse Files
- 运输记录增加自增编码(流水号) · d7ea73ad
  高晓磊 authored May 27, 2021
  
  d7ea73ad Browse Files
- 运输记录增加一个自增编码 · f0f68f36
  高晓磊 authored May 27, 2021
  
  f0f68f36 Browse Files
- 查询销售计划状态错误 · b7bcdd62
  高晓磊 authored May 27, 2021
  
  b7bcdd62 Browse Files
- 趋势图多出一条记录的问题 · a49f445e
  高晓磊 authored May 27, 2021
  
  a49f445e Browse Files
- 针对销售调度及预付款及结余调度增加控制判断。 · bd66ee2c
  wukaiqiang authored May 27, 2021
  
  bd66ee2c Browse Files
- 场站修改时不删除生产线 · 6574cc77
  高晓磊 authored May 27, 2021
  
  6574cc77 Browse Files
- Merge branch 'feature/form_statistics_05' into 'develop' · db67d701
```
预付款及结余汇总增加控制01

See merge request kunlun/xyst_dinas/xyst_dinas_backend!43
```
  wukaiqiang authored May 27, 2021
  db67d701 Browse Files
- Merge branch 'develop' into feature/form_statistics_05 · c98c413e
```
# Conflicts:
#	backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/scheduler/AdvancePaymentBalanceSumSchedulerTask.java
#	backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/scheduler/AdvancePaymentBalanceSumSchedulerTaskRegister.java
```
  wukaiqiang authored May 27, 2021
  c98c413e Browse Files
- 提交系统配置的引用 · 30913f82
  shiwenbo authored May 27, 2021
  
  30913f82 Browse Files
- 预付款及结余汇总增加控制01 · 88b9bf9c
  wukaiqiang authored May 27, 2021
  
  88b9bf9c Browse Files
- Merge branch 'feature/form_statistics_05' into 'develop' · 39c4e697
```
关闭预付款及结余汇总调度任务

See merge request kunlun/xyst_dinas/xyst_dinas_backend!42
```
  wukaiqiang authored May 27, 2021
  39c4e697 Browse Files
- 关闭预付款及结余汇总调度任务 · 26103eea
  wukaiqiang authored May 27, 2021
  
  26103eea Browse Files
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · fcfb2b95
  wukaiqiang authored May 27, 2021
  
  fcfb2b95 Browse Files
- 新增报表配置功能 · 18fbfb36
  wukaiqiang authored May 27, 2021
  
  18fbfb36 Browse Files
- 系统设置增加报表设置功能 · ff49b164
  shiwenbo authored May 27, 2021
  
  ff49b164 Browse Files
- 场站查询元数据增加联系人和联系方式 · 7c8abc7c
  shiwenbo authored May 27, 2021
  
  7c8abc7c Browse Files
- 场站查询元数据增加场站坐标 · 4fa5bbd4
  shiwenbo authored May 27, 2021
  
  4fa5bbd4 Browse Files
26 May, 2021 3 commits
- Merge branch 'feature/form_statistics_05' into 'develop' · 7c18b763
```
实时销售增加限制条件 limitNum

See merge request kunlun/xyst_dinas/xyst_dinas_backend!41
```
  wukaiqiang authored May 26, 2021
  7c18b763 Browse Files
- 实时销售增加限制条件 limitNum · d11424f6
  wukaiqiang authored May 26, 2021
  
  d11424f6 Browse Files
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · 7f4310c9
  shiwenbo authored May 26, 2021
  
  7f4310c9 Browse Files