forgon-ssts-v4.1.0 / ssts-idcard / src / main / java / com

forgon

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 10
Last Commit: 14 Feb 16
Commits this week: 0
Total Lines of Code (LoC): 6,408
Net change in LoC this week: 0

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
Monday 31 Jul 2017
9:23 上午

jeffli

解决：ZSYY-107

部分功能界面增加标识牌使用次数显示

Options
    • -0
    • +11
    ./disinfectsystem/idcarddefinition/util/IDCardDefinitionUtils.java
  2. … 8 more files in changeset.
Wednesday 26 Jul 2017
10:06 上午

jeffli

同步6.0修改
Options
    • -196
    • +0
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
  2. … 1 more file in changeset.
Tuesday 18 Jul 2017
2:51 下午

jeffli

解决：ZSYY-103

标识牌小标签打印格式调整

Options
    • -0
    • +3
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
  2. … 7 more files in changeset.
9:42 上午

jeffli

解决：ZSYY-104

新增标识牌使用状态和补充打印功能调整

Options
    • -1
    • +1
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
  2. … 4 more files in changeset.
Wednesday 05 Jul 2017
7:32 下午

adairkang

不需要这个构造方法
Options
    • -4
    • +0
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java
3:23 下午

adairkang

GDSRMYY-334 增加回收清点时自动归还借物功能

之前清洗交接未提交的代码

Options
    • -0
    • +15
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManager.java
    • -0
    • +76
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java
  3. … 62 more files in changeset.
Thursday 18 May 2017
2:51 下午

adairkang

ZSYY-62 丢失和报废功能增加“丢失/报废原因”内容填写区域

objectDao对集合的查询，单次查询的in语句添加数量限制，数量多的时候，多次查询

材料定义的Manager(MaterialDefinitionManager)继承自BasePoManager

Options
    • -3
    • +16
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
  2. … 58 more files in changeset.
Friday 07 Apr 2017
10:27 上午

jeffli

解决：ZSYY-46

标识牌器械包打印格式增加描述内容

Options
    • -0
    • +5
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
  2. … 1 more file in changeset.
Monday 27 Mar 2017
10:35 下午

wangyi

完成：DGZYY-69，装配可以不补充材料，回收时自动关联包实例未补充材料明细
Options
    • -8
    • +6
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • -4
    • +3
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java
  3. … 111 more files in changeset.
Wednesday 15 Mar 2017
4:44 下午

jeffli

解决：GZFDZL-100

器械包管理下面增加新页面，“标识牌信息”页面。

改进自动废弃标识牌功能，废弃之后自动新建一个使用中的实例

Options
  1. ./disinfectsystem/idcardinstance/dwr/table
    • -0
    • +31
    ./disinfectsystem/idcardinstance/dwr/table/IdCardInstanceTableManager.java
4:43 下午

jeffli

解决：GZFDZL-100

器械包管理下面增加新页面，“标识牌信息”页面。

改进自动废弃标识牌功能，废弃之后自动新建一个使用中的实例

Options
  1. ./disinfectsystem/idcardinstance/dwr
  2. … 2 more files in changeset.
4:43 下午

jeffli

解决：GZFDZL-100

器械包管理下面增加新页面，“标识牌信息”页面。

改进自动废弃标识牌功能，废弃之后自动新建一个使用中的实例

Options
    • -20
    • +4
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • -0
    • +2
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManager.java
    • -0
    • +27
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java
  4. … 8 more files in changeset.
9:57 上午

jeffli

解决：GZFDZL-98

器械包管理-器械包定义管理-标识牌页面-标识牌实例列表增加“第一次回收的时间”字段

Options
    • -1
    • +5
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
  2. … 3 more files in changeset.
Friday 02 Dec 2016
1:55 下午

jeffli

器械包定义-标识牌条码（号码）不能隐藏

广州复大肿瘤医院GZFDZL-85

Options
    • -0
    • +10
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
  2. … 4 more files in changeset.
Thursday 01 Dec 2016
11:06 上午

jeffli

器械包定义标识牌废弃功能

中山市小榄人民医院ZSSXLRMYY-100

Options
    • -1
    • +2
    ./disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java
    • -3
    • +6
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • -1
    • +1
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java
  4. … 1 more file in changeset.
Friday 18 Nov 2016
2:07 下午

