git-svn-id: https://192.168.57.71/svn/hbghj@84 201dd7a2-ec1b-f84b-8b06-88221118ff88

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/BaseController.java

@@ -636,7 +636,7 @@ public abstract class BaseController {
 									.getCurrentUser().getSzd().getByzd2()
 									+ "%"));
 				// 根据站所过滤
-				if(Utils.getCurrentUser().getZs() != null && StringUtils.isNotEmpty(jyr) ){
+				/*if(Utils.getCurrentUser().getZs() != null && StringUtils.isNotEmpty(jyr) ){
 					if(jyr.equals("id")){
 						filterList.add(cb.equal(root.get("zs").get("id").as(Long.class),
 								Utils.getCurrentUser().getZs().getId()));
@@ -645,7 +645,7 @@ public abstract class BaseController {
 								Utils.getCurrentUser().getZs().getId()));
 					}
 					
-				}
+				}*/
 				if (role != null)
 					role = Utils.getParentRole(role);
 				orList.add(cb.like(root.get("recordCode").as(String.class),

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/auth/UserController.java

@@ -277,7 +277,7 @@ public class UserController extends BaseController {
 		entity.setSfaqfzr(user.getSfaqfzr());
 		entity.setSfyxdl(user.getSfyxdl());
 		entity.setSzd(user.getSzd());
-		entity.setZs(user.getZs());
+		//entity.setZs(user.getZs());
 		entity.setSzdsmc(user.getSzdsmc());
 		entity.setYx(user.getYx());
 		entity.setJyrjcxx(user.getJyrjcxx());

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zyfzndjy/GkwxhwzyfzblhhzController.java

@@ -191,7 +191,7 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 	@Log(Type.QUERY)
 	public BusinessContext list(final Long functionId, Pageable pageable,
 			final JyrEntity jyr, final CodeEntity szd, final GqEntity gq,
-			final String blbh, final String lcStatus, final String fddbr) {
+			final String blbh, final String lcStatus, final String fddbr, final CodeEntity zs) {
 		try {
 			Specification<GkwxhwzyfzblhhzEntity> spec = new Specification<GkwxhwzyfzblhhzEntity>() {
 				@Override
@@ -216,6 +216,11 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 								root.get("szd").get("id").as(String.class),
 								szd.getId() + "%"));
 					}
+					// 根据所在地过滤
+					if (null != zs) {
+						list.add(cb.equal(
+								root.get("jyrVo").get("zs").as(CodeEntity.class),zs ));
+					}
 					// 根据港区过滤
 					if (null != gq) {
 						list.add(cb.equal(root.get("ssgq").as(GqEntity.class),
@@ -305,6 +310,12 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 								root.get("szd").get("id").as(String.class),
 								param.get(0) + "%"));
 					}
+					//站所
+					if (!"".equals(param.get(7))) {
+						list.add(cb.equal(
+								root.get("jyrVo").get("zs").get("id").as(Long.class),
+								Long.parseLong(param.get(7))));
+					}
 					// 根据 申请单位 过滤
 					if (!"".equals(param.get(1))) {
 						list.add(cb.equal(
@@ -2264,7 +2275,8 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 	@Log(Type.QUERY)
 	public BusinessContext listFzxx(Pageable pageable, final JyrEntity jyr,
 			final CodeEntity szd, final GqEntity gq, final Date yxrq1,
-			final Date yxrq2, final String wxpm) {
+			final Date yxrq2, final String wxpm, final CodeEntity szqy,
+			final CodeEntity zycs, final CodeEntity zs) {
 		try {
 			Specification<GkwxhwzyfzblFzEntity> spec = new Specification<GkwxhwzyfzblFzEntity>() {
 
@@ -2304,6 +2316,16 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 					if (null != wxpm)
 						list.add(cb.like(root.get("wxhwm").as(String.class),
 								"%" + wxpm + "%"));
+					if (null != szqy)
+						list.add(cb.equal(
+								root.get("fzsq").get("ssgq").get("gqszsylx")
+										.as(CodeEntity.class), szqy));
+					if (null != zycs)
+						list.add(cb.equal(
+								root.get("zycs").as(CodeEntity.class), zycs));
+					if (null != zs)
+						list.add(cb.equal(root.get("jyr").get("zs").as(CodeEntity.class),
+								zs));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -210,7 +210,7 @@ public class ZysqbpController extends BaseController {
 	public BusinessContext list(Pageable pageable, final Long functionId,
 			final ZysqbpEntity entity, final String lcStatus, final Date bgsj1,
 			final Date bgsj2, final Date kgsj1, final Date kgsj2,
-			final Date wgsj1, final Date wgsj2) {
+			final Date wgsj1, final Date wgsj2,final CodeEntity zs) {
 		BusinessContext bc = new BusinessContext();
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		try {
@@ -255,6 +255,9 @@ public class ZysqbpController extends BaseController {
 						list.add(cb.like(
 								root.get("szd").get("id").as(String.class),
 								entity.getSzd().getId() + "%"));
+					if (null != zs)
+						list.add(cb.equal(
+								root.get("zydw").get("zs").as(CodeEntity.class),zs));
 					if (null != entity.getSzgq())
 						list.add(cb.equal(root.get("szgq").as(GqEntity.class),
 								entity.getSzgq()));
@@ -606,6 +609,11 @@ public class ZysqbpController extends BaseController {
 								root.get("recordStatus").as(String.class),
 								param.get(15) + ""));
 					}
+					if (!"".equals(param.get(16))) {
+						list.add(cb.equal(
+								root.get("zydw").get("zs").get("id").as(Long.class),
+								Long.parseLong(param.get(16)+"")));
+					}
 					if (Constants.YES.equals(Utils.getCurrentUser().getSfcd())) {
 						list.add(cb.equal(
 								root.get("addUser").as(UserEntity.class),

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/jyr/JyrEntity.java

@@ -509,7 +509,7 @@ public class JyrEntity extends BaseEntity<Long> implements Cloneable {
 		this.sfzdsp = sfzdsp;
 	}
 
-	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@ManyToOne(fetch = FetchType.LAZY, targetEntity = CodeEntity.class)
 	@JoinColumn(name = "xzqh")
 	public CodeEntity getXzqh() {
 		return xzqh;
@@ -519,7 +519,7 @@ public class JyrEntity extends BaseEntity<Long> implements Cloneable {
 		this.xzqh = xzqh;
 	}
 
-	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@ManyToOne(fetch = FetchType.LAZY, targetEntity = CodeEntity.class)
 	@JoinColumn(name = "zs")
 	@RemotingExclude
 	public CodeEntity getZs() {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/common/WorkflowMangerService.java

@@ -36,6 +36,7 @@ public interface WorkflowMangerService {
 	public static final String KEY_TASK_STEP = "task_step";
 	public static final String KEY_SENDER_ID = "senderID";
 	public static final String KEY_SZD_ID = "_szd";
+	public static final String KEY_ZS_ID = "_szd";
 	public static final String KEY_SENDER_NAME = "senderNAME";
 	public static final String KEY_SEND_DEPT = "sendDEPT";
 	/** 任务执行ID */
@@ -137,6 +138,8 @@ public interface WorkflowMangerService {
 	 * @return
 	 */
 	public int todoListCount(String userid, String busKey, Date begin, Date end);
+	
+	public int todoListCount(String userid, String busKey,String jyr, Date begin, Date end);
 
 	public List<TaskInfoEntity> doneList(String busKey, Long userid);
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/common/WorkflowMangerServiceImpl.java

@@ -535,6 +535,12 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
 							.getSzd().getId());
 				}
 			}
+			if (variables.get(WorkflowMangerServiceImpl.KEY_ZS_ID) == null) {
+				if (user.getZs() != null) {
+					variables.put(WorkflowMangerServiceImpl.KEY_ZS_ID, user
+							.getZs().getId());
+				}
+			}
 			if (Constants.YES.equals(user.getSfjyr())) {
 				if (user.getJyrjcxx() != null) {
 					variables.put(WorkflowMangerServiceImpl.KEY_SEND_DEPT, user
@@ -1001,6 +1007,68 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
 		long count = query.count();
 		return (int) count;
 	}
+	
+	public int todoListCount(String userid, String busKey, String jyr, Date begin, Date end) {
+		// 时间格式化
+		StringBuilder sqlBuffer = new StringBuilder();
+		String userSzdId = Utils.getCurrentUser().getSzd().getByzd2();
+		ManagementService ms = processEngine.getManagementService();
+		sqlBuffer.append(ms.getTableName(Task.class));
+		sqlBuffer.append(" T WHERE T .SUSPENSION_STATE_ = 1  ");
+		String workFlowCode = "";
+		if (!StringUtils.isEmpty(busKey)
+				|| !StringUtils.isEmpty(Utils.getCurrentUser().getByzd5())) {
+			if (!StringUtils.isEmpty(Utils.getCurrentUser().getByzd5())) {
+				workFlowCode = "'"
+						+ Utils.getCurrentUser().getByzd5()
+								.replaceAll(";", "','") + "'";
+			}
+			if (!StringUtils.isEmpty(busKey)) {
+				if (StringUtils.isEmpty(workFlowCode)
+						|| workFlowCode.indexOf("'" + busKey + "'") >= 0)
+					workFlowCode = "'" + busKey + "'";
+				else
+					workFlowCode = "NULL";
+			}
+			sqlBuffer.append(" AND EXISTS(SELECT 1 FROM ");
+			sqlBuffer.append(ms.getTableName(ProcessDefinition.class));
+			sqlBuffer.append(" P WHERE P.ID_=T.PROC_DEF_ID_ AND P.KEY_ IN (");
+			sqlBuffer.append(workFlowCode);
+			sqlBuffer.append(")) ");
+		}
+		if (begin != null)
+			sqlBuffer.append(" AND T.CREATE_TIME_ >= #{begin} ");
+		if (end != null)
+			sqlBuffer.append(" AND T.CREATE_TIME_ <= #{end} ");
+		sqlBuffer.append(" AND (T.ASSIGNEE_ = #{userId} ");
+		sqlBuffer
+				.append("OR (T.ASSIGNEE_ IS NULL AND EXISTS (SELECT 1 FROM ACT_RU_IDENTITYLINK ");
+		sqlBuffer
+				.append(" I WHERE I.TYPE_ = 'candidate' AND I.TASK_ID_ = T .ID_ ");
+		sqlBuffer.append("AND (I.USER_ID_ = #{userId} OR I.GROUP_ID_ IN ");
+		sqlBuffer
+				.append("(SELECT r.ROLE_TYPE FROM T_YJPT_ROLE_USER ru,T_YJPT_ROLE r ");
+		sqlBuffer.append("WHERE r.ID=ru.ROLEID AND ru.USERID =#{userId} ))");
+		sqlBuffer
+				.append(" AND (NOT EXISTS (SELECT 1 FROM ACT_RU_VARIABLE V WHERE V.PROC_INST_ID_=T.PROC_INST_ID_ AND NAME_=#{var} ) ");
+		sqlBuffer
+				.append(" OR EXISTS (SELECT 1 FROM ACT_RU_VARIABLE V WHERE V.PROC_INST_ID_=T.PROC_INST_ID_ AND NAME_=#{var} AND TEXT_ LIKE #{szd})) ");
+		sqlBuffer.append(")))");
+		TaskService taskService = processEngine.getTaskService();
+		NativeTaskQuery query = taskService
+				.createNativeTaskQuery()
+				.sql("SELECT COUNT(DISTINCT T.id_) FROM "
+						+ sqlBuffer.toString()
+						+ "ORDER BY T .CREATE_TIME_ DESC")
+				.parameter("userId", Utils.getCurrentUser().getId())
+				.parameter("var", KEY_SZD_ID).parameter("szd", userSzdId + "%");
+		if (begin != null)
+			query.parameter("begin", Utils.getDateFirstTime(begin));
+		if (end != null)
+			query.parameter("end", Utils.getDateLastTime(end));
+		long count = query.count();
+		return (int) count;
+	}
 
 	/**
 	 * 待办任务一览查询 {@inheritDoc}

gkaq/yjpt-java/trunk/resources/sql/init/6.T_YJPT_GGDM.sql

@@ -40,6 +40,7 @@ Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_US
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (11012,10903,'SSFL.WZFL',null,1,'SSFL.YWRFZSS.XYJ',null,null,null,null,1,null,null,null,null,null,'消油剂',null,null,'0','个',null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (11013,10903,'SSFL.WZFL',null,2,'SSFL.YWRFZSS.ZKXYJCYQ',null,null,null,null,1,null,null,null,null,null,'真空吸油机/撇油器',null,null,'0','个',null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (11014,10903,'SSFL.WZFL',null,3,'SSFL.YWRFZSS.LYWYL',null,null,null,null,1,null,null,null,null,null,'陆用围油栏',null,null,'0','个',null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (11023,10903,'SSFL.WZFL',null,5,'SSFL.YWRFZSS.SYWYL',null,null,null,null,1,null,null,null,null,null,'水用围油栏',null,null,'0','个',null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (11015,10903,'SSFL.WZFL',null,4,'SSFL.YWRFZSS.JYMPMZMT',null,null,null,null,1,null,null,null,null,null,'吸油棉片/棉枕/棉条',null,null,'0','个',null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (11016,10904,'SSFL.WZFL',null,1,'SSFL.QT.ZLYSS',null,null,null,null,1,null,null,null,null,null,'堵漏用木塞',null,null,'0','个',null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (11017,10904,'SSFL.WZFL',null,2,'SSFL.QT.FHT',null,null,null,null,1,null,null,null,null,null,'防火毯',null,null,'0','张',null,null,null,null);

gkaq/yjpt-java/trunk/resources/sql/init/9.update.sql.ftl

@@ -430,7 +430,6 @@ values (40008, null, 'FZ.ZYFS', 'ZYFS', 8, 'FZ.ZYFS8', null, null, null, null, 1
 insert into T_YJPT_GGDM (ID, FID, GROUPCODE, CODE, PX, MC, ADD_USER, ADD_DATE, UPDATE_USER, UPDATE_DATE, RECORD_STATUS, SFTB, TBZT, TBDYID, QYLB, SSQY, BZ, SZD, GQ, RECORD_CODE, BYZD1, BYZD2, BYZD3, BYZD4, BYZD5)
 values (40009, null, 'FZ.ZYFS', 'ZYFS', 9, 'FZ.ZYFS9', null, null, null, null, 1, null, null, null, null, null, '汽车-火车', null, null, '0', null, null, null, null, null);	
 
-
 --公共代码 20160612
 update T_YJPT_GGDM set bz='8.港口经营许可证书或临时经营许可证复印件;' where id=10000327;
 update T_YJPT_GGDM set bz='9.危险货物作业场所平面示意图;' where id=10000328;
@@ -555,3 +554,16 @@ alter table T_YJPT_ZDSGYHPCZGBA modify tbr varchar2(100);
 alter table T_YJPT_GKSSSB modify tbr varchar2(100);
 alter table T_YJPT_QSK modify tbr varchar2(100);
 alter table T_YJPT_YJJYNLJBQK modify tbr varchar2(100);
+
+insert into T_YJPT_GGDM (ID, FID, GROUPCODE, CODE, PX, MC, ADD_USER, ADD_DATE, UPDATE_USER, UPDATE_DATE, RECORD_STATUS, SFTB, TBZT, TBDYID, QYLB, SSQY, BZ, SZD, GQ, RECORD_CODE, BYZD1, BYZD2, BYZD3, BYZD4, BYZD5)
+values (40010, null, 'FZ.ZYFS', 'ZYFS', 10, 'FZ.ZYFS10', null, null, null, null, 1, null, null, null, null, null, '储罐-管道-汽车', null, null, '0', null, null, null, null, null);	
+insert into T_YJPT_GGDM (ID, FID, GROUPCODE, CODE, PX, MC, ADD_USER, ADD_DATE, UPDATE_USER, UPDATE_DATE, RECORD_STATUS, SFTB, TBZT, TBDYID, QYLB, SSQY, BZ, SZD, GQ, RECORD_CODE, BYZD1, BYZD2, BYZD3, BYZD4, BYZD5)
+values (40011, null, 'FZ.ZYFS', 'ZYFS', 10, 'FZ.ZYFS11', null, null, null, null, 1, null, null, null, null, null, '汽车-管道-储罐', null, null, '0', null, null, null, null, null);	
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) 
+values (11023,10903,'SSFL.WZFL',null,5,'SSFL.YWRFZSS.SYWYL',null,null,null,null,1,null,null,null,null,null,'水用围油栏',null,null,'0','个',null,null,null,null);
+
+ALTER TABLE T_YJPT_USER ADD zs NUMBER;
+ALTER TABLE T_YJPT_JYRJCXX ADD zs NUMBER;
+
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) 
+values (4201011,420101,'ZS',null,5,'武汉站所',null,null,null,null,1,null,null,null,null,null,'武汉站所',null,null,'0',null,null,null,null,null);

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; --到期的自查隐患