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
Sunday 13 Mar 2016
11:14 下午

shuyongfu

4.0合并至4.1
Options
    • -1
    • +6
    /ssts-cszxyy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/cszxyy/dao/SyncOrgUnitAndUserDao.java
    • -0
    • +206
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/ProjectManagerImpl.java
    • -2
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -3
    • +14
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +32
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/project/model/ProjectDict.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  7. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project
    • -0
    • +8
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/StorageEntry.java
    • -1
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
  10. /ssts-datasync/src/main/java/com/forgon/disinfectsystem/project
    • -0
    • +16
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -9
    • +28
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +65
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/project/model/ProjectBalance.java
  15. /ssts-datasync/src/main/java/com/forgon/disinfectsystem/project/service
  16. … 22 more files in changeset.
Wednesday 09 Mar 2016
5:34 下午

jeffli

同步4.0稳定版的修改
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -0
    • +43
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
    • -0
    • +17
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.0.5_4.0.6.sql
  4. /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print
    • -3
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
    • -11
    • +128
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -7
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/importSingleStorage.jsp
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/img/logo.jpg
    • -6
    • +6
    /ssts-web/src/test/java/test/forgon/prepare/testForInvoicePlanStatus.json
  11. /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/img
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAORInvoiceManagerTests.java
    • -6
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/config/zsly/print/printConfig.js
    • -0
    • +1
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManager.java
  15. /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl
  16. … 26 more files in changeset.
5:33 下午

jeffli

同步4.0稳定版的修改
Options
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • -1
    • +9
    /forgon-core/src/main/java/com/forgon/dataupdater/service/UpdateDataBetween2VersionByExecSqls.java
    • -1
    • +2
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/action/SatisfactionSurveyTemplateAction.java
    • -0
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +266
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/GodownEntryItemPrintVO.java
    • -0
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
    • -3
    • +101
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/excel/service/ExcelUtils.java
    • -0
    • +251
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/PrintApplicationItemVO.java
    • -2
    • +6
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ImportSingleStorageController.java
  16. … 26 more files in changeset.
Monday 07 Mar 2016
11:49 下午

terrykwan

代码同步
Options
    • -5
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -5
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
11:47 下午

terrykwan

解决装配页面不是当前页面时，自动刷新导致页面变空白的问题
Options
    • -6
    • +8
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -5
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -1
    • +4
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
11:45 下午

terrykwan

打印申请单的名字统一
Options
    • -2
    • +4
    /ssts-web/src/main/resources/systemset/operationDefine.xml
11:42 下午

terrykwan

有效期的map的key改为packageType
Options
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
11:42 下午

terrykwan

去掉ajc编译的代码
Options
    • -10
    • +2
    /ssts-web/build.gradle
11:39 下午

terrykwan

解决XP IE8下自定义装配页面显示报错的问题
Options
    • -4
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.jsp
11:28 下午

terrykwan

有效期的map的key改为packageType
Options
    • -2
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -3
    • +6
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
11:27 下午

terrykwan

提交同步修改的代码
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -2
    • +0
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
11:26 下午

terrykwan

去掉不需要的常量定义
Options
    • -16
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
11:26 下午

terrykwan

默认禁用标识牌
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
Monday 29 Feb 2016
11:57 上午

adairkang

同步4.0的外部代理灭菌单的签收功能
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
Wednesday 24 Feb 2016
6:29 下午

jeffli

同步4.0稳定版的修改
Options
    • -0
    • +3
    /ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/webservice/manager/ZdwyWebServiceManagerImpl.java
6:29 下午

jeffli

同步4.0稳定版的修改
Options
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsly/config.js
    • -0
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/UpdateReviewBasketReviewRecordManyToMany.java
    • -0
    • +13
    /ssts-web/src/main/java/com/forgon/disinfectsystem/web/service/HomePageModelManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/disposableGoodInfoView.js
6:28 下午

jeffli

同步4.0稳定版的修改
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -12
    • +3
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -1
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManageImpl.java
    • -9
    • +12
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +4
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • -0
    • +2
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
    • -10
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +7
    /ssts-datasync-settlement-gyey-impl/src/main/java/com/forgon/disinfectsystem/settlement/service/SettlementWriteBackManagerImplForGYEY.java
    • -0
    • +5
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageRecordManagerImpl.java
    • -0
    • +5
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java
    • -0
    • +2
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/service/BarcodeManagerImpl.java
  16. … 33 more files in changeset.
Friday 19 Feb 2016
5:04 下午

jeffli

解决bug：

清洗不合格报表，不能同时支持sql server和oracle

Options
    • -0
    • +62
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
4:49 下午

jeffli

解决bug：

