转码修改

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1137,17 +1137,17 @@ public class ActTaskService extends BaseService {
 	@Transactional(readOnly = false)
 	public void newAuditSave(Act act,String tuser,Construction construction) {
 
-		String comment = act.getComment();
+//		String comment = act.getComment();
 		// 设置意见
 //		constructionService.save(construction);
-		/*if ("manager".equals(act.getFlag())) {
+		if ("manager".equals(act.getFlag())) {
 			act.setComment(act.getComment());
 		} else if ("company".equals(act.getFlag())) {
 			act.setComment(act.getComment());
 		} else {
 			act.setComment(act.getComment());
 		}
-		*//*		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());*//*
+		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());
 		act.preUpdate();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = act.getTaskDefKey();
@@ -1159,13 +1159,19 @@ public class ActTaskService extends BaseService {
 			vars.put("manager", true);
 			vars.put("company", false);
 			vars.put("reject", false);
-			String loginName = UserUtils.getByLoginName(tuser).getLoginName();
-			vars.put("processer", loginName);
+            if (tuser !=null || tuser !="") {
+                String loginName = UserUtils.getByLoginName(tuser).getLoginName();
+                vars.put("processer", loginName);
+            }
+
 		} else if ("company".equals(flag)) {
 			vars.put("manager", false);
 			vars.put("company", true);
 			vars.put("reject", false);
-			vars.put("processer", UserUtils.getUser().getLoginName());
+            if (tuser !=null || tuser !="") {
+                String loginName = UserUtils.getByLoginName(tuser).getLoginName();
+                vars.put("processer", loginName);
+            }
 		} else {
 			vars.put("manager", false);
 			vars.put("company", false);
@@ -1173,8 +1179,8 @@ public class ActTaskService extends BaseService {
 		}
 		constructionService.newUpdate(construction);
 //		vars.put("processer", UserUtils.get(construction.getTuser().getId()).getLoginName());
-		*//*vars.put("pass", "yes".equals(act.getFlag())? true : false);*//*
-		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);*/
+		vars.put("pass", "yes".equals(act.getFlag())? true : false);
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
 

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -84,10 +84,27 @@ public class UserController extends BaseController {
 	@RequiresPermissions("sys:user:index")
 	@RequestMapping(value = "userSelect")
 	public String userSelect(Model model, HttpServletRequest request) {
-		String office = (String)request.getParameter("office");
 		return "modules/common/userSelect";
 	}
 
+
+    @RequiresPermissions("sys:user:index")
+    @RequestMapping(value = "myUserSelect")
+    public String myUserSelect(Model model, HttpServletRequest request) {
+        String office = (String)request.getParameter("office");
+        model.addAttribute("office", office);
+        return "modules/common/myUserSelect";
+    }
+
+    @RequiresPermissions("sys:user:index")
+    @ResponseBody
+    @RequestMapping(value = {"myList", ""})
+    public Map<String, Object> myList(User user, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<User> page = systemService.findUser(new Page<User>(request, response), user);
+        return getBootstrapData(page);
+    }
+
+
 	@RequiresPermissions("sys:user:index")
 	@ResponseBody
 	@RequestMapping(value = {"list", ""})

src/main/resources/act/designs/oa/test_audit/test_audit.bpmn

@@ -6,49 +6,49 @@
     <userTask id="modify" name="员工薪酬档级修改" activiti:assignee="${apply}"/>
     <userTask id="audit" name="薪酬主管�审" activiti:assignee="system"/>
     <exclusiveGateway id="sid-C28BB5F6-013D-4570-B432-61B380C1F46F"/>
-    <userTask id="audit2" name="集团人力资�部部长审核" activiti:assignee="system"/>
+    <userTask id="audit2" name="集团人力资�部部长审�" activiti:assignee="system"/>
     <exclusiveGateway id="sid-ED46FE41-A0FD-496D-86DC-2C97AF5735F0"/>
     <sequenceFlow id="sid-EF2F51BB-1D99-4F0B-ACF2-B6C1300A7D2B" sourceRef="audit2" targetRef="sid-ED46FE41-A0FD-496D-86DC-2C97AF5735F0"/>
-    <userTask id="audit3" name="集团人力资�部分管领导审核" activiti:assignee="system"/>
+    <userTask id="audit3" name="集团人力资�部分管领导审�" activiti:assignee="system"/>
     <exclusiveGateway id="sid-FE485B2D-9A23-4236-BD0D-D788CA6E30E4"/>
     <sequenceFlow id="sid-3DBCD661-5720-4480-8156-748BE0275FEF" sourceRef="audit3" targetRef="sid-FE485B2D-9A23-4236-BD0D-D788CA6E30E4"/>
-    <userTask id="audit4" name="集团总��审批" activiti:assignee="system"/>
+    <userTask id="audit4" name="集团总��审�" activiti:assignee="system"/>
     <exclusiveGateway id="sid-3F53B6BD-F8F3-496B-AC08-50630BD11477"/>
     <userTask id="apply_end" name="薪酬档级兑现" activiti:assignee="system"/>
     <sequenceFlow id="sid-02DB2AD9-1332-4198-AC8D-22A35169D15C" sourceRef="audit4" targetRef="sid-3F53B6BD-F8F3-496B-AC08-50630BD11477"/>
     <sequenceFlow id="sid-2AB7C01A-50EE-4AAC-8C8F-F6E1935B3DA7" sourceRef="audit" targetRef="sid-C28BB5F6-013D-4570-B432-61B380C1F46F"/>
     <sequenceFlow id="sid-36E50C8B-6C7C-4968-B02D-EBAA425BF4BE" sourceRef="start" targetRef="audit"/>
-    <sequenceFlow id="sid-7D723190-1432-411D-A4A4-774225E54CD9" name="是" sourceRef="sid-3F53B6BD-F8F3-496B-AC08-50630BD11477" targetRef="apply_end">
+    <sequenceFlow id="sid-7D723190-1432-411D-A4A4-774225E54CD9" name="�" sourceRef="sid-3F53B6BD-F8F3-496B-AC08-50630BD11477" targetRef="apply_end">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-D44CAD43-0271-4920-A524-9B8533E52550" name="是" sourceRef="sid-FE485B2D-9A23-4236-BD0D-D788CA6E30E4" targetRef="audit4">
+    <sequenceFlow id="sid-D44CAD43-0271-4920-A524-9B8533E52550" name="�" sourceRef="sid-FE485B2D-9A23-4236-BD0D-D788CA6E30E4" targetRef="audit4">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-53258502-43EE-4DE8-B1A4-DBD11922B8AF" name="�" sourceRef="sid-C28BB5F6-013D-4570-B432-61B380C1F46F" targetRef="modify">
+    <sequenceFlow id="sid-53258502-43EE-4DE8-B1A4-DBD11922B8AF" name="�" sourceRef="sid-C28BB5F6-013D-4570-B432-61B380C1F46F" targetRef="modify">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==0}]]></conditionExpression>
     </sequenceFlow>
     <exclusiveGateway id="sid-5FED02D6-C388-48C6-870E-097DB2131EA0"/>
     <sequenceFlow id="sid-163DBC60-DBC9-438B-971A-67738FB7715A" sourceRef="modify" targetRef="sid-5FED02D6-C388-48C6-870E-097DB2131EA0"/>
