diff --git a/WebContent/WEB-INF/views/bm/aqList.jsp b/WebContent/WEB-INF/views/bm/aqList.jsp index a2204a8..1b83155 100644 --- a/WebContent/WEB-INF/views/bm/aqList.jsp +++ b/WebContent/WEB-INF/views/bm/aqList.jsp @@ -26,7 +26,7 @@ - + \ No newline at end of file diff --git a/WebContent/WEB-INF/views/bm/aqPlanList.jsp b/WebContent/WEB-INF/views/bm/aqPlanList.jsp index 540717e..0b8e90a 100644 --- a/WebContent/WEB-INF/views/bm/aqPlanList.jsp +++ b/WebContent/WEB-INF/views/bm/aqPlanList.jsp @@ -26,7 +26,7 @@ - + \ No newline at end of file diff --git a/WebContent/WEB-INF/views/bm/carList.jsp b/WebContent/WEB-INF/views/bm/carList.jsp index 8678a1a..ac02bad 100644 --- a/WebContent/WEB-INF/views/bm/carList.jsp +++ b/WebContent/WEB-INF/views/bm/carList.jsp @@ -26,7 +26,7 @@ - + \ No newline at end of file diff --git a/WebContent/WEB-INF/views/equipment/equipmentTypesDetail.jsp b/WebContent/WEB-INF/views/equipment/equipmentTypesDetail.jsp index 34b1ee0..4161342 100644 --- a/WebContent/WEB-INF/views/equipment/equipmentTypesDetail.jsp +++ b/WebContent/WEB-INF/views/equipment/equipmentTypesDetail.jsp @@ -126,14 +126,17 @@ dataType: 'text', // 将响应类型设置为text而不是json parseData: function(res) { console.log('开始解析数据'); + console.log(res); + try { console.log('收到的原始响应数据:', res); if (!res) { throw new Error('响应数据为空'); } - + try { + res = JSON.parse(res); return { "code": 0, "msg": res.resMsg || '', diff --git a/WebContent/WEB-INF/views/equipment/equipmentTypesInfo.jsp b/WebContent/WEB-INF/views/equipment/equipmentTypesInfo.jsp index 5d19da5..873183c 100644 --- a/WebContent/WEB-INF/views/equipment/equipmentTypesInfo.jsp +++ b/WebContent/WEB-INF/views/equipment/equipmentTypesInfo.jsp @@ -640,7 +640,7 @@ $.ajax({ type: 'post', - url: bonuspath + apiUrl, + url: '${bonuspath}' + apiUrl, dataType: "json", data: requestData, success: function(res) { diff --git a/WebContent/WEB-INF/views/equipment/projectDetail.jsp b/WebContent/WEB-INF/views/equipment/projectDetail.jsp index 814f40f..dbb19c8 100644 --- a/WebContent/WEB-INF/views/equipment/projectDetail.jsp +++ b/WebContent/WEB-INF/views/equipment/projectDetail.jsp @@ -140,7 +140,7 @@
- 分公司： + 往来单位：
全部
@@ -212,7 +212,7 @@ // 初始化分公司选项 function loadCompanyOptions() { $.ajax({ - url: '${bonuspath}/backstage/indexHomeDetails/getProjectCompany', + url: '${bonuspath}/backstage/indexHomeDetails/getProjectSub', type: 'post', dataType: "json", success: function(res) { @@ -244,21 +244,25 @@ // 加载表格数据 function loadTableData() { - var company = $('#companyFilter .active').data('value'); + var company = $('#companyFilter .active').text(); + console.log("===",company) var year = $('#yearFilter .active').data('value'); var month = $('#monthFilter .active').data('value'); var projectName = $('#projectNameSearch').val().trim(); console.log(company, year, month); - if(isNaN(company)){ + if (!company) { company = ''; } + if(company=='全部'){ + company = ''; + } table.render({ elem: '#projectTable', url: '${bonuspath}/backstage/indexHomeDetails/getProjectDiff', method: 'post', where: { - companyId: company, + subName: company, year: year, month: month, projectName: projectName @@ -294,7 +298,7 @@ {field: 'firstTime', title: '首次领料日期', width: '11%'}, {field: 'lastTime', title: '最新领料日期', width: '11%'}, {field: 'backTime', title: '最新退料日期', width: '11%'}, - {field: 'companyName', title: '所属分公司', width: '10%'} + {field: 'subName', title: '往来单位', width: '10%'} ]], response: { statusCode: 200 diff --git a/WebContent/WEB-INF/views/newInput/newInputApprovallist.jsp b/WebContent/WEB-INF/views/newInput/newInputApprovallist.jsp index 7110705..0963590 100644 --- a/WebContent/WEB-INF/views/newInput/newInputApprovallist.jsp +++ b/WebContent/WEB-INF/views/newInput/newInputApprovallist.jsp @@ -46,6 +46,8 @@ 检验人 入库人 是否批准 + 批准人 + 批准时间 操作 diff --git a/WebContent/WEB-INF/views/newInput/newInputAuditinglist.jsp b/WebContent/WEB-INF/views/newInput/newInputAuditinglist.jsp index 2076ee7..0fc7548 100644 --- a/WebContent/WEB-INF/views/newInput/newInputAuditinglist.jsp +++ b/WebContent/WEB-INF/views/newInput/newInputAuditinglist.jsp @@ -622,6 +622,8 @@ body { 检验人 入库人 审核状态 + 审核人 + 审核时间 操作 @@ -753,7 +755,8 @@ function getbaseList(init) { } else { html += "已审核"; } - + html += "" + (l.auditUser || '-') + ""; + html += "" + (l.auditTime || '-') + ""; html += ""; if(l.isExamine != 1 && l.isExamine != '1') { html += ""; @@ -762,6 +765,7 @@ function getbaseList(init) { html += ""; } html += ""; + html += ""; } $("#baseTable tbody").append(html); diff --git a/WebContent/static/js/bm/publicJumpIp.js b/WebContent/static/js/bm/publicJumpIp.js new file mode 100644 index 0000000..ac44cf8 --- /dev/null +++ b/WebContent/static/js/bm/publicJumpIp.js @@ -0,0 +1,9 @@ +//安全工器具 后端请求ip +let AQGQJ_IP='http://10.1.0.142:1999'; +//安全工器具 -跳转页面地址 +let AQGQJ_HTML_IP='http://10.1.0.142:1999/gz-aqgqj/index.html'; + +//车辆 后端请求IP +let CAR_IP='http://192.168.0.38:21522'; +//车辆 跳转页面IP +let CAR_HTML_IP='http://192.168.0.38:8848/gz_car_ui/index.html'; \ No newline at end of file diff --git a/resources/mybatis/index/IndexHomeDetailsMapper.xml b/resources/mybatis/index/IndexHomeDetailsMapper.xml index 7440fe2..7d191a9 100644 --- a/resources/mybatis/index/IndexHomeDetailsMapper.xml +++ b/resources/mybatis/index/IndexHomeDetailsMapper.xml @@ -3,14 +3,14 @@ - - + + - - - + + + - - + + - + - + - - - + + + - + - + - - + + - + - - + + - - + + - + - - + + - + - + - - + + - + - + - + - + - - + + - - + + + - + - - + + - + - - + + - + - + - + - + - + \ No newline at end of file diff --git a/resources/mybatis/newInput/NewInputMapper.xml b/resources/mybatis/newInput/NewInputMapper.xml index 1475aab..9160517 100644 --- a/resources/mybatis/newInput/NewInputMapper.xml +++ b/resources/mybatis/newInput/NewInputMapper.xml @@ -53,8 +53,10 @@ resultMap="new"> SELECT wnd.ID AS id,SUM(wir.NUM) AS nums,wnd.IS_APPROVAL AS isApproval, wnd.IS_EXAMINE AS isExamine,mt.`NAME` AS maModel,mtt.`NAME` AS maType, - pu.`NAME` AS checker,puu.`NAME` AS customerRep,wnd.QUALIFIED_NUM AS checkNum + pu.`NAME` AS checker,puu.`NAME` AS customerRep,wnd.QUALIFIED_NUM AS checkNum, + pus.NAME auditUser ,wnd.AUDIT_TIME auditTime FROM wf_new_details wnd + LEFT JOIN pm_user pus on pus.ID = wnd.AUDIT_USER LEFT JOIN wf_task_appoint wta ON wta.TASK_ID = wnd.TASK_ID LEFT JOIN wf_info_record wir ON wir.SUP_ID = wnd.TASK_ID AND wnd.MODEL_ID = wir.MODEL_ID LEFT JOIN pm_user pu on pu.ID = wnd.CHECKER @@ -110,7 +112,7 @@ SELECT wnd.ID AS id,SUM(wir.NUM) AS nums,wnd.IS_APPROVAL AS isApproval, wnd.IS_EXAMINE AS isExamine,mt.`NAME` AS maModel,mtt.`NAME` AS maType, pu.`NAME` AS checker,puu.`NAME` AS customerRep,wnd.QUALIFIED_NUM AS checkNum, - wnd.MODEL_ID as maModelId,wnd.TASK_ID as taskId + wnd.MODEL_ID as maModelId,wnd.TASK_ID as taskId,audit.time auditTime ,pus.`NAME` auditUser FROM wf_new_details wnd LEFT JOIN wf_task_appoint wta ON wta.TASK_ID = wnd.TASK_ID LEFT JOIN wf_info_record wir ON wir.SUP_ID = wnd.TASK_ID AND wnd.MODEL_ID = wir.MODEL_ID @@ -119,6 +121,13 @@ LEFT JOIN ma_org_relation mor on mor.TYPE_ID = wnd.MODEL_ID LEFT JOIN mm_type mt ON mt.ID = mor.TYPE_ID LEFT JOIN mm_type mtt ON mtt.ID = mt.PARENT_ID + LEFT JOIN( + SELECT task, max(time) time ,creator + from bm_logs + where fun='/backstage/new/isApproval' + GROUP BY task + )audit on audit.task=wnd.TASK_ID + LEFT JOIN pm_user pus on pus.ID = audit.creator WHERE wir.NUM IS NOT NULL AND wnd.IS_EXAMINE = 1 AND wta.IS_ACTIVE = 1 AND( @@ -209,7 +218,7 @@ update wf_new_details set - IS_EXAMINE = #{isExamine} + IS_EXAMINE = #{isExamine},AUDIT_TIME=#{auditTime},AUDIT_USER=#{auditUser} where ID = #{id} diff --git a/resources/mybatis/newInput/NewReportMapper.xml b/resources/mybatis/newInput/NewReportMapper.xml index f0f11fb..b536b54 100644 --- a/resources/mybatis/newInput/NewReportMapper.xml +++ b/resources/mybatis/newInput/NewReportMapper.xml @@ -38,5 +38,6 @@ OR mv.`NAME` LIKE CONCAT('%',#{param.keyWord},'%') ) + ORDER BY wir.time desc \ No newline at end of file diff --git a/src/com/bonus/index/beans/IndexProjectBean.java b/src/com/bonus/index/beans/IndexProjectBean.java index bb2c6d9..9a19fed 100644 --- a/src/com/bonus/index/beans/IndexProjectBean.java +++ b/src/com/bonus/index/beans/IndexProjectBean.java @@ -35,6 +35,20 @@ public class IndexProjectBean { private String lastTime; private String backTime; + /** + * 分公司名称 + */ + private String subName; + + + + public String getSubName() { + return subName; + } + + public void setSubName(String subName) { + this.subName = subName; + } public String getKeyword() { return keyword; diff --git a/src/com/bonus/index/controller/IndexHomeDetailsController.java b/src/com/bonus/index/controller/IndexHomeDetailsController.java index 1f12598..d452419 100644 --- a/src/com/bonus/index/controller/IndexHomeDetailsController.java +++ b/src/com/bonus/index/controller/IndexHomeDetailsController.java @@ -377,6 +377,25 @@ public class IndexHomeDetailsController extends BaseController list = service.getProjectSub(o); + ar.setSucceed(list); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } + // 差缺工程明细 -- 传入projectId @RequestMapping(value = "getProjectMaDiff", method = RequestMethod.POST) diff --git a/src/com/bonus/index/dao/IndexHomeDetailsDao.java b/src/com/bonus/index/dao/IndexHomeDetailsDao.java index bd8de47..0cfbd02 100644 --- a/src/com/bonus/index/dao/IndexHomeDetailsDao.java +++ b/src/com/bonus/index/dao/IndexHomeDetailsDao.java @@ -83,5 +83,11 @@ public interface IndexHomeDetailsDao extends BaseDao { List getCalendarNewInput(IndexHomeCalendarBean o); List getCalendarPd(IndexHomeCalendarBean o); + /** + * 查询往来单位 + * @param o + * @return + */ + List getProjectSub(IndexProjectBean o); } diff --git a/src/com/bonus/index/service/IndexHomeDetailsService.java b/src/com/bonus/index/service/IndexHomeDetailsService.java index 02890d3..95ce145 100644 --- a/src/com/bonus/index/service/IndexHomeDetailsService.java +++ b/src/com/bonus/index/service/IndexHomeDetailsService.java @@ -74,5 +74,11 @@ public interface IndexHomeDetailsService extends BaseService getCalendarNewInput(IndexHomeCalendarBean o); List getCalendarPd(IndexHomeCalendarBean o); + /** + * 查询往来单位接口 + * @param o + * @return + */ + List getProjectSub(IndexProjectBean o); } diff --git a/src/com/bonus/index/service/IndexHomeDetailsServiceImp.java b/src/com/bonus/index/service/IndexHomeDetailsServiceImp.java index ded7764..c65330e 100644 --- a/src/com/bonus/index/service/IndexHomeDetailsServiceImp.java +++ b/src/com/bonus/index/service/IndexHomeDetailsServiceImp.java @@ -218,6 +218,12 @@ public class IndexHomeDetailsServiceImp extends BaseServiceImp getProjectSub(IndexProjectBean o) { + + return dao.getProjectSub(o); + } @Override public List getTodoList(IndexTodoWarnBean o) { diff --git a/src/com/bonus/newInput/beans/NewInputBean.java b/src/com/bonus/newInput/beans/NewInputBean.java index bab060c..fbc3bd4 100644 --- a/src/com/bonus/newInput/beans/NewInputBean.java +++ b/src/com/bonus/newInput/beans/NewInputBean.java @@ -25,6 +25,28 @@ public class NewInputBean extends InputDetailsBean { private String isFinish; private String maId; private String isExamine; + + private String auditUser; + + private String auditTime; + + + + public String getAuditUser() { + return auditUser; + } + + public void setAuditUser(String auditUser) { + this.auditUser = auditUser; + } + + public String getAuditTime() { + return auditTime; + } + + public void setAuditTime(String auditTime) { + this.auditTime = auditTime; + } public String getIsExamine() { return isExamine; diff --git a/src/com/bonus/newInput/service/NewInputServiceImp.java b/src/com/bonus/newInput/service/NewInputServiceImp.java index cda9213..a6f2a31 100644 --- a/src/com/bonus/newInput/service/NewInputServiceImp.java +++ b/src/com/bonus/newInput/service/NewInputServiceImp.java @@ -132,6 +132,10 @@ public class NewInputServiceImp extends BaseServiceImp implements @Override public void isExamine(NewInputBean o) { + String userId = UserShiroHelper.getRealCurrentUser().getId() + ""; + o.setAuditUser(userId); + String time = DateTimeHelper.currentDateTime(); + o.setAuditTime(time); o.setIsExamine("1"); dao.isExamine(o);