Evaluation license expires Fri Dec 24 21:00:00 CST 2337

ZhongJi/itsm/itsm-webapp/src

main

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 7
Last Commit: 12 四月 22
Commits this week: 0
Total Lines of Code (LoC): 4,787
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
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
星期二 20 九月 2022
11:16 上午

andy

中集28人天二开需求7：

邮件回访评分可以二次编辑：

1.三个工作日不评价的默认满意

2.满意度选项调整为:满意、非常满意、不满意、非常不满意

3.满意度选项可以在回访事项中手动调整，调整按钮有权限才可以看到

导出请求数据添加回访字段：

1.请求导出添加2个字段：满意度和满意是否默认

2.满意度显示请求回访的满意度

3.满意是否默认显示是否是三个工作日不评价的默认满意

4.添加回访内容字段

Options
    • -0
    • +15
    ./java/com/sinba/itsm/job/ScanReturnVisitsRegularly.java
    • -0
    • +3
    ./resources/i18n/itilbase_zh_TW.properties
    • -0
    • +9
    ./webapp/pages/itsm/request/requestDetailsFormCustom.jsp
    • -0
    • +20
    ./webapp/scripts/common/tools/visit/returnVisitManage.js
    • -1
    • +1
    ./webapp/scripts/itsm/project/projectVisit.js
    • -0
    • +6
    ./resources/i18n/itilbase_cn.properties
    • -0
    • +122
    ./java/com/sinba/itsm/job/Impl/IUserReturnVisitJobServiceImpl.java
    • -2
    • +2
    ./webapp/scripts/itsm/request/requestAction.js
    • -0
    • +3
    ./resources/i18n/itilbase_jp.properties
    • -0
    • +4
    ./webapp/pages/index.jsp
  11. ./java/com/sinba/itsm/job/Impl
    • -0
    • +3
    ./resources/i18n/itilbase_ja_JP.properties
    • -0
    • +3
    ./resources/i18n/itilbase_en_US.properties
    • -0
    • +7
    ./java/com/sinba/itsm/job/IUserReturnVisitJobService.java
    • -0
    • +1
    ./webapp/pages/common/tools/scheduledTask/scheduledTasksManage.jsp
  16. … 24 more files in changeset.
10:43 上午

steven

#页面新增【变更结果】的选项，变更成功or 变更失败，字段数据可导出
Options
    • -3
    • +2
    ./webapp/scripts/itsm/change/changeMain.js
  2. … 1 more file in changeset.
10:41 上午

steven

#导出添加请求的处理方式
Options
    • -0
    • +4
    ./resources/i18n/itilbase_tw.properties
    • -1
    • +5
    ./resources/i18n/itilbase_cn.properties
    • -1
    • +5
    ./resources/i18n/itilbase_zh_CN.properties
    • -0
    • +4
    ./resources/i18n/itilbase_zh_TW.properties
    • -1
    • +4
    ./resources/i18n/itilbase_ja_JP.properties
    • -1
    • +5
    ./resources/i18n/itilbase_en_US.properties
    • -2
    • +5
    ./resources/i18n/itilbase_jp.properties
  8. … 8 more files in changeset.
9:41 上午

steven

#国际化
Options
    • -0
    • +1
    ./webapp/scripts/i18n/i18n_zh_CN.js
    • -0
    • +1
    ./webapp/scripts/i18n/i18n_en_US.js
    • -1
    • +2
    ./resources/i18n/itilbase_tw.properties
    • -0
    • +1
    ./resources/i18n/itilbase_ja_JP.properties
    • -0
    • +1
    ./resources/i18n/itilbase_en_US.properties
    • -0
    • +1
    ./resources/i18n/itilbase_cn.properties
    • -0
    • +1
    ./resources/i18n/itilbase_jp.properties
    • -0
    • +1
    ./webapp/scripts/i18n/i18n_ja_JP.js
    • -0
    • +1
    ./webapp/scripts/i18n/i18n_zh_TW.js
    • -0
    • +1
    ./resources/i18n/itilbase_zh_CN.properties
    • -1
    • +3
    ./resources/i18n/itilbase_zh_TW.properties
  12. … 7 more files in changeset.
