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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java

@@ -503,7 +503,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		}
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
-			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+			if (Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
 				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
 				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
@@ -1258,7 +1258,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		}
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
-			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+			if (Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
 				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
 				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
@@ -1528,7 +1528,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		}
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
-			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+			if (Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
 				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
 				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java

@@ -435,7 +435,7 @@ public class XkzyxCtl extends BaseWebCtl {
 		// 许可证信息
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
-			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+			if (Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
 				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
 				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
@@ -952,7 +952,7 @@ public class XkzyxCtl extends BaseWebCtl {
 		// 许可证信息
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
-			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+			if (Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
 				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
 				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
@@ -1231,7 +1231,7 @@ public class XkzyxCtl extends BaseWebCtl {
 		}
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
-			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+			if (Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
 				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
 				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

@@ -1209,7 +1209,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		}
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
-			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+			if (Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
 				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
 				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
@@ -1424,7 +1424,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		}
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
-			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+			if (Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
 				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
 				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());