git-svn-id: https://192.168.57.71/svn/jsgkj@1675 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrxkzfz/xkzfzview.jsp

@@ -117,6 +117,7 @@
 						<th>证书状态:&nbsp;</th>
 						<td >
 							<c:if test="${record.recordStatus==1}">有效</c:if>
+							<c:if test="${record.recordStatus==9}">无效</c:if> 
 						</td>
 					</tr>
 					<tr>

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/ctl/XkzfzCtl.java

@@ -330,6 +330,15 @@ public class XkzfzCtl extends BaseWebCtl {
 				vo.setWhdjzw(whdj.getText());
 			}
 		}
+		Calendar time = Calendar.getInstance();
+		time.set(Calendar.HOUR_OF_DAY, 0);
+		time.set(Calendar.MINUTE, 0);
+		time.set(Calendar.SECOND, 0);
+		if (vo.getYxqjssjfmt() != null && DateTime.toDate(entity.getYxqjssj()).getTime() > time.getTimeInMillis()) {
+			vo.setRecordStatus(1);
+		} else {
+			vo.setRecordStatus(9);
+		}
 
 		List<CodeEntity> listZycs = securityMgr.codeService().findValidCodesByGroupCode("ZYCS");
 		List<GqEntity> listgq = gqService.findGq();
@@ -583,6 +592,15 @@ public class XkzfzCtl extends BaseWebCtl {
 						vo.setWhdjzw(whdj.getText());
 					}
 				}
+				Calendar time = Calendar.getInstance();
+				time.set(Calendar.HOUR_OF_DAY, 0);
+				time.set(Calendar.MINUTE, 0);
+				time.set(Calendar.SECOND, 0);
+				if (vo.getYxqjssjfmt() != null && DateTime.toDate(entity.getYxqjssj()).getTime() > time.getTimeInMillis()) {
+					vo.setRecordStatus(1);
+				} else {
+					vo.setRecordStatus(9);
+				}
 
 				voList.add(vo);
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/service/impl/XkzfzServiceImpl.java

@@ -160,6 +160,8 @@ public class XkzfzServiceImpl extends JyglBaseService<XkzfzEntity, String> imple
 				cell.setCellStyle(bodyStyle);
 				if (xkzfz.getRecordStatus() == 1) {
 					cell.setCellValue("有效");
+				}else if (xkzfz.getRecordStatus() == 9) {
+					cell.setCellValue("无效");
 				}
 			}
 		}