forgon-ssts-v4.1.0 / forgon-core / src

main

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 4
Total Committers: 18
Last Commit: 14 Feb 16
Commits this week: 4
Total Lines of Code (LoC): 70,142
Net change in LoC this week: 105

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 21 Aug 2018
1:43 下午

jeffli

版本升级优化，报错时不启动
Options
    • -0
    • +1
    ./java/com/forgon/dataupdater/service/DataUpdater.java
Saturday 18 Aug 2018
3:12 下午

yanweining

增加获得当前用户的科室action方法

排班模块：排班查询默认当前科室

Options
    • -0
    • +15
    ./java/com/forgon/directory/action/OrgUnitAction.java
  2. … 5 more files in changeset.
Wednesday 15 Aug 2018
9:27 上午

yanweining

排班：排班定义表，排班信息表，用户排班表
Options
    • -0
    • +1
    ./java/com/forgon/log/model/Log.java
  2. … 4 more files in changeset.
Monday 13 Aug 2018
3:11 下午

jeffli

解决问题：

打开外部代理灭菌单列表报错

材料里面有x时，打开列表界面都会报错

Options
    • -5
    • +5
    ./java/com/forgon/results/handler/LendGoodsBriefHandler.java
Thursday 26 Jul 2018
3:14 下午

shuyongfu

解决Jira问题:GYEY-701 外来器械、外部代理灭菌实现多个供应室处理
Options
    • -1
    • +1
    ./java/com/forgon/Constants.java
  2. … 19 more files in changeset.
2:46 下午

jeffli

objectDao改造，同时支持悲观锁和乐观锁
Options
    • -2
    • +1
    ./java/com/forgon/filedownload/service/FileDownLoadManagerImpl.java
  2. … 8 more files in changeset.
Wednesday 25 Jul 2018
2:21 下午

jeffli

sql工具类优化，in集合条件换成大集合的方法
Options
    • -1
    • +1
    ./java/com/forgon/workflow/service/WorkFlowApprovalAuthorizationManagerImpl.java
    • too large
    ./java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -1
    • +1
    ./java/com/forgon/security/service/RoleManagerImpl.java
  4. … 10 more files in changeset.
Tuesday 17 Jul 2018
10:24 上午

jeffli

重构代码
Options
    • -2
    • +2
    ./java/com/forgon/system/activity/service/ActivityAspect.java
Friday 13 Jul 2018
12:00 下午

jeffli

装配并发改为2个，发货改为3个
Options
    • -2
    • +2
    ./java/com/forgon/system/activity/service/ActivityManager.java
11:00 上午

yanweining

GZSZYYGZHC-30：部分功能页面改进
Options
    • -3
    • +6
    ./java/com/forgon/serialnumber/service/SerialNumManagerImpl.java
    • -0
    • +1
    ./java/com/forgon/oa/initdata/bean/SerialNums.java
    • -0
    • +1
    ./java/com/forgon/serialnumber/model/SerialNum.java
  4. … 3 more files in changeset.
Thursday 12 Jul 2018
4:52 下午

jeffli

并发活动控制代码重构
Options
    • -0
    • +82
    ./java/com/forgon/system/activity/service/ActivityAdvice.java
    • -2
    • +32
    ./java/com/forgon/system/activity/service/ActivityManager.java
    • -3
    • +6
    ./java/com/forgon/system/activity/service/ActivityAspect.java
4:52 下午

jeffli

并发活动控制代码重构
Options
    • -0
    • +30
    ./java/com/forgon/system/activity/service/ActivityPointcut.java
    • -0
    • +76
    ./java/com/forgon/system/activity/service/ActivityAspectInterceptor.java
    • -1
    • +0
    ./java/com/forgon/system/activity/model/Activity.java
    • -5
    • +12
    ./java/com/forgon/system/activity/model/AmountControl.java
Thursday 05 Jul 2018
8:06 下午

niutou_ren

复大肿瘤2期现场演示后问题修复与改进：

1、3个问题的修复（供应商添加注册证时，一次性物品没有显示规格；供应商手工添加的需要授权的一次性物品的注册证在保存时没有删除掉；有授权记录的一次性物品的注册证不允许删除）；

