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
Saturday 19 Mar 2016
3:16 下午

jeffli

同步4.0稳定版的修改
Options
    • -12
    • +48
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:52 下午

terrykwan

解决触摸屏回收添加的包器械包定义ID为空导致报错的问题
Options
    • -0
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -6
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
11:43 上午

terrykwan

修改为广州复大肿瘤的配置
Options
    • -3
    • +3
    /ssts-web/src/main/resources/jdbc.properties
9:28 上午

terrykwan

取科室名称时，修改为名称默认不包含科室所属的分类，解决组织机构的科室名称有多级时，登记使用记录时，验证的科室名称不对的问题
Options
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
Friday 18 Mar 2016
11:28 下午

terrykwan

解决空指针问题
Options
    • -9
    • +16
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
7:31 下午

terrykwan

解决变量名找不到的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
6:49 下午

terrykwan

先注释掉timer相关定义，避免java8下无法启动
Options
    • -7
    • +5
    /ssts-web/src/main/resources/spring/projects/gzfdzl/timer.xml
10:50 上午

wangyi

外来器械报表增加权限
Options
    • -1
    • +6
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
Thursday 17 Mar 2016
11:15 下午

terrykwan

同步4.0的代码
Options
    • -54
    • +0
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
4:42 下午

wangyi

4.0代码迁移到4.1上
Options
    • -7
    • +7
    /ssts-web/src/main/webapp/jasperRtp/EOGoods_child_1.jrxml
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/useRecordOperatorSubView.jrxml
    • -3
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
    • -0
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • -3
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/UntracableRecyclingApplicationAction.java
    • -5
    • +5
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jasper
    • -9
    • +9
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml
    • -28
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • -69
    • +113
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • -231
    • +209
    /ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jrxml
    • -14
    • +17
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
  16. … 41 more files in changeset.
10:45 上午

jeffli

同步4.0稳定版的修改
Options
    • -1
    • +14
    /ssts-web/src/main/webapp/js/common.js
    • -0
    • +8
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/util/DiposableGoodsUtils.java
    • -0
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -7
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
    • -1
    • +124
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -1
    • +9
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -15
    • +55
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DiposableGoods.java
    • -0
    • +23
    /forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
8:06 上午

terrykwan

提交从4.0同步的代码
Options
  1. /ssts-web/src/main/webapp/imageShow
    • -0
    • +43
    /ssts-web/src/main/webapp/imageShow/imageShow.jsp
    • -0
    • +199
    /ssts-web/src/main/webapp/imageShow/imageShow.js
8:05 上午

terrykwan

解决invoicePlanID属性的代码合并问题
Options
    • -1
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Wednesday 16 Mar 2016
7:34 下午

terrykwan

解决UTF-8下中文乱码的问题
Options
    • -6
    • +6
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseDeliverDetailVO.java
7:32 下午

terrykwan

解决UTF-8下中文乱码的问题
Options
    • -1
    • +1
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/StorageEntry.java
    • -3
    • +3
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • -6
    • +6
    /forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
    • -2
    • +2
    /ssts-cszxyy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/cszxyy/dao/SyncOrgUnitAndUserDao.java
7:11 下午

terrykwan

提交从4.0同步的代码
Options
    • -26
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -11
    • +12
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +1
    /ssts-web/src/main/webapp/search/searchresultsByExt.jsp
    • -0
    • +8
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -2
    • +14
    /ssts-web/src/main/webapp/js/configUtils.js
    • -29
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
7:05 下午

terrykwan

提交从4.0同步的代码
Options
    • -24
    • +44
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
    • -148
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView2.js
    • -4
    • +19
    /ssts-web/src/main/webapp/debug/print/printDebug.js
    • -71
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView2.jsp
  6. /ssts-web/src/main/resources/config/gzfdzl/mybatis
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
    • -18
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/zsly/print/printConfig.js
    • -6
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationForm.js
    • -0
    • +403
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab.js
    • -3
    • +122
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -0
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
  13. /ssts-web/src/main/webapp/disinfectsystem/interfere
    • -0
    • +10
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java
    • -0
    • +22
    /ssts-web/src/main/resources/config/gzfdzl/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  16. … 34 more files in changeset.
6:27 下午

terrykwan

提交从4.0同步的代码
Options
    • -15
    • +39
    /build.gradle
6:26 下午

terrykwan

提交从4.0同步的代码
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
  2. /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/test
    • -1
    • +17
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
    • -0
    • +12
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManager.java
    • -0
    • +0
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/test/LogonTest.java
6:26 下午

terrykwan

提交从4.0同步的代码
Options
    • -3
    • +23
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -31
    • +28
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -5
    • +61
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseDeliverDetailVO.java
    • -2
    • +3
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseItemVO.java
    • -78
    • +85
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -1
    • +82
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -44
    • +33
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/YearWorkloadBean.java
    • -5
    • +95
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +20
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseApplicationVO.java
    • -2
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +22
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
  16. … 5 more files in changeset.
2:53 下午

terrykwan

提交从4.0同步的代码
Options
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • -170
    • +6
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -2
    • +10
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/ExpressRecyclingVo.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -4
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
    • -0
    • +6
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -4
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
    • -3
    • +0
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -4
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
12:13 下午

terrykwan

提交从4.0同步的代码
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
9:23 上午

terrykwan

提交从4.0同步的代码
Options
    • -1
    • +1
    /ssts-expiration/src/main/java/com/forgon/disinfectsystem/expirationdateinfo/service/ExpirationDateInfoManagerImpl.java
9:19 上午

terrykwan

提交从4.0同步的代码
Options
    • -6
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
9:12 上午

terrykwan

提交从4.0同步的代码
Options
    • -10
    • +2
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java
    • -0
    • +1
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/StorageEntry.java
    • -0
    • +1
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/WriteBackEntry.java
12:39 上午

terrykwan

提交basedata模块从4.0同步的代码
Options
    • -0
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
    • -30
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java
    • -1
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java
    • -7
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DiposableGoodBatchStock.java
    • -2
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialinstance/MaterialInstance.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -0
    • +39
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
    • -0
    • +81
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseDiposableGoodsItem.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
    • -0
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • -1
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
    • -2
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
12:29 上午

terrykwan

提交从4.0同步的代码
Options
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -3
    • +53
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
12:29 上午

terrykwan

提交core模块从4.0同步的代码
Options
    • -23
    • +16
    /forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java
    • -0
    • +2
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -1
    • +5
    /forgon-core/src/main/java/com/forgon/dataupdater/service/UpdateDataBetween2VersionByExecSqls.java
    • -0
    • +7
    /forgon-core/src/main/java/com/forgon/log/model/Log.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -2
    • +10
    /forgon-core/src/main/java/com/forgon/directory/acegi/tools/AcegiHelper.java
    • -86
    • +0
    /forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -4
    • +4
    /forgon-core/src/main/java/com/forgon/log/service/LogManager.java
    • -0
    • +12
    /forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java
Tuesday 15 Mar 2016
8:52 下午

terrykwan

修改为通过jsonlib的api进行JSON转换，解决某些情况下转换的json字符串的兼容性问题
Options
    • -4
    • +14
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
8:50 下午

terrykwan

重命名变量
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java