adairkang

清洗交接添加状态验证，只有清洗完成才能进行清洗交接
Options
    • -1
    • +2
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManager.java
    • -6
    • +5
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java
  3. … 12 more files in changeset.
Wednesday 16 Nov 2016
2:44 下午

adairkang

清洗交接功能
Options
    • -1
    • +2
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java
    • -8
    • +5
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
  3. … 17 more files in changeset.
Thursday 08 Sep 2016
1:37 下午

jeffli

打开包定义时，只加载标识牌定义，实例和材料，需要选中某一个标识牌才会加载。

添加标识牌，直接添加到数据库

废弃标识牌，要点更新标识牌

添加材料，修改材料，删除材料之后，要点保存材料才能写到数据库。

去掉了以前的保存按钮。

所有的保存或者更新，只针对当前选中的标识牌

Options
    • -0
    • +13
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java
    • -18
    • +57
    ./disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java
    • -2
    • +4
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java
    • -357
    • +175
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • -0
    • +25
    ./disinfectsystem/idcarddefinition/dwr/table/IDCardDefinitionTableManager.java
  6. … 3 more files in changeset.
7:53 上午

jeffli

优化加载标识牌数据的代码，定义和实例，材料分开查询。
Options
    • -0
    • +6
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java
    • -57
    • +121
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
7:52 上午

jeffli

优化加载标识牌数据的代码，定义和实例，材料分开查询。
Options
    • -0
    • +6
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java
    • -0
    • +1
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManager.java
    • -0
    • +16
    ./disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java
  4. … 1 more file in changeset.
Tuesday 06 Sep 2016
9:19 上午

adairkang

打印包内清单（DGDHYY-56）
Options
    • -8
    • +4
    ./disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java
  2. … 3 more files in changeset.
Monday 18 Jul 2016
4:22 下午

jeffli

解决bug：

回收扫描时，器械保养代码报空指针异常

优化判断是否启用器械保养的代码

Options
    • -1
    • +4
    ./disinfectsystem/idcardinstance/util/IDCardInstanceUtils.java
  2. … 1 more file in changeset.
Thursday 30 Jun 2016
2:56 下午

zengjc

1.修正器械到期进行保养时，js报错问题.

2.修正器械保养不能根据时间保养的问题。

Options
    • -27
    • +18
    ./disinfectsystem/idcardinstance/util/IDCardInstanceUtils.java
  2. … 1 more file in changeset.
Wednesday 29 Jun 2016
7:32 下午

wangyi

标识牌删除后状态还原到回收之前的状态；同一张回收单标识牌切换篮筐不验证篮筐状态。
Options
    • -2
    • +0
    ./disinfectsystem/idcardinstance/util/IDCardInstanceUtils.java
  2. … 7 more files in changeset.
7:09 下午

zengjc

增加器械包保养功能.解决jira问题GDSRMYY-39
Options
    • -0
    • +100
    ./disinfectsystem/idcardinstance/util/IDCardInstanceUtils.java
  2. … 21 more files in changeset.
Sunday 12 Jun 2016
2:49 下午

jeffli

器械包定义中,增加材料排序功能：

广东省人民医院GDSRMYY-34

Options
    • -3
    • +19
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
  2. … 3 more files in changeset.
Monday 06 Jun 2016
11:47 上午

jeffli

同步4.0修改
Options
    • -1
    • +1
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
  2. … 38 more files in changeset.
Friday 15 Apr 2016
4:48 下午

jeffli

同步4.0的修改
Options
    • -0
    • +22
    ./disinfectsystem/idcarddefinition/dwr/table/IDCardDefinitionTableManager.java
  2. … 4 more files in changeset.
Friday 01 Apr 2016
9:52 下午

terrykwan

完成了标识牌使用次数修改的功能
Options
    • -0
    • +37
    ./disinfectsystem/idcardinstance/action/IDCardInstanceAction.java
    • -0
    • +3
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManager.java
    • -0
    • +27
    ./disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java
    • -4
    • +8
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • -1
    • +1
    ./disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java
  6. … 2 more files in changeset.
Monday 28 Mar 2016
7:45 下午

terrykwan

同步4.0的修改
Options
    • -0
    • +1
    ./disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
  2. … 21 more files in changeset.