-    <sequenceFlow id="sid-72258A41-203E-428C-B71D-CA3506252D73" name="是" sourceRef="sid-C28BB5F6-013D-4570-B432-61B380C1F46F" targetRef="audit2">
+    <sequenceFlow id="sid-72258A41-203E-428C-B71D-CA3506252D73" name="�" sourceRef="sid-C28BB5F6-013D-4570-B432-61B380C1F46F" targetRef="audit2">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-8448EF4A-B62E-4899-ABC2-0E2DB2AE6838" name="�新申请" sourceRef="sid-5FED02D6-C388-48C6-870E-097DB2131EA0" targetRef="audit">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-A7589084-4623-4FEA-A774-00A70DDC1D20" name="是" sourceRef="sid-ED46FE41-A0FD-496D-86DC-2C97AF5735F0" targetRef="audit3">
+    <sequenceFlow id="sid-A7589084-4623-4FEA-A774-00A70DDC1D20" name="�" sourceRef="sid-ED46FE41-A0FD-496D-86DC-2C97AF5735F0" targetRef="audit3">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-FA618636-3708-4D0C-8514-29A4BB8BC926" name="�" sourceRef="sid-ED46FE41-A0FD-496D-86DC-2C97AF5735F0" targetRef="modify">
+    <sequenceFlow id="sid-FA618636-3708-4D0C-8514-29A4BB8BC926" name="�" sourceRef="sid-ED46FE41-A0FD-496D-86DC-2C97AF5735F0" targetRef="modify">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-1525BFF4-3E9D-4D8A-BF80-1F63AFE16289" name="�" sourceRef="sid-FE485B2D-9A23-4236-BD0D-D788CA6E30E4" targetRef="modify">
+    <sequenceFlow id="sid-1525BFF4-3E9D-4D8A-BF80-1F63AFE16289" name="�" sourceRef="sid-FE485B2D-9A23-4236-BD0D-D788CA6E30E4" targetRef="modify">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-35CC8C6C-1067-4398-991C-CCF955115965" name="�" sourceRef="sid-3F53B6BD-F8F3-496B-AC08-50630BD11477" targetRef="modify">
+    <sequenceFlow id="sid-35CC8C6C-1067-4398-991C-CCF955115965" name="�" sourceRef="sid-3F53B6BD-F8F3-496B-AC08-50630BD11477" targetRef="modify">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-BDB0AAB2-7E50-4D35-80EE-CE0BECDD9F57" sourceRef="apply_end" targetRef="end"/>
-    <sequenceFlow id="sid-44AFB9C1-4057-4C48-B1F2-1EC897A52CB7" name="销�" sourceRef="sid-5FED02D6-C388-48C6-870E-097DB2131EA0" targetRef="end">
+    <sequenceFlow id="sid-44AFB9C1-4057-4C48-B1F2-1EC897A52CB7" name="��" sourceRef="sid-5FED02D6-C388-48C6-870E-097DB2131EA0" targetRef="end">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==0}]]></conditionExpression>
     </sequenceFlow>
   </process>

