Jelajahi Sumber

Merge remote-tracking branch 'origin/master'

wanyuan 8 bulan lalu
induk
melakukan
4128f89ccc

+ 4 - 4
tc-service/tap-task/src/main/java/com/minto/app/task/dao/TaskAnalysisDaoImpl.java

@@ -1997,9 +1997,9 @@ hql.append("AND EXISTS (\n" +
         sql.append("    and person.pstate =0 ");
 
         //类型筛选
-        String gbTaskTypeId = ParameterUtil.getString(param, "gbTaskTypeId");
-        if(StringUtils.isNotBlank(gbTaskTypeId)){
-            sql.append("    and ts.tasktype_id = :taskTypeId");
+        Long gbTaskTypeId = ParameterUtil.getLong(param, "gbTaskTypeId");
+        if (gbTaskTypeId != null) {
+            sql.append("    and ts.tasktype_id = :gbTaskTypeId ");
         }
 
         //督办管理员看全部,部门主管看本部门所有人员,普通用户只看自己的数据
@@ -2023,7 +2023,7 @@ hql.append("AND EXISTS (\n" +
 
     @Override
     public List<Map<String, Object>> findTaskTypes(Long orgAccountId){
-        String sql = "select id,name,parent_id,sort_no from task_type where status = 1 and sub_type = 1 AND "
+        String sql = "select TO_CHAR(id) as id,name,TO_CHAR(parent_id) as parent_id,sort_no from task_type where status = 1 and sub_type = 1 AND "
                 + "org_account_id = :orgAccountId and creator_id <> -1 order by sort_no asc;";
         Map<String, Object> param = new HashMap<>();
         param.put("orgAccountId", orgAccountId);

+ 44 - 10
tip-front/src/main/webapp/WEB-INF/pages/apps/task/analysis/evaluateAnalysis.html

@@ -208,9 +208,6 @@
 </head>
 <body>
 <div class="mt-body mt-vertical">
-    <!--<div class="mt-title-region">-->
-        <!--<div class="mt-info">督查督办分析</div>-->
-    <!--</div>-->
     <div class="mt-center">
         <div class="mt-content">
             <div class="mt-btn-region">
@@ -223,6 +220,17 @@
                     <ul id="years" class="mt-dropdown-menu">
                     </ul>
                 </div>
+
+                <div class="mt-btn-group">
+                    <input id="currentTaskTypes" name="year" type="hidden" value="">
+                    <button class="mt-btn">
+                        <span class="mt-selTxt taskType-text"></span>
+                        <i class="caret"></i>
+                    </button>
+                    <ul id="pageTaskTypes" class="mt-dropdown-menu">
+                    </ul>
+                </div>
+
             </div>
 
             <div class="mt-horizontal tableInfo">
@@ -236,6 +244,7 @@
                             <th>总得分</th>
                             <th>基础分</th>
                             <th>评价得分</th>
+                            <th>平均事项完成时长</th>
                         </tr>
                         </thead>
                         <tbody id="byManagerTrs">
@@ -244,7 +253,6 @@
                         </tr>
                         </tbody>
                     </table>
-
                 </div>
             </div>
         </div>
@@ -300,6 +308,7 @@
         <td>{{obj.score}}</td>
         <td>{{obj.score1}}</td>
         <td>{{obj.score2}}</td>
+        <td>{{obj.avgtime}}</td>
     </tr>
     {{/each}}
     {{/if}}
@@ -307,15 +316,16 @@
 <script  th:inline="javascript">
     $(function () {
         initYears()
-        initTableByManager(new Date().getFullYear());
-
+        initTableByManager(new Date().getFullYear(),"");
+        initPageTaskTypes()
     })
 
-function initTableByManager(year) {
+function initTableByManager(year,id) {
     var param = {
         year: year,
         taskTypeId: '0',
-        orgName: ''
+        orgName: '',
+        gbTaskTypeId:id+''
     }
     callAjaxRequest("taskAnalysisWebService", "findEvaluateAnalysis", param, function (result) {
         var html;
@@ -333,6 +343,29 @@ function initTableByManager(year) {
     })
 }
 
+function initPageTaskTypes () {
+    let showListData = [{id: "", name: "全部", parent_id: 0}];
+    let renderStr = "";
+    callAjaxRequest("taskAnalysisWebService", "findTaskTypes", {}, function (result) {
+        result = result || [];
+        showListData = showListData.concat(result);
+        for(let i = 0, len = showListData.length;  i < len; i++) {
+            let item = showListData[i]
+            renderStr += '<li><a class="mt-dropdown-txt taskType-txt" onclick="filterByType(\''+item.id+'\')" value="' + item.id + '' + '">' + item.name + '</a></li>'
+        }
+        $("#pageTaskTypes").html(renderStr);
+        $("#currentTaskTypes").val("");
+    })
+    $(".taskType-text").text("全部");
+}
+
+// 根据类型加载列表
+function filterByType (id) {
+    $.startProc()
+    $("#currentTaskTypes").val(id);
+    initTableByManager($("#year").val(), id)
+}
+
 function initYears() {
     var uls = "";
     var year = new Date().getFullYear();
@@ -344,13 +377,14 @@ function initYears() {
     $("#year").val(year);
     $(".year-text").text(year + "年");
 }
+
+
 //根据年份筛选
 function setYear(year) {
     $.startProc()
     $("#year").val(year)
-    var month = $("#month").val()
     //刷新列表
-    initTableByManager(year)
+    initTableByManager(year , $("#currentTaskTypes").val())
 }
 
 $('body').on('click', '.mt-btn-group .mt-dropdown-txt', function (e) {

+ 2 - 25
tip-front/src/main/webapp/tc_tgp/organization/person/list.jsp

@@ -22,24 +22,13 @@
 					<td style="width: 3%" align="center"><input type="checkbox" id="ids" name="ids" /></td>
 					<td align="left" style="width: 13%;"><span class="sep"><a href="javascript:;" id="idName">${tc:i18n("organization.person.name.label")}</a> </span></td>
 					<td align="left" style="width: 8%"><span class="sep"><a href="javascript:;" id="idAccount">${tc:i18n("organization.person.login.name.label")}</a> </span></td>
+					<td align="left" style="width: 10%"><span class="sep"><a href="javascript:;" id="personIcon">头像</a> </span></td>
 					<td align="left" style="width: 13%"><span class="sep"><a href="javascript:;" id="idAccount">${tc:i18n("organization.person.last.login.time.label")}</a> </span></td>
-					<!--
-							<td align="left" style="width: 13%"><span class="sep"><a
-						href="javascript:;" id="idCode">编号</a> </span></td>
-
-						<td style="width: 10%;" align="center"><span class="sep"><a
-						href="javascript:;" id="idSort">排序号</a> </span></td>
-						 -->
 					<td align="left" style="width: 13%"><span class="sep"><a href="javascript:;" id="idDpt">${tc:i18n("organization.person.belongs.to.unit.label")}</a> </span></td>
 					<td align="left" style="width: 10%"><span class="sep"><a href="javascript:;" id="idDuty">主岗</a> </span></td>
 					<td align="left" style="width: 10%"><span class="sep"><a href="javascript:;" id="idLevel">${tc:i18n("organization.person.level.label")}</a> </span></td>
 					<td align="left" style="width: 10%"><span class="sep"><a href="javascript:;" id="idPhone1">${tc:i18n("organization.person.phone.label")}</a> </span></td>
 					<td align="left" style="width: 10%"><span class="sep"><a href="javascript:;" id="pstate">账号状态</a> </span></td>
-					<%--<td align="left" style="width: 10%"><span class="sep"><a href="javascript:;" id="idLevel">设备IMEI号码</a> </span></td>--%>
-				<!--
-				<td align="left" style="width: 10%"><span class="sep"><a
-						href="javascript:;" id="idState">在职状态</a> </span></td>
-						-->
 				</tr>
 			</thead>
 			<tbody id="listBody">
@@ -73,25 +62,13 @@
 								</c:otherwise>
 							</c:choose></td>
 						<td align="left"><span class="paddingLeft">${item.username }</span></td>
+						<td align="left"><img src="${path}${item.piconURL}" width="38px" height="38px" style="border-radius: 50%;padding: 5px"></td>
 						<td align="left"><span class="paddingLeft">${item.loginTime }</span></td>
-
-						<!--
-			<td align="left">
-				<span class="paddingLeft">未启用</span>
-			</td>
-			<td align="center">未启用</td>
-			 -->
 						<td align="left"><span class="paddingLeft">${item.departmentName }</span></td>
 						<td align="left"><span class="paddingLeft">${item.mainPost.pname }</span></td>
 						<td align="left"><span class="paddingLeft">${item.level.lname }</span></td>
 						<td align="left"><span class="paddingLeft">${item.phone1 }</span></td>
 						<td align="left"><span class="paddingLeft"><c:if test="${item.pstate eq 0 }">启用</c:if><c:if test="${item.pstate eq 1 }">停用</c:if></span></td>
-						<%--<td align="left"><span class="paddingLeft">${item.phoneSerialNumber }</span></td>--%>
-						<!--
-			<td align="left">
-				<span class="paddingLeft">${item.pstate }</span>
-			</td>
-			 -->
 					</tr>
 				</c:forEach>
 			</tbody>