Merge branch 'master' of https://gogs.superdesk.cn/super_service/superdesk_superservice

src/main/webapp/WEB-INF/pages/admin/engineeringRepair/evaluationManagement.jsp

@@ -116,6 +116,6 @@
 <script type="text/html" id="indexTpl">
 	{{d.LAY_TABLE_INDEX+1}}
 </script>
-<script type="text/javascript" src="<c:url value='/scripts/admin/engineeringRepair/evaluationManagement.js?v=20220301'/>"></script>
+<script type="text/javascript" src="<c:url value='/scripts/admin/engineeringRepair/evaluationManagement.js?v=20220728'/>"></script>
 </body>
 </html>

src/main/webapp/scripts/admin/engineeringRepair/evaluationManagement.js

@@ -442,6 +442,29 @@ $(function(){
 
 
 						  },{
+								  field:'visitStar',
+								  title: '工单星级',
+								  width: 130,
+								  templet: function(data){
+								  	if (!data.commentStar&&!data.visitStar) {
+										return '未评价'
+									} else {
+								  		if (data.commentStar&&data.visitStar) {
+								  			if (Number(data.commentStar)>Number(data.visitStar)) {
+												return data.commentStar+''+'星';
+											} else {
+												return data.visitStar+''+'星';
+											}
+										} else {
+								  			if (data.commentStar) {
+												return data.commentStar+''+'星';
+											} else {
+												return data.visitStar+''+'星';
+											}
+										}
+									}
+								  }
+							  },{
 //		  					  field:'id',
 		  					  title: '订单详情',
 		  					  width: 120,