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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/service/JsjdcbsjService.java

@@ -23,4 +23,8 @@ public interface JsjdcbsjService extends BaseWorkFlowService {
 	public JsjdcbsjWebService getWebService(String szdId);
 	
 	public List<JsjdcbsjEntity> findByTbzt();
+	
+	List<Object> findByJyrids(String jyrid);
+
+	List<Object> findByGqids(String gqids);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/service/JsjdcbsjdsService.java

@@ -12,15 +12,19 @@ public interface JsjdcbsjdsService extends BaseWorkFlowService {
 
 	public <S extends JsjdcbsjEntity> S save(S entity);
 
-	public <S extends JsjdcbsjEntity> S submit(S gg,String userids);
+	public <S extends JsjdcbsjEntity> S submit(S gg, String userids);
 
 	JsjdcbsjEntity findOne(String id);
 
 	void delete(String id);
 
-	public boolean changeAudit(String shyj, JsjdcbsjEntity xmxx, boolean flag,String userids);
+	public boolean changeAudit(String shyj, JsjdcbsjEntity xmxx, boolean flag, String userids);
 
 	public JsjdcbsjWebService getWebService(String szdId);
-	
+
 	public List<JsjdcbsjEntity> findByTbzt();
+
+	List<Object> findByJyrids(String jyrid);
+
+	List<Object> findByGqids(String gqids);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/service/impl/JsjdcbsjServiceImpl.java

@@ -141,4 +141,16 @@ public class JsjdcbsjServiceImpl extends BaseWorkFlowServiceImpl<JsjdcbsjEntity,
 		return dao.findByTbzt();
 	}
 
+	@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/service/impl/JsjdcbsjdsServiceImpl.java

@@ -134,4 +134,16 @@ public class JsjdcbsjdsServiceImpl extends BaseWorkFlowServiceImpl<JsjdcbsjEntit
 		return dao.findByTbzt();
 	}
 
+	@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/jsjdgl/ctl/JsjdglCtl.java

@@ -1025,12 +1025,12 @@ public class JsjdglCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult saveFile(String ssid, MultipartFile filename, Model model) {
 		WebJsonResult wr = success();
-		if (filename != null) {
+		if (filename != null && filename.getSize()>0) {
 			AccessoryEntity acc = accessoryService.saveFile(filename, "jsjd");
 			wr.setAttr("acc", acc);
 		} else {
 			wr.setSuccess(false);
-			wr.setMessage("请上传附件！");
+			wr.setMessage("请上传附件或上传的文件不能为空文件！");
 		}
 		return wr;
 	}
@@ -1946,14 +1946,14 @@ public class JsjdglCtl 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, "jsjdqtfj");
 			acc.setRemark(opflag);
 			accessoryService.save(acc);
 			wr.setAttr("acc", acc);
 		} else {
 			wr.setSuccess(false);
-			wr.setMessage("请上传附件！");
+			wr.setMessage("请上传附件或上传的文件不能为空文件！");
 		}
 		return wr;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdzx/ctl/JsjdzxCtl.java

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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/dao/DcsbDao.java