2、证件的图片，增加了查看原图的功能；

3、添加了权限--供应商证件告警权限

Options
    • -1
    • +1
    ./java/com/forgon/Constants.java
  2. … 17 more files in changeset.
Monday 25 Jun 2018
9:18 上午

jeffli

系统信息功能
Options
    • -0
    • +6
    ./java/com/forgon/system/system/model/SystemInfo.java
    • -1
    • +11
    ./java/com/forgon/system/system/controller/SystemController.java
  3. ./java/com/forgon/system/system/service
    • -0
    • +29
    ./java/com/forgon/system/system/service/SystemManager.java
  5. … 1 more file in changeset.
Friday 22 Jun 2018
9:20 上午

jeffli

增加系统信息界面，查看当前系统信息
Options
    • -0
    • +37
    ./java/com/forgon/system/system/controller/SystemController.java
  2. ./java/com/forgon/system/system/model
    • -0
    • +82
    ./java/com/forgon/system/system/model/SystemInfo.java
  4. ./java/com/forgon/system/system/controller
  5. ./java/com/forgon/system/system
  6. … 3 more files in changeset.
Wednesday 20 Jun 2018
5:41 下午

jeffli

增加活动管理，限制并发执行的任务，查看当前正在执行的任务
Options
    • -1
    • +4
    ./java/com/forgon/system/activity/service/ActivityAspect.java
  2. … 2 more files in changeset.
5:05 下午

jeffli

增加活动管理，限制并发执行的任务，查看当前正在执行的任务
Options
    • -1
    • +2
    ./java/com/forgon/system/activity/service/ActivityAspect.java
  2. ./java/com/forgon/system/activity/controller
    • -0
    • +42
    ./java/com/forgon/system/activity/controller/ActivityController.java
  4. … 3 more files in changeset.
4:39 下午

yanweining

新增合同管理,新增设备参数
Options
    • -0
    • +9
    ./java/com/forgon/security/bean/ModuleOperationMapping.java
    • -0
    • +1
    ./java/com/forgon/log/model/Log.java
    • -0
    • +2
    ./java/com/forgon/attachfile/model/AttachFile.java
    • -0
    • +4
    ./java/com/forgon/systemsetting/model/HttpOption.java
  5. … 18 more files in changeset.
2:36 下午

shuyongfu

科室干预-修改科室编码、名称等联动更新调整
Options
    • too large
    ./java/com/forgon/directory/service/OrgUnitManagerImpl.java
Friday 15 Jun 2018
5:19 下午

niutou_ren

数据库升级语句，RelevancyGoodsAuthorization表中，expensiveGoodsIds的长度变成500，expensiveGoodsName的长度变成4000
Options
    • -1
    • +1
    ./java/com/forgon/Constants.java
  2. … 2 more files in changeset.
Thursday 14 Jun 2018
9:54 上午

jeffli

增加活动管理，限制并发执行的任务，查看当前正在执行的任务
Options
  1. ./java/com/forgon/system
    • -0
    • +40
    ./java/com/forgon/system/activity/service/ActivityManager.java
    • -0
    • +15
    ./java/com/forgon/system/activity/model/ActivityException.java
  4. ./java/com/forgon/system/activity/action
    • -0
    • +81
    ./java/com/forgon/system/activity/model/ActivityInfo.java
  6. ./java/com/forgon/system/activity
  7. ./java/com/forgon/system/activity/model
    • -0
    • +102
    ./java/com/forgon/system/activity/service/ActivityAspect.java
  9. ./java/com/forgon/system/activity/service
    • -0
    • +53
    ./java/com/forgon/system/activity/model/AmountControl.java
    • -0
    • +22
    ./java/com/forgon/system/activity/model/Activity.java
    • -0
    • +41
    ./java/com/forgon/system/activity/action/ActivityAction.java
  13. … 4 more files in changeset.
Friday 08 Jun 2018
3:05 下午

jeffli

江门市中心医院JMSZXYY-71

器械包退货重发后第二次的发货单没有显示

江门市中心医院JMSZXYY-65

器械包二次退货时退货科室不正确

