forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 28 Sep 2017
7:53 下午

adairkang

数据库死锁及违反唯一约束的异常处理

定义系统异常基类

添加异常处理的bean

Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  2. /forgon-tools/src/main/java/com/forgon/exception
    • -0
    • +22
    /forgon-tools/src/main/java/com/forgon/exception/service/ExceptionHandler.java
    • -0
    • +56
    /forgon-tools/src/main/java/com/forgon/exception/service/ExceptionHandlerImpl.java
    • -0
    • +18
    /forgon-tools/src/main/java/com/forgon/exception/SystemException.java
  6. /forgon-tools/src/main/java/com/forgon/exception/service
    • -0
    • +3
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
7:09 下午

yanweining

ZSYY-136：一次性物品与HRP物资系统接口申请数量转换
Options
    • -0
    • +13
    /ssts-web/src/main/resources/spring/projects/zsyy/his.xml
    • -0
    • +79
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/InvoicePlanDao.java
    • -0
    • +130
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -0
    • +228
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/syncDisposableGoodsApplicationForm.js
    • -0
    • +41
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -0
    • +21
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -0
    • +23
    /ssts-web/src/main/resources/spring/projects/zsyy/timer.xml
    • -0
    • +42
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/Constants.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +50
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManager.java
    • -0
    • +91
    /ssts-web/src/main/resources/config/zsyy/mybatis/InvoicePlanFromHERP_Mapper.xml
6:13 下午

cherry

增加一次性物品盘点场景
Options
    • -0
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -12
    • +24
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
4:18 下午

adairkang

跟前端的提示信息保持一致
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
1:49 下午

jeffli

省医：

扫描的批次库存不足时，文字和语音提示

扫描物品后，待发货列表顺序调整

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
1:47 下午

jeffli

省医：

扫描的批次库存不足时，文字和语音提示

扫描物品后，待发货列表顺序调整

Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -1
    • +67
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
Wednesday 27 Sep 2017
9:17 下午

chenjiaru

解决jira问题：优化省医提出来的两个问题：1、科室申请数据过滤的优化 2、申请单列表的鼠标悬停事件做成针对用户可配置
Options
    • -7
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
    • -0
    • +14
    /forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java
    • -0
    • +2
    /forgon-core/src/main/java/com/forgon/security/userdetails/DaoUserDetailImpl.java
    • -2
    • +31
    /ssts-web/src/main/webapp/personalSetting/modifySearchMode.js
    • -3
    • +7
    /forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
    • -0
    • +14
    /forgon-core/src/main/java/com/forgon/security/model/UserAttribute.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
6:10 下午

cherry

增加一次性物品退库和调拨场景
Options
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
    • -87
    • +130
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • -2
    • +20
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
2:54 下午

liuliben

添加一次性物品盘点单默认排序
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
1:36 下午

adairkang

invoicePlanManager和recyclingApplicationManager相互引用导致创建bean异常
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
10:12 上午

chenjiaru

解决jira问题： JMKQYY-3 查询不到灭菌记录，但灭菌状态为灭菌中
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -6
    • +12
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
    • -3
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
9:23 上午

adairkang

重构，js块变量在块外面引用，没有错，但是不好
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
Tuesday 26 Sep 2017
10:12 下午

adairkang

扫描灭菌炉添加所属科室判断
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
6:18 下午

zengjc

修复定期监测只有材料时，输入数量保存不了的问题.
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
6:04 下午

liuliben

聚合包导入方法改进
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
5:32 下午

jeffli

现在的发货计划页面右边的待发货物品列表,当鼠标点击某一行时背景色会变白，改为不调整其背景色
Options
    • -6
    • +6
    /ssts-web/src/main/webapp/common/common.css
2:57 下午

jeffli

修改错误文字
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/taskGroup/TaskGroup.java
2:44 下午

cherry

江门口腔增加聚合包的配置
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/jmkqyy/config.js
1:37 下午

liuliben

解决：材料盘点单默认排序,"名称"和一次性盘点单"外部编码"列头点击排序
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
1:37 下午

jeffli

加注释
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
Monday 25 Sep 2017
7:42 下午

chenjiaru

解决jira问题：ZSYY-151 单独申请不发货物品时回收之后科室申领找不到单
Options
    • -0
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
7:41 下午

shuyongfu

解决jira问题:JMKQYY-2 聚合包定义操作优化
Options
    • -11
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
7:36 下午

chenjiaru

解决jira问题：ZSYY-150 拆包申请的消毒物品无法读取器械包分组
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
7:12 下午

zengjc

修复质量监测所属科室过长，保存出错的问题.
Options
    • -1
    • +1
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
4:36 下午

liuliben

修改基础数据聚合包导入
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
4:20 下午

liuliben

修改聚合包导入导出代码
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
4:10 下午

liuliben

基础数据聚合包导入导出
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -1
    • +133
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
4:03 下午

zengjc

鼠标移进清洗记录的时候，标识牌篮筐的条码显示为器械包条码。
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
3:09 下午

adairkang

PDA清洗添加扫描标识牌条码的处理
Options
    • -0
    • +10
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
2:55 下午

zengjc

修复清洗扫描标识牌时，扫描标识牌删除，再扫描待清洗篮筐的节点不删除的问题，修复扫描标识牌保存清洗记录，打开显示篮筐条码的问题.
Options
    • -0
    • +26
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -4
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js