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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgzx/ctl/JgzxCtl.java

@@ -999,7 +999,7 @@ public class JgzxCtl extends BaseWebCtl {
 			wr.setAttr("acc", fjEntity);
 		} else {
 			wr.setSuccess(false);
-			wr.setMessage("请上传附件!");
+			wr.setMessage("请上传附件或上传的文件不能为空文件!");
 		}
 		return wr;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java

@@ -1152,7 +1152,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 			wr.setAttr("acc", fjEntity);
 		} else {
 			wr.setSuccess(false);
-			wr.setMessage("请上传附件!");
+			wr.setMessage("请上传附件或上传的文件不能为空文件!");
 		}
 		return wr;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java

@@ -1028,7 +1028,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 		try {
 			JsjdbgEntity entity = jsjdbgdsService.findByXmid(id);
 			if(entity !=null){
-				if("1".equals(entity.getRecordStatus()) || "2".equals(entity.getRecordStatus())|| "3".equals(entity.getRecordStatus()) || "4".equals(entity.getRecordStatus())){
+				if("1".equals(entity.getRecordStatus()) || "3".equals(entity.getRecordStatus()) || "4".equals(entity.getRecordStatus())){
 					wr.setSuccess(false);
 					wr.setMessage("该项目变更中，请重新选择！");
 				}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/dao/JsjdbgDao.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jsjdbg.dao;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.Query;
 
 import com.xt.jygl.gkjsgl.jsjdbg.entity.JsjdbgEntity;
@@ -9,4 +11,11 @@ public interface JsjdbgDao extends SecRepository<JsjdbgEntity, String> {
 
 	@Query("SELECT m  FROM JsjdbgEntity m WHERE  m.xmid =?1  and m.recordStatus <> 9 ")
 	JsjdbgEntity findByXmid(String id);
+	
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_JSJDBG m where m.jyrid like ?1%  and m.record_Status<>9 and m.record_Status<>2 and m.record_Status<>1", nativeQuery = true)
+	public List<Object> findByJyrids(String jyrid );
+	
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_JSJDBG m where  m.szgq in (?1) and m.record_Status<>9 and m.record_Status<>2 and m.record_Status<>1", nativeQuery = true)
+	public List<Object> findByGqids(String gqids);
+	
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/service/JsjdbgService.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jsjdbg.service;
 
+import java.util.List;
+
 import com.xt.jygl.gkjsgl.jsjdbg.entity.JsjdbgEntity;
 import com.xt.jygl.workflow.service.BaseWorkFlowService;
 
@@ -16,5 +18,9 @@ public interface JsjdbgService extends BaseWorkFlowService {
 	void delete(String id);
 
 	public boolean changeAudit(String shyj, JsjdbgEntity xmxx, boolean flag,String userids);
+	
+	List<Object> findByJyrids(String jyrid);
+
+	List<Object> findByGqids(String gqids);
 
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/service/JsjdbgdsService.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jsjdbg.service;
 
+import java.util.List;
+
 import com.xt.jygl.gkjsgl.jsjdbg.entity.JsjdbgEntity;
 import com.xt.jygl.workflow.service.BaseWorkFlowService;
 
@@ -18,4 +20,8 @@ public interface JsjdbgdsService extends BaseWorkFlowService {
 	public boolean changeAudit(String shyj, JsjdbgEntity xmxx, boolean flag,String userids);
 
 	JsjdbgEntity findByXmid(String id);
+	
+	List<Object> findByJyrids(String jyrid);
+
+	List<Object> findByGqids(String gqids);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/service/impl/JsjdbgServiceImpl.java

@@ -113,4 +113,16 @@ public class JsjdbgServiceImpl extends BaseWorkFlowServiceImpl<JsjdbgEntity, Str
 		return false;
 	}
 
+	@Override
+	public List<Object> findByJyrids(String jyrid) {
+		// TODO Auto-generated method stub
+		return dao.findByJyrids(jyrid);
+	}
+
+	@Override
+	public List<Object> findByGqids(String gqids) {
+		// TODO Auto-generated method stub
+		return dao.findByGqids(gqids);
+	}
+
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/service/impl/JsjdbgdsServiceImpl.java

@@ -114,4 +114,16 @@ public class JsjdbgdsServiceImpl extends BaseWorkFlowServiceImpl<JsjdbgEntity, S
 		return dao.findByXmid(id);
 	}
 
+	@Override
+	public List<Object> findByJyrids(String jyrid) {
+		// TODO Auto-generated method stub
+		return dao.findByJyrids(jyrid);
+	}
+
+	@Override
+	public List<Object> findByGqids(String gqids) {
+		// TODO Auto-generated method stub
+		return dao.findByGqids(gqids);
+	}
+
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java

@@ -1366,7 +1366,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 			wr.setAttr("acc", acc);
 		} else {
 			wr.setSuccess(false);
-			wr.setMessage("请上传附件!");
+			wr.setMessage("请上传附件或上传的文件不能为空文件!");
 		}
 		return wr;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjdsCtl.java

@@ -1404,7 +1404,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 			wr.setAttr("acc", acc);
 		} else {
 			wr.setSuccess(false);
-			wr.setMessage("请上传附件！");
+			wr.setMessage("请上传附件或上传的文件不能为空文件！");
 		}
 		return wr;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/dao/JsjdcbsjDao.java

@@ -10,4 +10,10 @@ import com.xtframe.sec.common.SecRepository;
 public interface JsjdcbsjDao extends SecRepository<JsjdcbsjEntity, String> {
 	@Query("SELECT m from JsjdcbsjEntity m where  m.tbzt = N and m.recordStatus<>9")
 	List<JsjdcbsjEntity> findByTbzt();
+	
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_JSJDCBSJ m where m.jyrid like ?1%  and m.record_Status<>9 and m.record_Status<>2 and m.record_Status<>1", nativeQuery = true)
+	public List<Object> findByJyrids(String jyrid );
+	
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_JSJDCBSJ m where  m.szgq in (?1) and m.record_Status<>9 and m.record_Status<>2 and m.record_Status<>1", nativeQuery = true)
+	public List<Object> findByGqids(String gqids);
 }