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
Friday 01 Sep 2017
4:42 下午

adairkang

重构TousseDefinitionManager的根据id查找对象的方法
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -65
    • +215
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -2
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java
    • -4
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
    • -6
    • +3
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java
    • -3
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -7
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
    • -6
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -6
    • +5
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -4
    • +1
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java
  16. … 3 more files in changeset.
4:00 下午

yanweining

一次性物品管理：显示物资编码 update
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
3:51 下午

zengjc

解决jira问题SZNSRMYY-6，一次性物品入库单，导入excel模板格式增加物资编码列。
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/diposable.xls
3:29 下午

adairkang

简单重构
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js
    • -4
    • +10
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • -1
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:06 下午

chenjiaru

解决jira问题： CSSD-47 科室申领模块申请外来器械改进
Options
    • -5
    • +5
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
2:21 下午

chenjiaru

解决jira问题： GDSRMYY-364 增加科室申领的物品列宽
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
11:57 上午

zengjc

提交清洗扫描标识牌，带出绑定的篮筐的处理.
Options
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java
11:25 上午

chenjiaru

修复申请模块自动化测试通不过的问题
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
11:15 上午

adairkang

初始装载数量的最大值问题
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp
Thursday 31 Aug 2017
10:15 下午

adairkang

自动拆包的排序
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +92
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/ForeignTousseSplitVo.java
    • -0
    • +38
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/ForeignTousseSplitMaterialVo.java
10:12 下午

chenjiaru

解决jira问题： GDSRMYY-338 外来器械申请单允许同一张申请单申请多套外来器械
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -21
    • +36
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketsRecyclingSequenceTests.java
    • -4
    • +9
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • -68
    • +70
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
    • -4
    • +9
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java
    • -0
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestForeignTousseGoodRecyclingApplication.java
9:17 下午

adairkang

ZSYY-116 自定义入篮筐和篮筐装载装配优化

输入装载数量清除输入时刷新待装载数量

回收清点界面添加篮筐序号显示

篮筐删除同时刷新篮筐序号

Options
    • -0
    • +7
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManager.java
    • -0
    • +10
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManagerImpl.java
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp
    • -0
    • +13
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
8:21 下午

zengjc

解决jira问题SZSZYY-2，修复自定义表单数据保存后，列表查看不到的问题.
Options
    • -0
    • +1
    /ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/service/FormInstanceManagerImpl.java
6:30 下午

adairkang

修改一下注释的位置
Options
    • -2
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
6:14 下午

cherry

去掉或替换dowait或sleep为jswait

Options
    • -4
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Materials_Godown_Entry.java
    • -15
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
    • -5
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/PackingHistory.java
    • -2
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -1
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/UserRecord.java
    • -12
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
    • -3
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
    • -6
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
    • -5
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • -15
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java
5:11 下午

adairkang

ZSYY-116 自定义入篮筐和篮筐装载装配优化
Options
    • -3
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +31
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManager.java
    • -0
    • +60
    /ssts-web/src/test/java/test/forgon/tools/util/BarcodeOperatorsTests.java
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcodepredicate/BarcodePredicate.java
    • -34
    • +157
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +11
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingBasketItemVo.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  12. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcodepredicate
    • -0
    • +29
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcodepredicate/BarcodeOperators.java
    • -0
    • +71
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/ClassifyBasketRecyclingSequence.java
    • -0
    • +2
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/recyclingrecord/AllTests.xml
  16. … 14 more files in changeset.
4:43 下午

zengjc

jira问题DGZYY-118，灭菌质量监测报表添加‘灭菌炉分组’过滤.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -6
    • +42
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizerQuality.js
    • -0
    • +16
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
3:20 下午

zengjc

修复没有灭菌记录的包扫条码录质量监测报错的问题.
Options
    • -1
    • +3
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
1:54 下午

shuyongfu

no_comment
Options
    • -1
    • +0
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
9:42 上午

shuyongfu

陈国强发回来的东莞中医院现场配置
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
Wednesday 30 Aug 2017
8:12 下午

adairkang

清洗记录Manager继承BasePoManager
Options
    • -4
    • +2
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java
    • -16
    • +5
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -9
    • +6
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
    • -4
    • +7
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
    • -3
    • +2
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
7:57 下午

adairkang

修改参数名称
Options
    • -1
    • +1
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
6:03 下午

chenjiaru

解决jira问题：HZSRMYY-30 外来器械包申请列表新增列
Options
    • -1
    • +58
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
    • -0
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java
5:09 下午

shuyongfu

解决jira问题:SZNSRMYY-7 移动护理接口开发。
Options
    • -0
    • +49
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
3:14 下午

yanweining

fsfy：inventorydao接口 编码改为utf-8
Options
    • -5
    • +5
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/fsfy/InventoryDaoImpl.java
2:44 下午

jeffli

解决bug：

装配界面，扫描篮筐grid，全选之后，标识牌条码框不会隐藏

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:43 下午

jeffli

标识牌自动创建隐藏的清洗篮筐
Options
    • -0
    • +1
    /build.gradle
2:43 下午

jeffli

标识牌自动创建隐藏的清洗篮筐
Options
    • -1
    • +3
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java
    • -0
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcarddefinition/IDCardDefinition.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
    • -2
    • +53
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • -4
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • -0
    • +31
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
10:40 上午

chenjiaru

个人桌面显示外部代理灭菌的图标的功能做成可配置
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js
    • -0
    • +5
    /ssts-web/src/main/webapp/homepage/portalPage.js
Tuesday 29 Aug 2017
3:17 下午

adairkang

彻底删除托盘类型及包实例上的托盘条码(数据库中的字段没有删除)

修复容器管理中，选择类型报错的问题

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -33
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
    • -43
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -2
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -24
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -3
    • +2
    /ssts-web/src/test/java/test/forgon/tools/json/JSONTest.java
    • -11
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView.js