申请单列表界面，鼠标移到某一条记录上查看物品申请列表，消毒物品名称带下划线

Options
    • -0
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
Monday 15 Feb 2016
4:40 下午

terrykwan

解决jar通配符路径不正确的问题
Options
    • -1
    • +1
    /ssts-web/src/main/resources/struts.xml
12:24 下午

jeffli

测试用例调整
Options
    • -7
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java
    • -30
    • +211
    /ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java
    • -2
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java
Sunday 14 Feb 2016
6:58 下午

jeffli

测试用例调整
Options
    • -3
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java
    • -4
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java
    • -8
    • +12
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java
    • -5
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTaskTests.java
    • -8
    • +16
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingItemsForRecyclingRecord.java
    • -6
    • +13
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -6
    • +19
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingMaterialsTest.java
    • -14
    • +26
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java
    • -15
    • +21
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java
4:44 下午

jeffli

解决bug：

科室申领界面直接填写一次性物品数量后提交，包定义id为空

Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
4:11 下午

jeffli

解决bug：

科室申领界面直接填写物品数量后提交，包定义id为空

Options
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
4:05 下午

terrykwan

去掉调试的信息
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
3:16 下午

terrykwan

提交升级到java8.0后的代码
Options
    • -2
    • +2
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
    • -10
    • +9
    /forgon-core/src/main/java/com/forgon/directory/controller/PersonalSettingController.java
    • -4
    • +6
    /ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/action/StockTakerRecordController.java
    • -41
    • +0
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -2
    • +2
    /ssts-web/src/main/resources/spring/projects/zsly/HERP.xml
    • -0
    • +0
    /forgon-core/src/main/java/com/forgon/search/model/FullTextSearchCommand.java
    • -3
    • +3
    /forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/cszxyy/applicationContext-inventory-cszxyy.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/sznsfy/HIS.xml
    • -2
    • +0
    /forgon-core/src/main/java/com/forgon/security/tags/OperationTag.java
  11. /localrepo/org.hibernate/hibernate-commons-annotations/4.0.5.Final
    • -277
    • +8
    /ssts-web/src/main/resources/spring/applicationContext-common-authorization.xml
    • -28
    • +18
    /ssts-web/src/main/resources/spring/projects/gyey/timer.xml
    • -23
    • +1
    /forgon-core/src/main/java/com/forgon/oa/reminder/service/InformationReminderManagerImpl.java
    • -3
    • +0
    /forgon-core/src/main/java/com/forgon/attachfile/service/AttachFileManager.java
  16. … 285 more files in changeset.
3:09 下午

terrykwan

修改广医二院申请单的类型
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js
1:12 下午

jeffli

功能修改：

保存通用申请单时，判断消毒物品包定义是否是用于显示的。

Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:55 上午

jeffli

去下划线改造
Options
    • -19
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -35
    • +39
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • -25
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -4
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js
    • -5
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -3
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -9
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
    • -4
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js
    • -5
    • +0
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
    • -41
    • +0
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -1
    • +3
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -9
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAORInvoiceManagerTests.java
  16. … 74 more files in changeset.
11:11 上午

terrykwan

创建4.1.0分支，完成了去下划线的改造以及JAVA8的升级
Options
  1. /
    • binary
    /ssts-web/src/main/webapp/ext-3.4.0/resources/images/default/qtip/tip-sprite.gif
    • -0
    • +0
    /ssts-web/src/main/webapp/ext-3.4.0/resources/css/debug.css
    • binary
    /ssts-web/src/main/webapp/images/page_edit.png
    • -0
    • +0
    /ssts-stockmanage/.project
    • binary
    /ssts-web/src/main/webapp/ext-3.4.0/docs/resources/images/yourtheme/qtip/tip-sprite.gif
    • binary
    /ssts-web/src/main/webapp/ext-3.4.0/docs/resources/images/default/grid/row-sel.gif
  8. /ssts-web/src/main/webapp/ext-3.4.0/resources/images/yourtheme/dd
    • binary
    /ssts-web/src/main/webapp/images/image06.gif
    • -0
    • +0
    /ssts-web/src/main/webapp/ext-3.4.0/resources/css/theme-access/toolbar.css
    • -0
    • +0
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/WriteBackEntry.java
  12. /ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/dwr/table
    • binary
    /ssts-web/src/main/webapp/ext-4.1.0/resources/themes/images/gray/button/btn.gif
    • binary
    /ssts-web/src/main/webapp/ext-4.1.0/resources/themes/images/default/form/exclamation.gif
    • binary
    /ssts-web/src/main/webapp/ext-4.1.0/resources/themes/images/access/button/btn.gif
  16. … 14446 more files in changeset.