Options
    • -1
    • +1
    ./java/com/forgon/Constants.java
  2. … 2 more files in changeset.
Thursday 07 Jun 2018
1:53 下午

simon.bai

解决：JMSZXYY-20 密码安全性问题优化
Options
    • -6
    • +7
    ./java/com/forgon/directory/action/PersonalSettingAction.java
  2. … 4 more files in changeset.
Tuesday 05 Jun 2018
6:49 下午

adairkang

GZSZYYGZHC-17 高值耗材申请单打印增加打印功能
Options
    • -2
    • +60
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -0
    • +4
    ./java/com/forgon/workflow/model/WorkFlowApprovalTask.java
    • -1
    • +8
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java
    • -2
    • +27
    ./java/com/forgon/workflow/vo/WorkFlowApprovalTaskVO.java
  5. … 16 more files in changeset.
5:01 下午

jeffli

优化Hibernate，启用 dynamic update
Options
    • -1
    • +1
    ./resources/com/forgon/oa/po/publicinformation/PublicInformation.hbm.xml
    • -1
    • +1
    ./resources/com/forgon/attachfile/model/AttachFile.hbm.xml
    • -0
    • +4
    ./java/com/forgon/portal/model/PortalColumn.java
    • -0
    • +4
    ./java/com/forgon/log/model/Log.java
    • -1
    • +1
    ./resources/com/forgon/security/acls/domain/AclSid.hbm.xml
    • -0
    • +4
    ./java/com/forgon/oa/attendance/model/Festival.java
    • -1
    • +1
    ./resources/com/forgon/security/acls/domain/AclClass.hbm.xml
    • -0
    • +4
    ./java/com/forgon/security/model/Group.java
    • -0
    • +4
    ./java/com/forgon/directory/model/CssdHandleTousses.java
    • -0
    • +4
    ./java/com/forgon/security/model/Operation.java
    • -0
    • +4
    ./java/com/forgon/portal/model/PortalPage.java
    • -1
    • +1
    ./resources/com/forgon/security/acls/domain/AclEntry.hbm.xml
    • -0
    • +4
    ./java/com/forgon/security/model/UserAttribute.java
    • -0
    • +4
    ./java/com/forgon/security/model/Role.java
    • -0
    • +4
    ./java/com/forgon/directory/model/CssdServiceDepts.java
  16. … 247 more files in changeset.
Monday 04 Jun 2018
10:02 下午

niutou_ren

供应商证件的管理(复大肿瘤二期)

1、供应商页面，增加对证件的管理；

2、增加供应商与证件的导入，以及证件图片的导入（基础数据导入导出）

Options
    • -1
    • +17
    ./java/com/forgon/excel/service/ExcelUtils.java
  2. … 37 more files in changeset.
6:52 下午

yanweining

代码优化
Options
    • -1
    • +1
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
5:55 下午

yanweining

GZSZYYGZHC-20:高值耗材审批功能增加独立授权功能
Options
    • -6
    • +6
    ./java/com/forgon/workflow/model/WorkFlowApprovalTask.java
    • -1
    • +1
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
  3. … 1 more file in changeset.
Friday 01 Jun 2018
8:20 下午

yanweining

GZSZYYGZHC-20:高值耗材审批功能增加独立授权功能
Options
    • -0
    • +154
    ./java/com/forgon/workflow/action/WorkFlowApprovalAuthorizationAction.java
    • -2
    • +6
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java
    • -0
    • +1
    ./java/com/forgon/log/model/Log.java
    • -11
    • +102
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -0
    • +44
    ./java/com/forgon/workflow/service/WorkFlowApprovalAuthorizationManager.java
    • -0
    • +232
    ./java/com/forgon/workflow/service/WorkFlowApprovalAuthorizationManagerImpl.java
    • -0
    • +151
    ./java/com/forgon/workflow/model/WorkFlowApprovalAuthorization.java
  8. … 11 more files in changeset.
6:02 下午

simon.bai

处理 DGKHYY-5个人桌面中的科室申领改进
Options
    • -1
    • +1
    ./java/com/forgon/Constants.java
  2. … 4 more files in changeset.