src/main/webapp/webpage/modules/common/myUserSelect.jsp

@@ -0,0 +1,222 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>用户选择</title>
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			//bootstrap treeview初始化
+			$('#jstree').jstree({
+				'core' : {
+					"multiple" : false,
+					"animation" : 0,
+					"themes" : { "variant" : "large", "icons":true , "stripes":true},
+					'data' : {
+						"url" : "${ctx}/sys/office/treeData",
+						"dataType" : "json" // needed only if you do not supply JSON headers
+					}
+				},
+				"conditionalselect" : function (node, event) {
+				      return false;
+				 },
+				'plugins' : ['types', 'wholerow'],
+				"types":{ 
+					'default' : { 'icon' : 'fa fa-folder' },
+			        '1' : {'icon' : 'fa fa-home'},
+					'2' : {'icon' : 'fa fa-umbrella' },
+				    '3' : { 'icon' : 'fa fa-group'},
+					'4' : { 'icon' : 'fa fa-file-text-o' }
+				} 
+
+			}).bind("activate_node.jstree", function (obj, e) {
+			    // 处理代码
+			    // 获取当前节点
+			    var treeNode = e.node;
+			    var id = treeNode.id == '0' ? '' :treeNode.id;
+				if(treeNode.level == 0){//level=0 代表公司
+					$("#companyId").val(id);
+					$("#officeId").val("");
+				}else{
+					$("#companyId").val("");
+					$("#officeId").val(id);
+				}
+				
+				$('#table').bootstrapTable('refresh');
+			}).on('loaded.jstree', function() {
+				$("#jstree").jstree('open_all');
+			});
+			
+			
+			//初始化表格
+			  $('#table').bootstrapTable({
+
+                  //请求方法
+                  method: 'post',
+
+                  //类型json
+                  dataType: "json",
+                  contentType: "application/x-www-form-urlencoded",
+	                 //是否显示行间隔色
+	                striped: true,
+	                //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
+	                cache: false,    
+	                //是否显示分页（*）  
+	                pagination: true, 
+	                 //排序方式 
+	                sortOrder: "asc",    
+	                //初始化加载第一页，默认第一页
+	                pageNumber:1,   
+	                //每页的记录行数（*）   
+	                pageSize: 5,  
+	                //可供选择的每页的行数（*）    
+	                pageList: [5, 10,  'ALL'],
+	                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
+	                url: "${ctx}/sys/user/myList",
+	                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+	                //queryParamsType:'',   
+	                ////查询参数,每次调用是会带上这个参数，可自定义                         
+	                queryParams : function(params) {
+	                	var searchParam = $("#searchForm").serializeJSON();
+	                	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
+	                	searchParam.pageSize = params.limit === undefined? -1 : params.limit;
+	                	searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
+	                    return searchParam;
+	                },
+	                //分页方式：client客户端分页，server服务端分页（*）
+	                sidePagination: "server",
+	                onClickRow: function(row, $el){
+	                },
+	                columns: [{
+	                	<c:if test="${isMultiSelect}">
+	                		checkbox: true
+	                	</c:if>
+	                	<c:if test="${!isMultiSelect}">
+	                		radio: true
+	                	</c:if>
+				    }, {
+				        field: 'loginName',
+				        title: '登录名',
+				        sortable: true
+				       
+				    }, {
+				        field: 'name',
+				        title: '姓名',
+				        sortable: true,
+				    }, {
+				        field: 'phone',
+				        title: '电话',
+				        sortable: true
+				    }, {
+				        field: 'mobile',
+				        title: '手机',
+				        sortable: true
+				    }, {
+				        field: 'company.name',
+				        title: '归属公司'
+				    }, {
+				        field: 'office.name',
+				        title: '归属部门'
+				    }]
+				
+				});
+			
+			  
+			  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，默认关闭tab
+				  $('#table').bootstrapTable("toggleView");
+				}
+			  
+			  $('#table').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+		                'check-all.bs.table uncheck-all.bs.table', function () {
+		            $('#remove').prop('disabled', ! $('#table').bootstrapTable('getSelections').length);
+		            $('#edit').prop('disabled', $('#table').bootstrapTable('getSelections').length!=1);
+		        });
+	
+			  
+				    
+			  $("#search").click("click", function() {// 绑定查询按扭
+				  $('#table').bootstrapTable('refresh');
+				});
+			  $("#reset").click("click", function() {// 绑定查询按扭
+				  $("#searchForm  input").val("");
+				  $("#searchForm  select").val("");
+				  zTreeObj.cancelSelectedNode();
+				  $('#table').bootstrapTable('refresh');
+				});
+			  
+			  
+		});
+		
+		  function getIdSelections() {
+		        return $.map($("#table").bootstrapTable('getSelections'), function (row) {
+		            return row.id
+		        });
+		    }
+		  
+		  function getNameSelections() {
+		        return $.map($("#table").bootstrapTable('getSelections'), function (row) {
+		            return row.name
+		        });
+		    }
+        function getLoginNameSelections() {
+            return $.map($("#table").bootstrapTable('getSelections'), function (row) {
+                return row.loginName
+            });
+        }
+		  function getSelections() {
+		        return $.map($("#table").bootstrapTable('getSelections'), function (row) {
+		            return row
+		        });
+		    }
+		  
+	</script>
+</head>
+<body class="bg-white">
+	
+	<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-sm-3 col-md-2" style="width: 30%" >
+			<div id="jstree"></div>
+		</div>
+		<div  class="col-sm-9 col-md-10 animated fadeInRight" style="width: 70%">
+			<!-- 搜索框-->
+		<div class="accordion-group">
+			<div id="collapseTwo" class="accordion-body">
+				<div class="accordion-inner">
+					<form id="searchForm" class="form form-horizontal well clearfix" >
+					    <input type="hidden" id="companyId" name="company.id"/>
+					     <input type="hidden" id="officeId" name="office.id" value="${office}"/>
+<%--					     <input type="text" id="o" name="office.id" value="${office}"/>--%>
+					    <div class="col-sm-4">
+					    	<label class="label-item single-overflow pull-left" title="登录名：">登录名：</label>
+					   		<input type="text" name="loginName" maxlength="100"  class=" form-control"/>
+					    </div>
+				    	<div class="col-sm-4">
+					    	<label class="label-item single-overflow pull-left" title="姓名：">姓名：</label>
+					   		<input type="text" name="name" maxlength="100"  class=" form-control"/>
+					    </div>
+					    <div class="col-sm-4">
+							 <div style="margin-top:26px">
+							  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
+							  <a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
+							</div>
+					    </div>
+					</form>
+				</div>
+			</div>
+		</div><!-- 搜索框结束 -->
+		
+	    <!-- 表格 -->
+	    <table id="table"
+	           data-toolbar="#toolbar"
+	           data-minimum-count-columns="2"
+	           data-id-field="id">
+	    </table>
+	
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/constructionAudit.jsp

