forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 46
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 46
Total Lines of Code (LoC): 0
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

Changeset 39787 is being indexed.

Tuesday 18 Mar
11:47 上午

zc.li

JMKQYYEQ-3

现场项目转移到Linux系统后几乎所有报表无法显示数据的问题(部分报表字体由宋体改为SansSerif，如签收统计报表)

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthDetail_child_1.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkload.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollection2.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/departSatisfyDetailReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/yearWorkload.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/departSatisfy.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkloadDisposableGood.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationSummaryReport_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationDetailedReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/MorrowSendReportView.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollection5.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/departSatisfyReport.jasper
  16. … 127 more files in changeset.
11:46 上午

frank.qiu

解决了 QYSRMYY-72 - 【器械包定义管理】器械包列表新增扩展列【技术难度】和【权重分】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
11:46 上午

zc.li

注释补充
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
Monday 17 Mar
6:34 下午

zc.li

提交部分文件的宋体修改 JMKQYYEQ-3

现场项目转移到Linux系统后几乎所有报表无法显示数据的问题

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/signGoods.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/signGoods.jasper
6:05 下午

frank.qiu

解决了 SSTS-738 - 在质量监测中已经触发显示的元素，在切换原触发项的选项值为不触发的选项后，已经显示的元素不会自动隐藏
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
5:41 下午

zc.li

增加c3p0日志输出到log4j文件 启动时需配置jvm参数 -Dcom.mchange.v2.log.MLog=com.mchange.v2.log.log4j.Log4jMLog；增加获取连接池信息接口 ；修复一些连接可能泄露的地方
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
5:35 下午

feng.rui

selenium3提交：扫描标识牌后增加等待时间，增加稳定性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackProxy.java
5:29 下午

zc.li

完善 SSTS-609 终止申请物品或申请单时，检验所在篮筐内的是否全部终止，如果是，则修改篮筐状态
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
3:33 下午

frank.qiu

解决了 SSTS-741 - 历史外部代理灭菌单中，点开已存在的包名称，弹出的包图片窗口的包名称信息为undefined的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
3:26 下午

frank.qiu

解决了 SZSDSRMYY-188 - 从SPD接收物品时创建器械包定义改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
2:37 下午

frank.qiu

提交小程序后台基础代码 QHRSGZZYY-2 【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/wechat/disinfectionProjectConfigInfo.js
2:33 下午

frank.qiu

提交小程序后台基础代码 QHRSGZZYY-2 【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/wechat/img/loginBg.jpg
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/wechat/img
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/wechat/img/bgImage.jpg
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/wechat/spring/security/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/wechat/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/wechat/img/logo.png
11:10 上午

frank.qiu

解决了 QHRSGZZYY-2 - 【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/userFormExt.js
10:57 上午

jason

解决jira问题：QHRSGZZYY-2【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/directory/service/SysUserManagerImpl.java
10:54 上午

jason

解决jira问题：QHRSGZZYY-2【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/directory/service/SysUserManagerImpl.java
10:22 上午

frank.qiu

解决了 QHRSGZZYY-2 - 【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/userFormExt.js
Sunday 16 Mar
3:08 下午

terry.kwan

解决:JMKQYYEQ-3 ，alpine Linux，openjdk1.8环境下，由于代码中用到了sun.misc.BASE64Decoder和BASE64Decoder的API，openjdk没有相关类导致启动报错的问题。将sun.misc.BASE64Decoder和BASE64Decoder的API换成了java8标准的Base64 API。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JDBCConnection.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/exportMonitorData.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/crypto/coder/CoderEncryption.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/dataQueryAsistant.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/tools/crypto/coder/CoderEncryptionTests.java
2:39 下午

terry.kwan

解决:JMKQYYEQ-3 ,Alpine Linux，OpenJDK 1.8环境下，jackson相关jar包兼容性问题导致启动时出现java.lang.NoClassDefFoundError: javax/xml/bind/JAXBException错误的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-cxf.xml
2:33 下午

terry.kwan

解决:JMKQYYEQ-3 ，alpine Linux，openjdk1.8环境下，由于代码中用到了com.sun.image.codec.jpeg.*的API，openjdk没有相关类导致启动报错的问题。将com.sun.image.codec.jpeg.*的API换成了java8标准的ImageIO API。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseImageProcessAction.java
2:26 下午

terry.kwan

解决:JMKQYYEQ-3 ,Alpine Linux，OpenJDK 1.8环境下，jackson相关jar包兼容性问题导致启动时出现java.lang.NoClassDefFoundError: javax/xml/bind/JAXBException错误的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
2:19 下午

terry.kwan

去掉多余的;
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboardsConfig.js
Friday 14 Mar
6:36 下午

frank.qiu

解决了 SSTS-740 - 【发货管理】一次性物品的显示模式改进(显示为树状形态)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/fontSize15/styles/common.css
6:27 下午

jason

解决jira问题：QHRSGZZYY-2【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/spring/security/applicationContext-acegi-security.xml
6:21 下午

zc.li

SSTS-744 定时废弃器械包功能的检查和优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/AutoWasteOutdateTousseInstancesTask.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
6:15 下午

jason

解决jira问题：QHRSGZZYY-2【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/directory/controller/UserController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
  4. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qhrsgzzyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo/WeChatMiniProgForeignTousseApplicationVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/action/UserAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo/WeChatMiniProgForeignTousseMaterialVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/controller/ForeignTousseApplicationWeChatMiniProgramController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/SysUserManager.java
  11. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo/ForeignTousseSaveVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dto/WeChatMiniProgForeignTousseMaterialDto.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/userExtViewForDisable.js
  16. … 18 more files in changeset.
2:38 下午

zc.li

增加c3p0日志输出到log4j文件 启动时需配置jvm参数 -Dcom.mchange.v2.log.MLog=com.mchange.v2.log.log4j.Log4jMLog；增加获取连接池信息接口 ；修复一些连接可能泄露的地方
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
2:23 下午

shuyongfu

处理:HNSETYY-8 【PDA】新增功能模块【消毒供应室中心物品领用】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManager.java
11:57 上午

jason

解决jira问题： SSTS-740 - 【发货管理】一次性物品的显示模式改进(显示为树状形态)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/model/DiposableGoodsItemVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoiceDiposableGoodsItemSummaryVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoiceDiposableGoodsItemVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/model/DiposableGoodsInvoiceItemVo.java
11:46 上午

jason

解决jira问题： SSTS-740 - 【发货管理】一次性物品的显示模式改进(显示为树状形态)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/model/DiposableGoodsItemVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/model/DiposableGoodsInvoiceItemVo.java
11:43 上午

zc.li

提交小程序后台基础代码 QHRSGZZYY-2 增加供应商
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/wechat/service/UserInfoOfProjectManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/wechat/service/UserInfoManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/wechat/dto/SaveUserInfoOfProjectDTO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/wechat/entry/UserInfoOfProject.java