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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbCtl.java

@@ -314,7 +314,22 @@ public class DcsbCtl extends BaseWebCtl {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_JCG);
 		return list;
 	}
-
+	
+	//企业性质
+	@RequestMapping(value = "/selectQyxz")
+	@ResponseBody
+	public List<CodeEntity> selectQyxz(Model model) {
+		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_QYXZ);
+		return list;
+	}
+	//服务类型
+	@RequestMapping(value = "/selectFwlx")
+	@ResponseBody
+	public List<CodeEntity> selectFwlx(Model model) {
+		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_FWLX);
+		return list;
+	}
+	
 	// 审批状态
 	@RequestMapping(value = "/selectShzt")
 	@ResponseBody

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

@@ -32,7 +32,7 @@ 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, String qyxzid, String fwlxid);
 
 	/**
 	 * 查询当前单船作业数量和吨数（市级）
@@ -41,7 +41,7 @@ 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,String qyxzid, String fwlxid);
 
 	/**
 	 * 环比数据
@@ -106,10 +106,10 @@ public interface DcsbService extends BaseWorkFlowService {
 	/**
 	 * 单船申报统计表格，查询货物种类第一大类时数据
 	 */
-	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,String qyxzid,String fwlxid);
 
 	/**
 	 * 单船申报统计表格，查询货物种类第二大类时数据
 	 */
-	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,String qyxzid,String fwlxid);
 }

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

@@ -36,7 +36,6 @@ import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Service;
 
 import com.xt.jygl.common.Constants;
@@ -209,11 +208,17 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	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,String qyxzid,String fwlxid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
 		sb.append("select count(tw.id) sbsl,tg.gkmc, round(sum(tw.zysl / 10000), 4) sum ");
 		sb.append(" from GK_OPERATION_JSJY_DCSB tw left join GK_BASIC_JSJY_GK_GK tg on tw.szgk = tg.id  ");
+		if ( StringUtils.isNotEmpty(qyxzid)){
+			sb.append("left join GK_BASIC_JSJY_JYR jyr on tw.ssjyr = jyr.id ");
+		}
+		if ( StringUtils.isNotEmpty(fwlxid)){
+			sb.append("left join GK_BASIC_JSJY_JYR_MT mt on tw.mt = mt.id ");
+		}
 		sb.append(" where tw.RECORD_STATUS !=9  ");
 
 		if (!StringUtils.isEmpty(startDate)) {
@@ -255,6 +260,14 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 			sb.append(" and tw.hwzldedl = :hwzldedl");
 			params.put("hwzldedl", dedlid);
 		}
+		if (!StringUtils.isEmpty(qyxzid)) {
+			sb.append(" and jyr.qyxz = :qyxzid");
+			params.put("qyxzid", qyxzid);
+		}
+		if (!StringUtils.isEmpty(fwlxid)) {
+			sb.append(" and mt.fwlx = :fwlxid");
+			params.put("fwlxid", fwlxid);
+		}
 		sb.append(" group by tg.gkmc ");
 		System.out.println(sb.toString());
 		return (List<Object>) dao.nativeQuery(sb.toString(), params);
@@ -263,11 +276,17 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	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,String qyxzid,String fwlxid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
 		sb.append("select count(tw.id) sbsl,tg.gqmc, round(sum(tw.zysl / 10000), 4) sum ");
 		sb.append(" from GK_OPERATION_JSJY_DCSB tw left join GK_BASIC_JSJY_GK_GQ tg on tw.szgq = tg.id  ");
+		if ( StringUtils.isNotEmpty(qyxzid)){
+			sb.append("left join GK_BASIC_JSJY_JYR jyr on tw.ssjyr = jyr.id ");
+		}
+		if ( StringUtils.isNotEmpty(fwlxid)){
+			sb.append("left join GK_BASIC_JSJY_JYR_MT mt on tw.mt = mt.id ");
+		}
 		sb.append(" where tw.RECORD_STATUS !=9  ");
 
 		if (!StringUtils.isEmpty(startDate)) {
@@ -309,6 +328,14 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 			sb.append(" and tw.hwzldedl = :hwzldedl");
 			params.put("hwzldedl", dedlid);
 		}
+		if (!StringUtils.isEmpty(qyxzid)) {
+			sb.append(" and jyr.qyxz = :qyxzid");
+			params.put("qyxzid", qyxzid);
+		}
+		if (!StringUtils.isEmpty(fwlxid)) {
+			sb.append(" and mt.fwlx = :fwlxid");
+			params.put("fwlxid", fwlxid);
+		}
 		sb.append(" group by tg.gqmc ");
 		System.out.println(sb.toString());
 		return (List<Object>) dao.nativeQuery(sb.toString(), params);