@@ -22,12 +22,12 @@
 
 			$("#agree").click(function () {
 				// var ii=document.getElementById("tuser").value;
-				var tuser = ($("#tuserName").val();
+				var tuser = $("#tuserName").val();
 				console.log(tuser);
-				if (tuser=="") {
+/*				if (tuser=="") {
 					jp.error("请选择用户");
 					return;
-				}
+				}*/
 				var id = $("#id").val();
 				var powerLine= $("#powerLine").val();
 				var blackoutArea=$("#blackoutArea").val();

src/main/webapp/webpage/modules/sg/managementcenter/activiti/constructionForm.jsp

@@ -63,7 +63,7 @@
 						title:"选择用户",
 						auto:true,
 						maxmin: true, //开启最大化最小化按钮
-						content: ctx+"/sys/user/userSelect?office=e223b1c8472843bbbbc94c9b72c29737",
+						content: ctx+"/sys/user/myUserSelect?office=e223b1c8472843bbbbc94c9b72c29737",
 						btn: ['确定', '关闭'],
 						yes: function(index, layero){
 							var ids = layero.find("iframe")[0].contentWindow.getIdSelections();
@@ -75,7 +75,6 @@
 							}
 							// 执行保存
 							yesFuc(ids.join(","), names.join(","), loginNames.join(","));
-
 							top.layer.close(index);
 						},
 						cancel: function(index){