质检

src/main/java/com/ssj/service/kmt/correctsys/KmtCorrectSysServiceImpl.java

@@ -758,14 +758,13 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
 	                        	 Calendar ca = Calendar.getInstance();
 	                             ca.setTime(DateHelper.parseDate(homework.getDate()+" 12:00:00", "yyyy-MM-dd HH:mm:ss"));
 	            		         ca.add(Calendar.DATE, 4);// num为增加的天数，可以改变的
-	            		         System.out.println(DateHelper.format(ca.getTime(), "yyyy-MM-dd HH:mm:ss"));
 	            		         if(new Date().getTime()>=ca.getTime().getTime()) {
 	            		        	 homeworkCheckStudentDto.setType(1);
 	            		         }else {
 	            		        	 homeworkCheckStudentDto.setType(0);
 	            		         }
 	                        }else {
-	                        	homeworkCheckStudentDto.setType(0);
+	                        	homeworkCheckStudentDto.setType(0); 
 	                        }
 	                        homeworkCheckSubjectDto.addStudent(homeworkCheckStudentDto);
 	                    }

src/main/resources/templates/sys/order/vipOrderList.html

@@ -99,7 +99,7 @@
 		        <th>产品类型</th>
 		        <th>金额</th>
 		        <th>购卡时间</th>
-		        <th>销售人员</th>
+		        <th>订单来源</th>
 		        <th>订单状态</th>
 		        <th>订单类型</th>
 		        <th>订单模式</th>
@@ -115,7 +115,7 @@
 					<td th:text="${item.get('details')}"></td>
 					<td th:text=" ${#strings.contains(item.get('price'),'.00')} ?  ${#numbers.formatDecimal(item.get('price'),1,0)} :  ${#numbers.formatDecimal(item.get('price'),1,2)} " style="color:  red;"></td>
 			        <td  th:text="${#calendars.format(item.get('create_time'),'yyyy-MM-dd HH:mm')}" ></td>
-					<td th:text="${item.get('name')}"></td>
+					<td th:text="${item.get('know')}"></td>
 					<td  th:switch="${item.get('order_status')}">
 					   <span th:case="1">已支付</span>
 					   <span th:case="2" style="color:  red;">已退款</span>