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

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdjc/ctl/JdjcCtl.java

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

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/tzgg/ggxx/ctl/GgxxCtl.java

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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgbg/ctl/JgbgCtl.java

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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java

@@ -1359,12 +1359,12 @@ public class JgsqCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult saveFile(MultipartFile filename, Model model) {
 		WebJsonResult wr = success();
-		if (filename != null) {
+		if (filename != null && filename.getSize()>0) {
 			AccessoryEntity acc = accessoryService.saveFile(filename, "jgsq");
 			wr.setAttr("acc", acc);
 		} else {
 			wr.setSuccess(false);
-			wr.setMessage("请上传附件!");
+			wr.setMessage("请上传附件或上传的文件不能为空文件!");
 		}
 		return wr;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java

@@ -1311,12 +1311,12 @@ public class JgsqdsCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult saveFile(MultipartFile filename, Model model) {
 		WebJsonResult wr = success();
-		if (filename != null) {
+		if (filename != null && filename.getSize() > 0) {
 			AccessoryEntity acc = accessoryService.saveFile(filename, "jgsq");
 			wr.setAttr("acc", acc);
 		} else {
 			wr.setSuccess(false);
-			wr.setMessage("请上传附件!");
+			wr.setMessage("请上传附件或上传的文件不能为空文件!");
 		}
 		return wr;
 	}
@@ -1343,14 +1343,14 @@ public class JgsqdsCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult saveQtfj(String opflag, MultipartFile qtfilename, Model model) {
 		WebJsonResult wr = success();
-		if (qtfilename != null) {
+		if (qtfilename != null && qtfilename.getSize() > 0) {
 			AccessoryEntity acc = accessoryService.saveFile(qtfilename, "jgsq");
 			acc.setRemark(opflag);
 			accessoryService.save(acc);
 			wr.setAttr("acc", acc);
 		} else {
 			wr.setSuccess(false);
-			wr.setMessage("请上传附件！");
+			wr.setMessage("请上传附件或上传的文件不能为空文件！");
 		}
 		return wr;
 	}
@@ -1626,7 +1626,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 		String url = "GK_OPERATION_JSJY_JGSQ_ONE_CP?condition=ID=" + id;
 
-		boolean flag = getTbStatus(url,null);
+		boolean flag = getTbStatus(url, null);
 		if (flag) {
 			entity.setFlowstatus("0");
 			entity.setTbzt(Constants.YES);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/dao/JgsqDao.java

@@ -1,8 +1,16 @@
 package com.xt.jygl.gkjsgl.jgsq.dao;
 
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+
 import com.xt.jygl.gkjsgl.jgsq.entity.JgsqEntity;
 import com.xtframe.sec.common.SecRepository;
 
 public interface JgsqDao extends SecRepository<JgsqEntity, String> {
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_JGSQ 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_JGSQ 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/jgsq/service/JgsqService.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jgsq.service;
 
+import java.util.List;
+
 import com.xt.jygl.gkjsgl.jgsq.entity.JgsqEntity;
 import com.xt.jygl.workflow.service.BaseWorkFlowService;
 
@@ -9,12 +11,15 @@ public interface JgsqService extends BaseWorkFlowService {
 
 	public <S extends JgsqEntity> S save(S entity);
 
-	public <S extends JgsqEntity> S submit(S gg,String userids);
+	public <S extends JgsqEntity> S submit(S gg, String userids);
 
 	JgsqEntity findOne(String id);
 
 	void delete(String id);
 
-	public boolean changeAudit(String shyj, JgsqEntity xmxx, boolean flag,String userids);
+	public boolean changeAudit(String shyj, JgsqEntity xmxx, boolean flag, String userids);
+
+	List<Object> findByJyrids(String jyrid);
 
+	List<Object> findByGqids(String gqids);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/service/JgsqdsService.java

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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/service/impl/JgsqServiceImpl.java

@@ -114,4 +114,16 @@ public class JgsqServiceImpl extends BaseWorkFlowServiceImpl<JgsqEntity, String>
 		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/jgsq/service/impl/JgsqdsServiceImpl.java

@@ -107,4 +107,15 @@ public class JgsqdsServiceImpl extends BaseWorkFlowServiceImpl<JgsqEntity, Strin
 		return false;
 	}
 
+	@Override
+	public List<Object> findByJyrids(String jyrid) {
+		return dao.findByJyrids(jyrid);
+	}
+
+	@Override
+	public List<Object> findByGqids(String gqids) {
+		// TODO Auto-generated method stub
+		return dao.findByGqids(gqids);
+	}
+
 }