个人能力提升功能开发

src/main/java/com/jeeplus/modules/workqualityimprovement/service/WkQualityImprovementRecordService.java

@@ -54,15 +54,20 @@ public class WkQualityImprovementRecordService extends CrudService<WkQualityImpr
 	public Page<WkQualityImprovementRecord> findPage(Page<WkQualityImprovementRecord> page, WkQualityImprovementRecord record) {
 		//设置数据权限
 		if(!UserUtils.getUser().isAdmin()) {
-			String dataScopeSql = null;
-			dataScopeSql = dataScopeFilterOR(record.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_QUALITY_IMPROVEMENT.getValue());
-			if (StringUtils.isNotBlank(dataScopeSql)) {
-				record.getSqlMap().put("dsf", dataScopeSql);
-			} else {
-				// 未配置数据范围时兑底：仅可查看本人记录，避免看到全部数据
-				record.getSqlMap().put("onlySelf", "1");
+			if(!UserUtils.getUser().getName().equals("张静") && !UserUtils.getUser().getName().equals("董向宁")){
+				String dataScopeSql = null;
+				dataScopeSql = dataScopeFilterOR(record.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_QUALITY_IMPROVEMENT.getValue());
+				if (StringUtils.isNotBlank(dataScopeSql)) {
+					record.getSqlMap().put("dsf", dataScopeSql);
+				} else {
+					// 未配置数据范围时兑底：仅可查看本人记录，避免看到全部数据
+					record.getSqlMap().put("onlySelf", "1");
+				}
+				record.getSqlMap().put("delFlag", "AND a.del_flag = 0");
+			}else{
+				record.setUserId(null);
 			}
-			record.getSqlMap().put("delFlag", "AND a.del_flag = 0");
+
 		}
 		int count = recordDao.queryCount(record);
 		page.setCount(count);

src/main/resources/act/designs/workqualityimprovement/qualityImprovement.bpmn

@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
-  <process id="qualityImprovement" name="素养提升计划填写流程" isExecutable="true">
-    <startEvent id="start" name="启动"/>
-    <endEvent id="end" name="结束"/>
-    <userTask id="fillTask" name="填写个人素养提升计划表" activiti:assignee="${assignee}"/>
-    <sequenceFlow id="flow1" sourceRef="start" targetRef="fillTask"/>
-    <sequenceFlow id="flow2" sourceRef="fillTask" targetRef="end"/>
-  </process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_qualityImprovement">
-    <bpmndi:BPMNPlane bpmnElement="qualityImprovement" id="BPMNPlane_qualityImprovement">
-      <bpmndi:BPMNShape bpmnElement="start" id="BPMNShape_start">
-        <omgdc:Bounds height="30.0" width="30.0" x="30.0" y="150.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="end" id="BPMNShape_end">
-        <omgdc:Bounds height="28.0" width="28.0" x="350.0" y="152.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="fillTask" id="BPMNShape_fillTask">
-        <omgdc:Bounds height="80.0" width="120.0" x="140.0" y="125.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
-        <omgdi:waypoint x="60.0" y="165.0"/>
-        <omgdi:waypoint x="140.0" y="165.0"/>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
-        <omgdi:waypoint x="260.0" y="165.0"/>
-        <omgdi:waypoint x="350.0" y="166.0"/>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>

src/main/webapp/webpage/modules/workqualityimprovement/recordList.jsp

@@ -220,9 +220,9 @@
 			<div class=" contentShadow shadowLBR layui-form contentDetails">
 				<div class="nav-btns">
 					<div class="layui-btn-group" style="float: left">
-						<shiro:hasPermission name="workqualityimprovement:task:add">
+						<%--<shiro:hasPermission name="workqualityimprovement:task:add">
 							<button class="layui-btn layui-btn-sm layui-bg-blue" onclick="openTaskCreate()">&nbsp;新建任务</button>
-						</shiro:hasPermission>
+						</shiro:hasPermission>--%>
 						<button class="layui-btn layui-btn-sm layui-bg-green" onclick="batchDownload()">批量下载</button>
 						<button class="layui-btn layui-btn-sm layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="search()" title="刷新"> 刷新</button>
 					</div>
@@ -256,13 +256,13 @@
 				}}
 				,{field:'taskYear', align:'center', title: '年份', width:100}
 				,{field:'userName', align:'center', title: '姓名', width:100}
-				,{field:'officeName', align:'center', title: '部门', minWidth:120}
+				,{field:'officeName', align:'center', title: '部门', width:120}
 				,{field:'submitStatus', align:'center', title: '状态', width:100, templet: function(d){
 					if(d.submitStatus == '0') return '<span style="color:#FF9800;">未填写</span>';
 					if(d.submitStatus == '1') return '<span style="color:#5FB878;">已提交</span>';
 					return d.submitStatus;
 				}}
-				,{field:'createDate', align:'center', title: '创建时间', minWidth:160}
+				,{field:'createDate', align:'center', title: '创建时间', width:140}
 				,{field:'op', align:'center', title: '操作', width:220, templet: function(d){
 					var html = '';
 					if(d.submitStatus == '1'){

src/main/webapp/webpage/modules/workqualityimprovement/taskList.jsp

@@ -165,10 +165,10 @@
 			,page: false
 			,cols: [[
 				{field:'index', align:'center', title: '序号', width:50}
-				,{field:'year', align:'center', title: '年份', minWidth:100}
 				,{field:'title', align:'center', title: '标题', minWidth:250}
-				,{field:'createByNameStr', align:'center', title: '创建人', minWidth:100}
-				,{field:'officeName', align:'center', title: '创建部门', minWidth:120}
+				,{field:'year', align:'center', title: '年份', width:100}
+				,{field:'createByNameStr', align:'center', title: '创建人', width:100}
+				,{field:'officeName', align:'center', title: '创建部门', width:120}
 				,{field:'totalCount', align:'center', title: '应填人数', width:100}
 				,{field:'submitCount', align:'center', title: '已提交', width:100}
 				,{field:'status', align:'center', title: '状态', width:80, templet: function(d){
@@ -176,7 +176,7 @@
 					if(d.status == '1') return '<span style="color:#5FB878;">已发送</span>';
 					return d.status;
 				}}
-				,{field:'createDate', align:'center', title: '创建时间', minWidth:160}
+				,{field:'createDate', align:'center', title: '创建时间', width:140}
 				,{field:'op', align:'center', title: '操作', width:280, templet: function(d){
 					var html = '<a href="javascript:void(0);" onclick="openTaskForm(\''+d.id+'\')" class="op-btn op-btn-edit">编辑</a>';
 					html += '<a href="javascript:void(0);" onclick="viewRecords(\''+d.id+'\')" class="op-btn op-btn-view">查看记录</a>';