9:06 上午

steven

#1、请求用户模块，“请求用户”默认为空，设置为必填

#2、新增工单时，选择人员时通过检索邮箱地址定位到AD用户

Options
    • -1
    • +1
    ./webapp/scripts/itsm/app/autocomplete/autocomplete.js
    • -5
    • +5
    ./webapp/scripts/itsm/request/requestCommon.js
  3. … 1 more file in changeset.
8:56 上午

steven

#针对无效工单 新增工单状态为“取消”

#关单的时候验证：处理方式和解决方案 为必填项

Options
    • -0
    • +0
    ./resources/i18n/itilbase_cn.properties
    • -1
    • +4
    ./webapp/scripts/itsm/request/requestDetailsFormCustom.js
    • -1
    • +1
    ./webapp/scripts/i18n/i18n_en_US.js
    • -0
    • +1
    ./resources/i18n/itilbase_zh_CN.properties
    • -0
    • +19
    ./webapp/scripts/itsm/request/requestAction.js
    • -0
    • +1
    ./resources/i18n/itilbase_en_US.properties
    • -0
    • +1
    ./resources/i18n/itilbase_jp.properties
    • -0
    • +2
    ./resources/i18n/itilbase_ja_JP.properties
    • -1
    • +1
    ./webapp/scripts/i18n/i18n_ja_JP.js
    • -0
    • +1
    ./webapp/scripts/i18n/i18n_zh_TW.js
    • -0
    • +22
    ./webapp/pages/itsm/request/includes/requestActionHtml.jsp
    • -0
    • +1
    ./webapp/scripts/i18n/i18n_zh_CN.js
    • -0
    • +0
    ./resources/i18n/itilbase_tw.properties
    • -2
    • +2
    ./resources/i18n/itilbase_zh_TW.properties
    • -3
    • +8
    ./webapp/pages/itsm/request/requestDetailsFormCustom.jsp
  16. … 8 more files in changeset.
星期一 19 九月 2022
9:35 上午

steven

#解决时长相关：导出列表需要添加相应完成的具体时间

#新增一个字段 直接显示超期时长（单位：分钟），未超期单显示0

Options
    • -1
    • +4
    ./resources/i18n/itilbase_tw.properties
    • -0
    • +4
    ./resources/i18n/itilbase_zh_CN.properties
    • -0
    • +4
    ./resources/i18n/itilbase_ja_JP.properties
    • -1
    • +5
    ./resources/i18n/itilbase_cn.properties
    • -1
    • +6
    ./resources/i18n/itilbase_en_US.properties
    • -0
    • +4
    ./resources/i18n/itilbase_zh_TW.properties
    • -1
    • +6
    ./resources/i18n/itilbase_jp.properties
  8. … 12 more files in changeset.
星期五 16 九月 2022
5:27 下午

sam

显示需求

1、请求详细、请求列表 中请求人所属机构字段（显示分公司名称、所属产业）

2、在导出基础数据时，列表中新增请求人邮箱、所属产业、企业名称，将请求人所属机构信息导出

--修改变更和问题 变更列表以及变更详细 问题列表列表详细中 现实所属机构和邮箱 导出中加上邮箱，所属产业，企业名称

Options
    • -0
    • +4
    ./webapp/scripts/i18n/i18n_zh_TW.js
    • -1
    • +3
    ./webapp/scripts/itsm/problem/problemMain.js
    • -0
    • +7
    ./webapp/scripts/i18n/i18n_en_US.js
    • -0
    • +0
    ./resources/i18n/itilbase_tw.properties
    • -0
    • +4
    ./resources/i18n/itilbase_zh_CN.properties
    • -0
    • +31
    ./webapp/pages/itsm/change/changeDetail.jsp
    • -0
    • +2
    ./webapp/scripts/i18n/i18n_ja_JP.js
    • -1
    • +8
    ./resources/i18n/itilbase_jp.properties
    • -1
    • +1
    ./resources/hibernate.properties
    • -0
    • +4
    ./resources/i18n/itilbase_cn.properties
    • -0
    • +25
    ./webapp/pages/itsm/problem/problemDetails.jsp
    • -0
    • +4
    ./webapp/scripts/i18n/i18n_zh_CN.js
    • -1
    • +1
    ./resources/config.properties
    • -0
    • +4
    ./resources/i18n/itilbase_ja_JP.properties
    • -0
    • +4
    ./resources/i18n/itilbase_zh_TW.properties
  16. … 32 more files in changeset.
