附证年审

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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/zyfzns/GkzyfznsServiceImpl.java

@@ -202,11 +202,18 @@ public class GkzyfznsServiceImpl extends
 				nsEntity.setNssj(nssj);
 				nsEntity.setNsyj(nsyj);
 				nsEntity.setNsr(nsr);
+				nsEntity.setUpdateUser(Utils.getCurrentUser());
 				nsEntity.setUpdateDate(new Date());
 				nsDao.save(nsEntity);
 			} else {
 				nsEntity.setNsns(nsns);
 				nsEntity.setNsjg(nsjg);
+				nsEntity.setNsid(entity.getId());
+				nsEntity.setNssj(nssj);
+				nsEntity.setNsyj(nsyj);
+				nsEntity.setNsr(nsr);
+				nsEntity.setJyr(entity.getJyr());
+				nsEntity.setAddUser(Utils.getCurrentUser());
 				nsEntity.setAddDate(new Date());
 				nsEntity.setFzbh(entity.getFzbh());
 				nsDao.save(nsEntity);

gkaq/yjpt-java/trunk/resources/sql/init/yxqvalid.sql

@@ -30,13 +30,13 @@ BEGIN
     CURSOR CUR_EXPIRED_FZ IS
       SELECT ID,BAFZRQ FROM T_YJPT_JYRJCXX WHERE BAFZRQ<TRUNC(SYSDATE, 'DD')-WARN_DAYS AND RECORD_STATUS<>9; --附证过期的经营人
     CURSOR CUR_NS_JYR_1 IS
-      SELECT ID FROM T_YJPT_JYRJCXX jyr WHERE GKWXHWZYFZBH IS NOT NULL AND RECORD_STATUS<>9
-      AND ADD_MONTHS(FZYXQ,-25)<SYSDATE AND ADD_MONTHS(FZYXQ,-24)>SYSDATE
-      AND NOT EXISTS (SELECT 1 FROM T_YJPT_JYRXX_NSB ns WHERE ns.JYR=jyr.ID AND ns.FZBH=jyr.GKWXHWZYFZBH AND ns.NSNS=1 AND ns.RECORD_STATUS<>9); --需要进行第一次年审的经营人
+     SELECT ID FROM T_YJPT_JYRJCXX jyr WHERE   jyr.RECORD_STATUS<>9    
+   	AND  EXISTS (SELECT 1 FROM  T_YJPT_GKWXHWZYFZBLHHZ hz  WHERE hz.JYR=jyr.ID AND  hz.RECORD_STATUS =2 AND hz.FZSJ IS NOT NULL AND ADD_MONTHS(hz.FZSJ,13)>SYSDATE AND ADD_MONTHS(hz.FZSJ,12)<SYSDATE 
+	AND HZ.BYZD1 NOT IN (SELECT NS.FZBH FROM T_YJPT_JYRXX_NSB NS WHERE  NS.JYR=jyr.ID AND NS.NSNS=1 AND NS.RECORD_STATUS<>9));--需要进行第一次年审的经营人
     CURSOR CUR_NS_JYR_2 IS
-      SELECT ID FROM T_YJPT_JYRJCXX jyr WHERE GKWXHWZYFZBH IS NOT NULL AND RECORD_STATUS<>9
-      AND ADD_MONTHS(FZYXQ,-13)<SYSDATE AND ADD_MONTHS(FZYXQ,-12)>SYSDATE
-      AND NOT EXISTS (SELECT 1 FROM T_YJPT_JYRXX_NSB ns WHERE ns.JYR=jyr.ID AND ns.FZBH=jyr.GKWXHWZYFZBH AND ns.NSNS=2 AND ns.RECORD_STATUS<>9); --需要进行第二次年审的经营人
+     SELECT ID FROM T_YJPT_JYRJCXX jyr WHERE   jyr.RECORD_STATUS<>9    
+   	AND  EXISTS (SELECT 1 FROM  T_YJPT_GKWXHWZYFZBLHHZ hz  WHERE hz.JYR=jyr.ID AND  hz.RECORD_STATUS =2 AND hz.FZSJ IS NOT NULL AND ADD_MONTHS(hz.FZSJ,25)>SYSDATE AND ADD_MONTHS(hz.FZSJ,24)<SYSDATE 
+	AND HZ.BYZD1 NOT IN (SELECT NS.FZBH FROM T_YJPT_JYRXX_NSB NS WHERE  NS.JYR=jyr.ID AND NS.NSNS=2AND NS.RECORD_STATUS<>9)); --需要进行第二次年审的经营人
     CURSOR CUR_EXPIRED_ZC IS
       SELECT zc.ID,jyr.ID,jyr.GKJYR,TO_CHAR(zc.JCSJ,'yyyy-mm-dd') FROM T_YJPT_ZCYH yh JOIN T_YJPT_ZC zc ON yh.SSZC= zc.ID JOIN T_YJPT_JYRJCXX jyr ON zc.QYMC=jyr.ID
       WHERE yh.JHWCSJ<=TRUNC(SYSDATE, 'DD') AND yh.MQZT='-1' AND yh.RECORD_STATUS<>9 AND zc.RECORD_STATUS<>9 AND jyr.RECORD_STATUS<>9; --到期的自查隐患