@@ -55,4 +55,10 @@ public interface DcsbDao extends SecRepository<DcsbEntity, String> {
 	
 	@Query(value = "select text,a.jgnm,a.jgwm,a.cgnm,a.cgwm from GK_OPERATION_JSJY_CODE c  left join ( select d.hwzldedl,sum(case when (d.jcg = '5701' and d.nwm = '5601') then  d.zysl  end) as jgnm, sum(case  when (d.jcg = '5701' and d.nwm = '5602') then d.zysl end) as jgwm,sum(case when (d.jcg = '5702' and d.nwm = '5601') then d.zysl end) as cgnm, sum(case when (d.jcg = '5702' and d.nwm = '5602') then  d.zysl end) as cgwm from GK_OPERATION_JSJY_DCSB d where d.record_status != 9 and d.bgsj >=  to_date(?1,'yyyy-mm-dd') and d.bgsj <= to_date(?2,'yyyy-mm-dd') and d.hwzldedl like ?3% and d.nwm like ?4% and d.szd like ?5% and d.szgk like ?6% and d.szgq like ?7% and d.jcg like ?8%  group by d.hwzldedl) a on a.hwzldedl =c.id where c.pid = 7201 or c.pid = 7202 or c.pid = 7203 or c.pid = 7204 or c.pid = 7205 or c.pid = 7206 or c.pid = 7207 or c.pid = 7208 or c.pid = 7209 or c.pid = 7210 or c.pid = 7211 or c.pid = 7212 or c.pid = 7213 or c.pid = 7214 or c.pid = 7215 or c.pid = 7216 or c.pid = 7217 order by c.id", nativeQuery = true)
 	public List<Object> dcsbtjbg2(String sTime, String eTime,String hwzldedl,String nwmid,String szdid,String szgkid,String szgqid,String jcgid);
+
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_DCSB m where m.ssjyr like ?1%  and m.record_Status<>9 and m.record_Status<>2 and m.record_Status<>1", nativeQuery = true)
+	public List<Object> findByJyrid(String jyrid );
+	
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_DCSB 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/gkjygl/cghzyxxgl/dcsb/service/DcsbService.java

@@ -14,7 +14,7 @@ public interface DcsbService extends BaseWorkFlowService {
 	public <S extends DcsbEntity> S save(S entity);
 
 	public <S extends DcsbEntity> S submit(S entity);
-	
+
 	DcsbEntity findOne(String id);
 
 	public Object selectCount(String sTime, String eTime);
@@ -23,6 +23,8 @@ public interface DcsbService extends BaseWorkFlowService {
 
 	List<DcsbEntity> findDcsb(String szdid);
 
+	List<Object> findByJyrid(String jyrid);
+	List<Object> findByGqids(String gqid);
 	/**
 	 * 查询当前单船作业数量和吨数（省级）
 	 * 
@@ -30,7 +32,8 @@ public interface DcsbService extends BaseWorkFlowService {
 	 * @param endDate
 	 * @return
 	 */
-	public List<Object> tongjiproValue(String startDate, String endDate,String hwzl,String nwmid,String szdid,String szgkid,String szgqid,String jcgid,String dedlid);
+	public List<Object> tongjiproValue(String startDate, String endDate, String hwzl, String nwmid, String szdid, String szgkid, String szgqid, String jcgid, String dedlid);
+
 	/**
 	 * 查询当前单船作业数量和吨数（市级）
 	 * 
@@ -38,62 +41,75 @@ public interface DcsbService extends BaseWorkFlowService {
 	 * @param endDate
 	 * @return
 	 */
-	public List<Object> tongjicityValue(String startDate, String endDate,String hwzl,String nwmid,String szdid,String szgkid,String szgqid,String jcgid,String dedlid);
+	public List<Object> tongjicityValue(String startDate, String endDate, String hwzl, String nwmid, String szdid, String szgkid, String szgqid, String jcgid, String dedlid);
+
 	/**
 	 * 环比数据
+	 * 
 	 * @param hwzlid
 	 * @param startDate
 	 * @param endDate
 	 * @return
 	 */
-	public List<Object> hwttlfz(String hwzlid,String startDate,String endDate,String szdid,String szgkid,String szgqid,String sfdwkf);
+	public List<Object> hwttlfz(String hwzlid, String startDate, String endDate, String szdid, String szgkid, String szgqid, String sfdwkf);
+
 	/**
 	 * 环比增长率
+	 * 
 	 * @param hwzlid
 	 * @param startDate
 	 * @param endDate
 	 * @return
 	 */
-	public List<Object> hwttlhb(String hwzlid,String startDate,String endDate,String szdid,String szgkid,String szgqid,String sfdwkf);
+	public List<Object> hwttlhb(String hwzlid, String startDate, String endDate, String szdid, String szgkid, String szgqid, String sfdwkf);
+
 	/**
 	 * 同比数据
 	 */
-	public List<Object> hwttlfztb(String hwzlid,String startDate,String szdid,String szgkid,String szgqid,String sfdwkf);
+	public List<Object> hwttlfztb(String hwzlid, String startDate, String szdid, String szgkid, String szgqid, String sfdwkf);
+
 	/**
 	 * 同比增长率
 	 */
-	public List<Object> hwttltb(String hwzlid,String startDate,String szdid,String szgkid,String szgqid,String sfdwkf);
-	
+	public List<Object> hwttltb(String hwzlid, String startDate, String szdid, String szgkid, String szgqid, String sfdwkf);
+
 	/**
 	 * 环比数据
+	 * 
 	 * @param hwzlid
 	 * @param startDate
 	 * @param endDate
 	 * @return
 	 */
-	public List<Object> hwttlfzmt(String hwzlid,String startDate,String endDate,String szdid,String szgkid,String szgqid,String sfdwkf);
+	public List<Object> hwttlfzmt(String hwzlid, String startDate, String endDate, String szdid, String szgkid, String szgqid, String sfdwkf);
+
 	/**
 	 * 环比增长率
+	 * 
 	 * @param hwzlid
 	 * @param startDate
 	 * @param endDate
 	 * @return
 	 */
-	public List<Object> hwttlhbmt(String hwzlid,String startDate,String endDate,String szdid,String szgkid,String szgqid,String sfdwkf);
+	public List<Object> hwttlhbmt(String hwzlid, String startDate, String endDate, String szdid, String szgkid, String szgqid, String sfdwkf);
+
 	/**
 	 * 同比数据
 	 */
-	public List<Object> hwttlfztbmt(String hwzlid,String startDate,String szdid,String szgkid,String szgqid,String sfdwkf);
+	public List<Object> hwttlfztbmt(String hwzlid, String startDate, String szdid, String szgkid, String szgqid, String sfdwkf);
+
 	/**
 	 * 同比增长率
 	 */
-	public List<Object> hwttltbmt(String hwzlid,String startDate,String szdid,String szgkid,String szgqid,String sfdwkf);
+	public List<Object> hwttltbmt(String hwzlid, String startDate, String szdid, String szgkid, String szgqid, String sfdwkf);
+
 	/**
 	 * 单船申报统计表格，查询货物种类第一大类时数据
 	 */
-	public List<Object> dcsbtjbg(String sTime, String eTime,String hwzl,String nwmid,String szdid,String szgkid,String szgqid,String jcgid);
+	public List<Object> dcsbtjbg(String sTime, String eTime, String hwzl, String nwmid, String szdid, String szgkid, String szgqid, String jcgid);
+
 	/**
 	 * 单船申报统计表格，查询货物种类第二大类时数据
 	 */
-	public List<Object> dcsbtjbg2(String sTime, String eTime,String hwzldedl,String nwmid,String szdid,String szgkid,String szgqid,String jcgid);
+	public List<Object> dcsbtjbg2(String sTime, String eTime, String hwzldedl, String nwmid, String szdid, String szgkid, String szgqid, String jcgid);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/service/impl/DcsbServiceImpl.java

@@ -420,4 +420,16 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 		}
 		return responseContent;
 	}
+
+	@Override
+	public List<Object> findByJyrid(String jyrid) {
+		// TODO Auto-generated method stub
+		return dao.findByJyrid(jyrid);
+	}
+	
+	@Override
+	public List<Object> findByGqids(String gqids) {
+		// TODO Auto-generated method stub
+		return dao.findByGqids(gqids);
+	}
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzns/ctl/XkznsCtl.java

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

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

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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/dao/XkzbgDao.java

@@ -11,4 +11,10 @@ public interface XkzbgDao extends SecRepository<XkzbgEntity, String> {
 
 	@Query("SELECT m  FROM XkzbgEntity m WHERE  m.jyrid =?1 and m.recordStatus=2  order by m.updateDateTime desc")
 	public List<XkzbgEntity> findByJyrid(String jyrid);
+	
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_XKZBGXX 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_XKZBGXX 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/gkjygl/gkjyxkgl/gkjyxkbg/service/XkzbgService.java

@@ -5,18 +5,20 @@ import java.util.List;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.entity.XkzbgEntity;
 import com.xt.jygl.workflow.service.BaseWorkFlowService;
 
-
-
-public interface XkzbgService extends BaseWorkFlowService{
+public interface XkzbgService extends BaseWorkFlowService {
 	void logicDelete(String id);
 
 	public <S extends XkzbgEntity> S save(S entity);
-	
+
 	public <S extends XkzbgEntity> S submit(S entity);
 
 	XkzbgEntity findOne(String id);
-	
-	public boolean changeAudit(String shyj,  XkzbgEntity entity,
-			boolean flag);
+
+	public boolean changeAudit(String shyj, XkzbgEntity entity, boolean flag);
+
 	List<XkzbgEntity> findByJyrid(String jyrid);
+
+	List<Object> findByJyrids(String jyrid);
+
+	List<Object> findByGqids(String gqids);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/service/impl/XkzbgServiceImpl.java

@@ -253,4 +253,14 @@ public class XkzbgServiceImpl extends BaseWorkFlowServiceImpl<XkzbgEntity, Strin
 	public List<XkzbgEntity> findByJyrid(String jyrid) {
 		return dao.findByJyrid(jyrid);
 	}
+
+	@Override
+	public List<Object> findByJyrids(String jyrid) {
+		return dao.findByJyrids(jyrid);
+	}
+
+	@Override
+	public List<Object> findByGqids(String gqids) {
+		return dao.findByGqids(gqids);
+	}
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -2174,7 +2174,7 @@ public class XkzsqCtl extends BaseWebCtl {
 			}
 			if (fjEntity != null) {
 				wr.setAttr("acc", fjEntity);
-			}else{
+			} else {
 				wr.setSuccess(false);
 				wr.setMessage("上传的附件不能为空！");
 			}
@@ -2814,9 +2814,15 @@ public class XkzsqCtl extends BaseWebCtl {
 	@RequestMapping(value = "/saveQtFile")
 	@ResponseBody
 	public WebJsonResult saveQtFile(MultipartFile filename, Model model) {
-		AccessoryEntity acc = accessoryService.saveFile(filename, "xkzsqqtfj");
 		WebJsonResult wr = success();
-		wr.setAttr("acc", acc);
+		if (filename != null && filename.getSize() > 0) {
+			AccessoryEntity acc = accessoryService.saveFile(filename, "xkzsqqtfj");
+			wr.setAttr("acc", acc);
+		} else {
+			wr.setSuccess(false);
+			wr.setMessage("请上传附件或上传的文件不能为空文件!");
+		}
+
 		return wr;
 	}
 

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/dao/XkzsqDao.java

@@ -11,4 +11,10 @@ public interface XkzsqDao extends SecRepository<XkzsqEntity, String> {
 
 	@Query("SELECT m  FROM XkzsqEntity m WHERE  m.jyrid =?1 and m.recordStatus=2  order by m.updateDateTime desc")
 	public List<XkzsqEntity> findByJyrid(String jyrid);
+	
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_XKZSQXX 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_XKZSQXX 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/gkjygl/gkjyxkgl/gkjyxksq/service/XkzsqService.java

@@ -15,6 +15,10 @@ public interface XkzsqService extends BaseWorkFlowService {
 	XkzsqEntity findOne(String id);
 
 	public boolean changeAudit(String shyj, XkzsqEntity entity, boolean flag);
-	
+
 	List<XkzsqEntity> findByJyrid(String jyrid);
-}	
+
+	List<Object> findByJyrids(String jyrid);
+
+	List<Object> findByGqids(String gqids);
+}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/service/impl/XkzsqServiceImpl.java

@@ -233,4 +233,14 @@ public class XkzsqServiceImpl extends BaseWorkFlowServiceImpl<XkzsqEntity, Strin
 		
 		return dao.findByJyrid(jyrid);
 	}
+
+	@Override
+	public List<Object> findByJyrids(String jyrid) {
+		return dao.findByJyrids(jyrid);
+	}
+
+	@Override
+	public List<Object> findByGqids(String gqids) {
+		return dao.findByGqids(gqids);
+	}
 }

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

@@ -1206,7 +1206,7 @@ public class XkzyxCtl extends BaseWebCtl {
 			wr.setAttr("acc", fjEntity);
 		} else {
 			wr.setSuccess(false);
-			wr.setMessage("请上传附件!");
+			wr.setMessage("请上传附件或上传的文件不能为空文件!");
 		}
 		return wr;
 	}
@@ -1863,9 +1863,14 @@ public class XkzyxCtl extends BaseWebCtl {
 	@RequestMapping(value = "/saveQtFile")
 	@ResponseBody
 	public WebJsonResult saveQtFile(MultipartFile filename, Model model) {
-		AccessoryEntity acc = accessoryService.saveFile(filename, "xkzyxqtfj");
 		WebJsonResult wr = success();
-		wr.setAttr("acc", acc);
+		if (filename != null && filename.getSize()>0) {
+			AccessoryEntity acc = accessoryService.saveFile(filename, "xkzyxqtfj");
+			wr.setAttr("acc", acc);
+		} else {
+			wr.setSuccess(false);
+			wr.setMessage("请上传附件或上传的文件不能为空文件!");
+		}
 		return wr;
 	}
 

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/dao/XkzyxDao.java

@@ -10,4 +10,10 @@ import com.xtframe.sec.common.SecRepository;
 public interface XkzyxDao extends SecRepository<XkzyxEntity, String> {
 	@Query("SELECT m  FROM XkzyxEntity m WHERE  m.jyrid =?1 and m.recordStatus=2 order by m.updateDateTime desc")
 	public List<XkzyxEntity> findByJyrid(String jyrid);
+	
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_XKZYXXX 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_XKZYXXX 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/gkjygl/gkjyxkgl/gkjyxkyx/service/XkzyxService.java

@@ -17,4 +17,8 @@ public interface XkzyxService extends BaseWorkFlowService {
 	public boolean changeAudit(String shyj, XkzyxEntity entity, boolean flag);
 
 	List<XkzyxEntity> findByJyrid(String jyrid);
+	
+	List<Object> findByJyrids(String jyrid);
+
+	List<Object> findByGqids(String gqids);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/service/impl/XkzyxServiceImpl.java

@@ -125,4 +125,15 @@ public class XkzyxServiceImpl extends BaseWorkFlowServiceImpl<XkzyxEntity, Strin
 	public List<XkzyxEntity> findByJyrid(String jyrid) {
 		return dao.findByJyrid(jyrid);
 	}
+
+	@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);
+	}
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/dao/XkzzxDao.java

@@ -1,8 +1,17 @@
 package com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.dao;
 
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.entity.XkzzxEntity;
 import com.xtframe.sec.common.SecRepository;
 
 public interface XkzzxDao extends SecRepository<XkzzxEntity, String> {
 
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_XKZZXXX 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_XKZZXXX 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/gkjygl/gkjyxkgl/gkjyxkzx/service/XkzzxService.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.service;
 
+import java.util.List;
+
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.entity.XkzzxEntity;
 import com.xt.jygl.workflow.service.BaseWorkFlowService;
 
@@ -13,4 +15,8 @@ public interface XkzzxService extends BaseWorkFlowService {
 	XkzzxEntity findOne(String id);
 
 	public boolean changeAudit(String shyj, XkzzxEntity entity, boolean flag);
+	
+	List<Object> findByJyrids(String jyrid);
+
+	List<Object> findByGqids(String gqids);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/service/impl/XkzzxServiceImpl.java

@@ -120,4 +120,14 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 	public String getProcessDefinitionKey() {
 		return XkzzxEntity.PROCESS_DEFINITION_KEY;
 	}
+
+	@Override
+	public List<Object> findByJyrids(String jyrid) {
+		return dao.findByJyrids(jyrid);
+	}
+
+	@Override
+	public List<Object> findByGqids(String gqids) {
+		return dao.findByGqids(gqids);
+	}
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -578,6 +578,10 @@ public class LhbgCtl extends BaseWebCtl {
 						fjEntity = lhbgfjService.save(fjEntity);
 						break;
 					}
+				} else {
+					wr.setSuccess(false);
+					wr.setMessage("上传附件不能为空!");
+					return wr;
 				}
 			}
 			wr.setAttr("acc", fjEntity);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/dao/LhbgDao.java

@@ -11,4 +11,11 @@ public interface LhbgDao extends SecRepository<LhbgEntity, String> {
 
 	@Query("SELECT m  FROM LhbgEntity m WHERE  m.jyrid =?1 and m.recordStatus=2  order by m.updateDateTime desc")
 	public List<LhbgEntity> findByJyrid(String jyrid);
+	
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_LHBG 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_LHBG 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/gkjygl/gklhxkgl/gkjylhbg/service/LhbgService.java

@@ -19,4 +19,8 @@ public interface LhbgService extends BaseWorkFlowService{
 	public boolean changeAudit(String shyj,  LhbgEntity entity,
 			boolean flag,String userids);
 	List<LhbgEntity> findByJyrid(String jyrid);
+	
+	List<Object> findByJyrids(String jyrid);
+
+	List<Object> findByGqids(String gqids);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/service/impl/LhbgServiceImpl.java

@@ -112,4 +112,16 @@ public class LhbgServiceImpl extends BaseWorkFlowServiceImpl<LhbgEntity, String>
 	public List<LhbgEntity> findByJyrid(String jyrid) {
 		return dao.findByJyrid(jyrid);
 	}
+
+	@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/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -507,6 +507,10 @@ public class LhsqCtl extends BaseWebCtl {
 						fjEntity = lhsqfjService.save(fjEntity);
 						break;
 					}
+				} else {
+					wr.setSuccess(false);
+					wr.setMessage("上传附件不能为空!");
+					return wr;
 				}
 			}
 			wr.setAttr("acc", fjEntity);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/dao/LhsqDao.java

@@ -15,6 +15,10 @@ public interface LhsqDao extends SecRepository<LhsqEntity, String> {
 	@Query("SELECT m  FROM LhsqEntity m WHERE  m.id =?1 and m.recordStatus<>9")
 	public LhsqEntity findById(String id);
 	
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_LHSQ 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_LHSQ 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/gkjygl/gklhxkgl/gkjylhsq/service/LhsqService.java

@@ -17,4 +17,8 @@ public interface LhsqService extends BaseWorkFlowService {
 	public boolean changeAudit(String shyj, LhsqEntity entity, boolean flag,String userids);
 
 	List<LhsqEntity> findByJyrid(String jyrid);
+	
+	List<Object> findByJyrids(String jyrid);
+
+	List<Object> findByGqids(String gqids);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/service/impl/LhsqServiceImpl.java

@@ -113,4 +113,14 @@ public class LhsqServiceImpl extends BaseWorkFlowServiceImpl<LhsqEntity, String>
 	public List<LhsqEntity> findByJyrid(String jyrid) {
 		return dao.findByJyrid(jyrid);
 	}
+
+	@Override
+	public List<Object> findByJyrids(String jyrid) {
+		return dao.findByJyrids(jyrid);
+	}
+
+	@Override
+	public List<Object> findByGqids(String gqids) {
+		return dao.findByGqids(gqids);
+	}
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -574,6 +574,10 @@ public class LhyxCtl extends BaseWebCtl {
 						fjEntity = lhyxfjService.save(fjEntity);
 						break;
 					}
+				} else {
+					wr.setSuccess(false);
+					wr.setMessage("上传附件不能为空!");
+					return wr;
 				}
 			}
 			wr.setAttr("acc", fjEntity);
@@ -654,7 +658,7 @@ public class LhyxCtl extends BaseWebCtl {
 					}
 
 					String url = "GK_OPERATION_JSJY_LHYX_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid;
-					boolean tbflag = getTbStatus(url,entity.getSzd().getId());
+					boolean tbflag = getTbStatus(url, entity.getSzd().getId());
 					if (tbflag) {
 						entity.setTbzt("Y");
 						lhyxService.save(entity);
@@ -693,7 +697,7 @@ public class LhyxCtl extends BaseWebCtl {
 		lhyxService.save(entity);
 		String url = "GK_OPERATION_JSJY_LHYX_ONE_CP?condition=ID=" + id + ";FJID=" + fjid;
 
-		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/gkjygl/gklhxkgl/gkjylhyx/dao/LhyxDao.java

@@ -11,4 +11,10 @@ public interface LhyxDao extends SecRepository<LhyxEntity, String> {
 
 	@Query("SELECT m  FROM LhyxEntity m WHERE  m.jyrid =?1 and m.recordStatus=2  order by m.updateDateTime desc")
 	public List<LhyxEntity> findByJyrid(String jyrid);
+	
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_LHYX 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_LHYX 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/gkjygl/gklhxkgl/gkjylhyx/service/LhyxService.java

@@ -17,4 +17,8 @@ public interface LhyxService extends BaseWorkFlowService {
 	public boolean changeAudit(String shyj, LhyxEntity entity, boolean flag, String userids);
 
 	List<LhyxEntity> findByJyrid(String jyrid);
+	
+	List<Object> findByJyrids(String jyrid);
+
+	List<Object> findByGqids(String gqids);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/service/impl/LhyxServiceImpl.java

@@ -112,4 +112,16 @@ public class LhyxServiceImpl extends BaseWorkFlowServiceImpl<LhyxEntity, String>
 	public List<LhyxEntity> findByJyrid(String jyrid) {
 		return dao.findByJyrid(jyrid);
 	}
+
+	@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);
+	}
 }