12:35 下午

andy

修复隐藏请求类型后，工单切换后修改有请求类型非空验证
Options
    • -4
    • +4
    ./webapp/scripts/itsm/request/publicAddRequest.js
    • -2
    • +2
    ./webapp/scripts/itsm/request/editRequestFormCustom.js
10:29 上午

ciel

#1.请求编号生成规则调整为根据请求分类编码生成，原有旧数据不用做调整，保持原有编码

2.在标题未填写时，先请求分类不自动添加标题描述

3.编辑后重新匹配sla，未算挂起时间（非工作日情况处理）

Options
    • -1
    • +4
    ./resources/i18n/itilbase_en_US.properties
    • -1
    • +4
    ./resources/i18n/itilbase_jp.properties
    • -0
    • +3
    ./resources/i18n/itilbase_zh_CN.properties
    • -1
    • +1
    ./webapp/pages/common/config/formCustom/formCustomDesign.jsp
    • -0
    • +3
    ./resources/i18n/itilbase_ja_JP.properties
    • -0
    • +4
    ./resources/i18n/itilbase_zh_TW.properties
    • -0
    • +4
    ./resources/i18n/itilbase_tw.properties
    • -1
    • +1
    ./webapp/pages/common/config/formCustom/defaultField.jsp
    • -0
    • +3
    ./resources/i18n/itilbase_cn.properties
  10. … 8 more files in changeset.
星期二 13 九月 2022
11:22 上午

andy

中集二开：需求三
Options
    • -6
    • +11
    ./webapp/scripts/common/security/userUtil.js
    • -4
    • +8
    ./webapp/scripts/itsm/request/addRequestFormCustom.js
    • -5
    • +8
    ./webapp/pages/itsm/portal/leftMenu.jsp
    • -4
    • +4
    ./webapp/pages/itsm/request/requestDetailsFormCustom.jsp
    • -270
    • +283
    ./webapp/pages/leftMenu.jsp
    • -1
    • +10
    ./webapp/scripts/index.js
    • -0
    • +13
    ./webapp/scripts/itsm/portal/helpdeskPortal.js
    • -2
    • +2
    ./webapp/pages/common/config/formCustom/defaultField.jsp
    • -5
    • +5
    ./webapp/scripts/itsm/request/requestMain.js
  10. … 2 more files in changeset.
星期三 24 八月 2022
12:05 下午

ciel

#位置提示去除
Options
    • -1
    • +1
    ./webapp/pages/common/tools/map/mapMain_subPage.jsp
11:56 上午

ciel

#附件后缀添加格式
Options
    • -2
    • +2
    ./webapp/scripts/itsm/request/publicAddRequest.js
    • -2
    • +2
    ./webapp/WEB-INF/classes/md5/md5.properties
    • -1
    • +1
    ./webapp/scripts/common/attachment/util.js
    • -1
    • +1
    ./webapp/pages/setting.jsp
    • -1
    • +15
    ./webapp/pages/common/config/includes/includes_chooseAttachment.jsp
    • -1
    • +1
    ./webapp/pages/index.jsp
    • -1
    • +1
    ./webapp/scripts/basics/initUploader.js
    • -1
    • +1
    ./webapp/scripts/common/attachment/commonUploadAtta.js
    • -0
    • +1
    ./webapp/scripts/common/tools/event/eventAttachment.js
    • binary
    ./webapp/images/attachicons/unknown.gif
    • -1
    • +1
    ./webapp/scripts/common/tools/file/attachIcon.js
  12. … 1 more file in changeset.
