| 
					
				 | 
			
			
				@@ -1701,7 +1701,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 orderAppeal.setWorkerId(orderBase.getWorkerId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             orderAppeal.setBadEvaluate(s.getPjnr()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            orderAppeal.setAppraiseStatus(getAppraiseStatus(s.getPjly())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            orderAppeal.setAppraiseStatus(publicService.checkAppraiseType(s.getPjly())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             orderAppeal.setStatus(1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             orderAppeal.setCanApply(Boolean.TRUE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             orderAppeal.setCreateTime(new Date()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1715,22 +1715,6 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // 首次评价(A:好评,B:中评,C:差评,N:未评价,O:其他 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private String getAppraiseStatus(String pjly){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        String appraiseStatus=""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (pjly.equals("1") || pjly.indexOf("满意")>=0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            appraiseStatus="A"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } else if (pjly.equals("2") || pjly.indexOf("一般")>=0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            appraiseStatus="B"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } else if (pjly.equals("3") || pjly.indexOf("不满意")>=0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            appraiseStatus="C"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // 这里需要增加一个表用来查询确认是否为不满意 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            appraiseStatus="O"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return appraiseStatus; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private void setOrderAppraisemessage(OrderBase orderBase, ItfTblAssignSatisfactionDownload s) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (orderBase.getAppraiseTime()==null && 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1738,7 +1722,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode()))){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 首评 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 首次评价 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            orderBase.setAppraiseStatus(getAppraiseStatus(s.getPjly().trim())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            orderBase.setAppraiseStatus(publicService.checkAppraiseType(s.getPjly())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 首次评价内容 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             orderBase.setAppraiseContent(s.getPjly().trim()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 首次评价时间 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1747,7 +1731,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // orderBase.setAppraiseSource(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 追评评价状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            orderBase.setSecondAppraiseStatus(getAppraiseStatus(s.getPjly().trim())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            orderBase.setSecondAppraiseStatus(publicService.checkAppraiseType(s.getPjly())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 追评评价内容 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             orderBase.setSecondContent(s.getPjly().trim()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 追评评价时间 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1820,8 +1804,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             o.setMainId(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             o.setMainName(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        o.setAppraiseStatus(getAppraiseStatus(s.getPjly())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        o.setAppraiseStatus(publicService.checkAppraiseType(s.getPjly())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         o.setAppraiseContent(s.getPjnr()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         o.setSource("GREE"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2055,7 +2038,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         o.setUserPhone(order.getUserMobile()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         o.setAddress(order.getAddress()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        o.setAppraiseStatus(getAppraiseStatus(s.getPjly())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        o.setAppraiseStatus(publicService.checkAppraiseType(s.getPjly())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         o.setAppraiseContent(s.getPjnr()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 回访人id无 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         o.setRvisitNickName(s.getHfren()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2148,26 +2131,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return websitFWS; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private void upOrderBasePJ(OrderBase order, ItfTblAssignSatisfactionDownload s) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        OrderBase upOrder = new OrderBase(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        upOrder.setId(order.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        upOrder.setAppraiseTime(s.getCreatedDate()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // 原 评价:1=差评,2=中评,3=好评,0=未评价,4=剔除,5=其他 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (StringUtils.isEmpty(s.getPjnr())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            upOrder.setAppraiseStatus("N"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (s.getPjnr().equals("1") || s.getPjnr().equals("满意")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            upOrder.setAppraiseStatus("A"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } else if (s.getPjnr().equals("2") || s.getPjnr().equals("一般")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            upOrder.setAppraiseStatus("B"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } else if (s.getPjnr().equals("3") || s.getPjnr().equals("不满意") || 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                s.getPjnr().indexOf("差")>=0 || s.getPjnr().indexOf("不满")>=0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            upOrder.setAppraiseStatus("C"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            upOrder.setAppraiseStatus("O"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        orderBaseService.updateById(upOrder); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private void upSatisfactionSynstatus(ItfTblAssignSatisfactionDownload s) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ItfTblAssignSatisfactionDownload ups = new ItfTblAssignSatisfactionDownload(); 
			 |