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
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.
4:11 下午

yanweining

WorkFlowApprovalTask增加字段:是否为流程定义的节点的待办任务
Options
    • -6
    • +14
    ./java/com/forgon/workflow/model/WorkFlowApprovalTask.java
Thursday 31 May 2018
1:34 下午

alan.lee

解决：广州市中医院GZSZYY-26用户管理将所属科室清空后页面上找不到这个用户（代码优化）
Options
    • -9
    • +1
    ./java/com/forgon/directory/action/UserAction.java
  2. … 1 more file in changeset.
11:44 上午

yanweining

GZSZYYGZHC-21:审批任务中增加勾选项目
Options
    • -14
    • +16
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
Wednesday 30 May 2018
4:22 下午

adairkang

GZS12RMYY-21 待回收的申请单，在回收时自动归还的处理
Options
    • -1
    • +3
    ./java/com/forgon/log/enums/ApplicationLogStatusEnum.java
  2. … 1 more file in changeset.
2:06 下午

yanweining

GZSZYYGZHC-21:审批任务中增加勾选项目
Options
    • -0
    • +40
    ./java/com/forgon/workflow/vo/WorkFlowApprovalTaskVO.java
    • -1
    • +32
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -0
    • +2
    ./java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java
    • -0
    • +7
    ./java/com/forgon/workflow/service/WorkFlowManagerImpl.java
    • -0
    • +13
    ./java/com/forgon/workflow/model/NodeDefinition.java
    • -1
    • +45
    ./java/com/forgon/workflow/model/WorkFlowApprovalTask.java
  7. … 7 more files in changeset.
Tuesday 29 May 2018
8:48 下午

alan.lee

解决JIRA问题：广州市中医院GZSZYY-26 用户管理将所属科室清空后页面上找不到这个用户
Options
    • -0
    • +8
    ./java/com/forgon/directory/action/UserAction.java
Saturday 26 May 2018
3:19 下午

yanweining

GZSZYYGZHC-15:高值耗材功能模块界面列表增加显示字段

我的待办任务、已办任务：申请科室、病人姓名、住院号、医生、手术时间。

自购入库、预入库列表：将目前的入库单号改成显示申请单号。列名也叫：申请单号

Options
    • -3
    • +8
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -1
    • +1
    ./java/com/forgon/workflow/model/WorkFlowApprovalTask.java
  3. … 6 more files in changeset.
Friday 25 May 2018
10:27 上午

jeffli

中航LED接口代码优化，增加日志
Options
    • -6
    • +28
    ./java/com/forgon/device/ZHLEDControllerManager.java
Thursday 17 May 2018
5:15 下午

jeffli

增加字符串转日期函数
Options
    • -0
    • +125
    ./java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • -3
    • +7
    ./java/com/forgon/Constants.java
Wednesday 16 May 2018
12:39 上午

shuyongfu

解决Jira问题:GZSZYYGZHC-13 高值耗材申请单改进
Options
    • -0
    • +10
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
  2. … 1 more file in changeset.