星期一 11 七月 2022
4:23 下午

ciel

#请求分类调整为必填
Options
    • -1
    • +1
    ./webapp/scripts/common/config/formCustom/formControlImpl.js
    • -3
    • +3
    ./webapp/pages/common/config/formCustom/defaultField.jsp
    • -1
    • +1
    ./webapp/pages/common/config/formCustom/formCustomDesign.jsp
2:58 下午

steven

#调整中集的需求
Options
    • -0
    • +2
    ./resources/i18n/itilbase_ja_JP.properties
    • -0
    • +2
    ./resources/i18n/itilbase_tw.properties
    • -5
    • +7
    ./resources/i18n/itilbase_en_US.properties
    • -0
    • +2
    ./resources/i18n/itilbase_cn.properties
    • -1
    • +3
    ./resources/i18n/itilbase_jp.properties
    • -0
    • +2
    ./resources/i18n/itilbase_zh_TW.properties
    • -0
    • +2
    ./resources/i18n/itilbase_zh_CN.properties
  8. … 8 more files in changeset.
星期日 10 七月 2022
4:06 下午

steven

#展示机构以及邮箱
Options
    • -0
    • +6
    ./resources/i18n/itilbase_ja_JP.properties
    • -0
    • +1
    ./webapp/scripts/i18n/i18n_en_US.js
    • -0
    • +12
    ./webapp/pages/itsm/request/requestDetailsFormCustom.jsp
    • -0
    • +6
    ./resources/i18n/itilbase_tw.properties
    • -0
    • +1
    ./webapp/scripts/i18n/i18n_zh_TW.js
    • -0
    • +6
    ./resources/i18n/itilbase_zh_CN.properties
    • -0
    • +5
    ./resources/i18n/itilbase_cn.properties
    • -3
    • +4
    ./webapp/scripts/itsm/request/requestMain.js
    • -0
    • +6
    ./resources/i18n/itilbase_zh_TW.properties
    • -0
    • +1
    ./webapp/scripts/i18n/i18n_zh_CN.js
    • -0
    • +1
    ./webapp/scripts/i18n/i18n_ja_JP.js
    • -1
    • +7
    ./resources/i18n/itilbase_jp.properties
    • -1
    • +7
    ./resources/i18n/itilbase_en_US.properties
  14. … 10 more files in changeset.
星期三 25 五月 2022
10:53 下午

ciel

#讨论调整的代码
Options
    • -2
    • +2
    ./resources/spring/applicationContext-common.xml
  2. … 7 more files in changeset.
11:04 上午

ezreal

#修改漏洞导致一些资源被阻止的问题
Options
    • -1
    • +1
    ./java/com/sinba/itsm/JSPHeaderFilter.java
星期一 23 五月 2022
11:18 下午

ciel

#日志调整

#统计调整

Options
    • -9
    • +9
    ./resources/log4j.properties
    • -1
    • +0
    ./resources/spring/applicationContext-common.xml
    • -0
    • +1
    ./java/com/sinba/dwr/GetUserPageDwr.java
  4. … 28 more files in changeset.
2:29 下午

ezreal

#移植请求Header漏洞
Options
    • -1
    • +8
    ./java/com/sinba/itsm/ResponseHeaderFilter.java
    • -8
    • +8
    ./webapp/WEB-INF/web.xml
    • -0
    • +7
    ./java/com/sinba/itsm/JSPHeaderFilter.java
星期日 22 五月 2022
10:04 下午

ciel

#根据老师意见调整
Options
    • -3
    • +3
    ./resources/spring/applicationContext-common.xml
星期六 21 五月 2022
12:12 下午

ciel

根据老师意见调整数据库连接配置
Options
    • -3
    • +3
    ./resources/spring/applicationContext-common.xml
星期四 19 五月 2022
8:43 下午

ciel

根据老师意见调整数据库连接配置
Options
    • -5
    • +5
    ./resources/spring/applicationContext-common.xml