@@ -360,7 +387,7 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	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,String qyxzid,String fwlxid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
 		sb.append("select text,a.jgnm,a.jgwm,a.cgnm,a.cgwm from GK_OPERATION_JSJY_CODE c  ");
@@ -368,7 +395,10 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 		sb.append(" sum(case  when (d.jcg = '5701' and d.nwm = '5602') then d.zysl end) as jgwm, ");
 		sb.append(" sum(case when (d.jcg = '5702' and d.nwm = '5601') then d.zysl end) as cgnm,  ");
 		sb.append(" sum(case when (d.jcg = '5702' and d.nwm = '5602') then  d.zysl end) as cgwm ");
-		sb.append(" from GK_OPERATION_JSJY_DCSB d where d.record_status != 9 ");
+		sb.append(" from GK_OPERATION_JSJY_DCSB d ");
+		sb.append("left join GK_BASIC_JSJY_JYR jyr on d.ssjyr = jyr.id ");
+		sb.append("left join GK_BASIC_JSJY_JYR_MT mt on d.mt = mt.id ");
+		sb.append("where d.record_status != 9 ");
 		if (!StringUtils.isEmpty(sTime)) {
 			sb.append(" and to_char(d.bgsj, 'yyyy-mm-dd') >=  :sTime ");
 			params.put("sTime", sTime);
@@ -402,6 +432,14 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 			sb.append(" and d.jcg = :jcg");
 			params.put("jcg", jcgid);
 		}
+		if (!StringUtils.isEmpty(qyxzid)) {
+			sb.append(" and jyr.qyxz = :qyxzid");
+			params.put("qyxzid", qyxzid);
+		}
+		if (!StringUtils.isEmpty(fwlxid)) {
+			sb.append(" and mt.fwlx = :fwlxid");
+			params.put("fwlxid", fwlxid);
+		}
 		sb.append(" group by d.hwzl) a on a.hwzl =c.id where c.pid = 72 order by c.id ");
 		System.out.println(sb.toString());
 		return (List<Object>) dao.nativeQuery(sb.toString(), params);
@@ -409,7 +447,7 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	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,String qyxzid,String fwlxid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
 		sb.append("select text,a.jgnm,a.jgwm,a.cgnm,a.cgwm from GK_OPERATION_JSJY_CODE c  ");
@@ -417,7 +455,10 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 		sb.append(" sum(case  when (d.jcg = '5701' and d.nwm = '5602') then d.zysl end) as jgwm, ");
 		sb.append(" sum(case when (d.jcg = '5702' and d.nwm = '5601') then d.zysl end) as cgnm,  ");
 		sb.append(" sum(case when (d.jcg = '5702' and d.nwm = '5602') then  d.zysl end) as cgwm ");
-		sb.append(" from GK_OPERATION_JSJY_DCSB d where d.record_status != 9 ");
+		sb.append(" from GK_OPERATION_JSJY_DCSB d ");
+		sb.append("left join GK_BASIC_JSJY_JYR jyr on d.ssjyr = jyr.id ");
+		sb.append("left join GK_BASIC_JSJY_JYR_MT mt on d.mt = mt.id ");
+		sb.append("where d.record_status != 9 ");
 		if (!StringUtils.isEmpty(sTime)) {
 			sb.append(" and to_char(d.bgsj, 'yyyy-mm-dd') >=  :sTime ");
 			params.put("sTime", sTime);
@@ -451,6 +492,14 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 			sb.append(" and d.jcg = :jcg");
 			params.put("jcg", jcgid);
 		}
+		if (!StringUtils.isEmpty(qyxzid)) {
+			sb.append(" and jyr.qyxz = :qyxzid");
+			params.put("qyxzid", qyxzid);
+		}
+		if (!StringUtils.isEmpty(fwlxid)) {
+			sb.append(" and mt.fwlx = :fwlxid");
+			params.put("fwlxid", fwlxid);
+		}
 		sb.append(" group by d.hwzldedl) a on a.hwzldedl =c.id ");
 		sb.append(" where c.pid = 7201 or c.pid = 7202 or c.pid = 7203 ");
 		sb.append(" or c.pid = 7204 or c.pid = 7205 or c.pid = 7206 ");