Ver código fonte

bootstrap page-info 显示英文问题,切换中文

yue 5 anos atrás
pai
commit
6f77898bb3

+ 1 - 0
src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -2778,6 +2778,7 @@ public class ActTaskService extends BaseService {
         String loginName = UserUtils.getByUserName(user.getDistributionMaterials()).getLoginName();
         vars.put("manager", "yes".equals(flag) ? "" : loginName);
         complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+        //自动发起验收流程
     }
 
     /**

+ 2 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/EndTaskListen.java

@@ -46,7 +46,7 @@ public class EndTaskListen implements Serializable, ExecutionListener {
             String constructionUnitManage = idConProc.getConstructionUnitManage();
             //获取项目第几次发起领料
             String number = showListService.findNumber(id);
-            showList.setId(id);
+            showList.setProjectId(id);
             if (number == null || "".equals(number)) {
                 showList.setTheNumber("1");
             } else {
@@ -57,6 +57,7 @@ public class EndTaskListen implements Serializable, ExecutionListener {
                 String value = dic.getValue();
                 showList.setsVersion(value);
             }
+            //保存数据
             showListService.save(showList);
             String acqStatus = showListService.findAcqStatus(showList);
             if ("0".equals(acqStatus)) {

+ 4 - 0
src/main/java/com/jeeplus/modules/sg/scheduleView/web/ScheduleViewController.java

@@ -94,16 +94,19 @@ public class ScheduleViewController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "allData")
     public Map<String, Object> useQuantityData(ScheduleView scheduleView, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //获取查询的项目定义号
         String projectId = scheduleView.getProjectId();
         String[] projectList = null;
         List<String> searchList = new ArrayList<>();
         if (!projectId.equals("")) {
+            //根据空格分割
             projectList = projectId.split("\\s+");
             for (int i = 0; i < projectList.length; i++) {
                 searchList.add(projectList[i]);
             }
             scheduleView.setProjectList(searchList);
         }
+        //查询所有项目信息
         Page<ScheduleView> scheduleViewPage = scheduleViewService.scheduleProjectAll(new Page<ScheduleView>(request, response), scheduleView);
         List<ScheduleView> list = scheduleViewPage.getList();
         for (ScheduleView c : list) {
@@ -111,6 +114,7 @@ public class ScheduleViewController extends BaseController {
             String acquisitionStatus = c.getAcquisitionStatus();
             String constructionStatus = c.getConstructionStatus();
             String settStatus = c.getSettStatus();
+            //对不同流程状态进行判断重新赋值
             if ("0".equalsIgnoreCase(status)) {
                 c.setStatus("未发起流程");
             } else if ("1".equalsIgnoreCase(status)) {

+ 1 - 0
src/main/webapp/webpage/modules/sg/scheduleView/show/closureView.jsp

@@ -5,6 +5,7 @@
     <title>所有项目信息</title>
     <meta name="decorator" content="ani"/>
     <!-- SUMMERNOTE -->
+    <%@ include file="/webpage/include/bootstraptable.jsp"%>
     <%@include file="/webpage/include/summernote.jsp" %>
     <%@include file="closureView.js" %>
     <style type="text/css">

+ 1 - 0
src/main/webapp/webpage/modules/sg/scheduleView/show/designView.jsp

@@ -6,6 +6,7 @@
     <meta name="decorator" content="ani"/>
     <!-- SUMMERNOTE -->
     <%@include file="/webpage/include/summernote.jsp" %>
+    <%@ include file="/webpage/include/bootstraptable.jsp"%>
     <%@include file="designView.js" %>
     <style type="text/css">
         /* 下边两行是去掉input 输入框右边的上下箭头按钮*/

+ 1 - 0
src/main/webapp/webpage/modules/sg/scheduleView/show/disView.jsp

@@ -6,6 +6,7 @@
     <meta name="decorator" content="ani"/>
     <!-- SUMMERNOTE -->
     <%@include file="/webpage/include/summernote.jsp" %>
+    <%@ include file="/webpage/include/bootstraptable.jsp"%>
     <%@include file="disView.js" %>
     <style type="text/css">
         /* 下边两行是去掉input 输入框右边的上下箭头按钮*/

+ 1 - 0
src/main/webapp/webpage/modules/sg/scheduleView/show/policyView.jsp

@@ -5,6 +5,7 @@
     <title>所有项目信息</title>
     <meta name="decorator" content="ani"/>
     <!-- SUMMERNOTE -->
+    <%@ include file="/webpage/include/bootstraptable.jsp"%>
     <%@include file="/webpage/include/summernote.jsp" %>
     <%@include file="policyView.js" %>
     <style type="text/css">

+ 1 - 0
src/main/webapp/webpage/modules/sg/scheduleView/show/recView.jsp

@@ -5,6 +5,7 @@
     <title>所有项目信息</title>
     <meta name="decorator" content="ani"/>
     <!-- SUMMERNOTE -->
+    <%@ include file="/webpage/include/bootstraptable.jsp"%>
     <%@include file="/webpage/include/summernote.jsp" %>
     <%@include file="recView.js" %>
     <style type="text/css">

+ 1 - 0
src/main/webapp/webpage/modules/sg/scheduleView/show/settView.jsp

@@ -5,6 +5,7 @@
     <title>所有项目信息</title>
     <meta name="decorator" content="ani"/>
     <!-- SUMMERNOTE -->
+    <%@ include file="/webpage/include/bootstraptable.jsp"%>
     <%@include file="/webpage/include/summernote.jsp" %>
     <%@include file="settView.js" %>
     <style type="text/css">