星期三 18 五月 2022
9:28 下午

ciel

#客户环境要调成100不然会报错
Options
    • -1
    • +1
    ./webapp/scripts/itsm/app/autocomplete/autocomplete.js
星期二 17 五月 2022
5:30 下午

ciel

#定期任务分组
Options
    • -0
    • +45
    ./webapp/scripts/common/tools/scheduledTask/scheduledTasksManage.js
    • -0
    • +6
    ./webapp/pages/common/tools/scheduledTask/scheduledTasksManage.jsp
  3. … 13 more files in changeset.
星期日 15 五月 2022
4:16 下午

ciel

#AD优化
Options
    • -0
    • +1
    ./resources/spring/applicationContext-common.xml
  2. … 13 more files in changeset.
星期四 12 五月 2022
9:01 上午

steven

#jquery修改
Options
    • -1
    • +1
    ./webapp/feishu/js/jquery-1.11.2.min.js
    • -2
    • +2
    ./webapp/wechat/js/jquery-form.js
    • -1
    • +1
    ./webapp/wechat/js/jquery-1.11.3.min.js
    • -1
    • +1
    ./webapp/tickets/js/jquery.knob.js
    • -2
    • +2
    ./webapp/feishu/js/jquery-form.js
    • -1
    • +1
    ./webapp/scripts/jquery/gridster/jquery-1.7.2.min.js
    • -1
    • +1
    ./webapp/feishu/js/jquery-1.8.2.min.js
    • -1
    • +1
    ./webapp/tickets/js/jquery.pager.js
    • -1
    • +1
    ./webapp/scripts/jquery/jquery-1.7.2.min.js
    • -1
    • +1
    ./webapp/wechat/js/jquery-1.11.2.min.js
    • -1
    • +1
    ./webapp/wechat/js/jquery-1.8.2.min.js
    • -1
    • +1
    ./webapp/feishu/js/jquery-1.11.3.min.js
  13. … 2 more files in changeset.
星期三 11 五月 2022
5:58 下午

matts

struts 漏洞升级
Options
    • -5
    • +5
    ./webapp/pages/itsm/release/releaseDetails.jsp
    • -2
    • +3
    ./resources/struts/struts-formCustom.xml
    • -4
    • +4
    ./webapp/pages/itsm/project/projectDetailsFormCustom.jsp
    • -5
    • +5
    ./webapp/pages/itsm/request/requestDetails.jsp
    • -1
    • +1
    ./java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
    • -5
    • +5
    ./webapp/pages/itsm/project/projectDetails.jsp
    • -2
    • +3
    ./resources/struts/struts-formCustomMapping.xml
    • -3
    • +4
    ./resources/struts/struts-python.xml
    • -6
    • +6
    ./webapp/pages/itsm/problem/problemDetails.jsp
    • -6
    • +6
    ./webapp/pages/itsm/request/requestDetailsFormCustom.jsp
    • -5
    • +5
    ./webapp/pages/itsm/change/changeDetail.jsp
    • -6
    • +6
    ./webapp/pages/itsm/demand/demandDetail.jsp
    • -3
    • +3
    ./webapp/WEB-INF/web.xml
    • -2
    • +3
    ./resources/struts/struts-scheduled.xml
    • -2
    • +8
    ./resources/struts.xml
  16. … 67 more files in changeset.
星期二 10 五月 2022
11:26 上午

matts

区分未回访 以及回访待复
Options
    • binary
    ./webapp/jasper/hql/threesets/mysql/Request_report_technician.jasper
    • -2
    • +4
    ./webapp/jasper/hql/threesets/mysql/Request_report_technician.jrxml
10:34 上午

matts

将请求详细报表中的回访满意度 分值改为5分制度 #如果未回访 显示未回访字样 不会显示空或者0
Options
    • -3
    • +3
    ./webapp/jasper/hql/threesets/mysql/Request_report_technician.jrxml
    • binary
    ./webapp/jasper/hql/threesets/mysql/Request_report_technician.jasper