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

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

@@ -40,7 +40,6 @@ import org.springframework.stereotype.Service;
 
 import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
-import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.dao.DcsbDao;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbEntity;
@@ -51,7 +50,6 @@ import com.xt.jygl.workflow.service.impl.BaseWorkFlowServiceImpl;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.SecRepository;
-import com.xtframe.sec.role.entity.RoleEntity;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.sec.utils.SecUtils;
 import com.xtframe.util.StringUtils;
@@ -207,16 +205,84 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 		return dao.findDcsb(szdid);
 	}
 
+	@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) {
-
-		return dao.tongjiproValue(startDate, endDate, hwzl, nwmid, szdid, szgkid, szgqid, jcgid, dedlid);
+		//return dao.tongjiproValue(startDate, endDate, hwzl, nwmid, szdid, szgkid, szgqid, jcgid, dedlid);
+		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 from GK_OPERATION_JSJY_DCSB tw left join GK_BASIC_JSJY_GK_GK tg on tw.szgk = tg.id  ");
+		sb.append("where tw.RECORD_STATUS !=9 and  to_char(tw.bgsj, 'yyyy-mm-dd') >= :startDate and to_char(tw.bgsj, 'yyyy-mm-dd') <= :endDate ");
+		params.put("startDate", startDate);
+		params.put("endDate", endDate);
+
+		if (!StringUtils.isEmpty(nwmid)) {
+			sb.append(" and tw.nwm = :nwm");
+			params.put("nwm", nwmid);
+		}
+		if (!StringUtils.isEmpty(szdid)) {
+			sb.append(" and tw.szd = :szd");
+			params.put("szd", szdid);
+		}
+		if (!StringUtils.isEmpty(szgkid)) {
+			sb.append(" and tw.szgk = :szgk");
+			params.put("szgk", szgkid);
+		}
+		if (!StringUtils.isEmpty(szgqid)) {
+			sb.append(" and tw.szgq = :szgq");
+			params.put("szgq", szgqid);
+		}
+		if (!StringUtils.isEmpty(jcgid)) {
+			sb.append(" and tw.jcg = :jcg");
+			params.put("jcg", jcgid);
+		}
+		if (!StringUtils.isEmpty(dedlid)) {
+			sb.append(" and tw.hwzldedl = :hwzldedl");
+			params.put("hwzldedl", dedlid);
+		}
+		sb.append(" group by tg.gkmc ");
+		System.out.println(sb.toString());
+		return (List<Object>) dao.nativeQuery(sb.toString(), params);
 	}
 
+	@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) {
-
-		return dao.tongjicityValue(startDate, endDate, hwzl, nwmid, szdid, szgkid, szgqid, jcgid, dedlid);
+		//return dao.tongjicityValue(startDate, endDate, hwzl, nwmid, szdid, szgkid, szgqid, jcgid, dedlid);
+		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 from GK_OPERATION_JSJY_DCSB tw left join GK_BASIC_JSJY_GK_GQ tg on tw.szgq = tg.id ");
+		sb.append("where tw.RECORD_STATUS !=9 and  to_char(tw.bgsj, 'yyyy-mm-dd') >= :startDate and to_char(tw.bgsj, 'yyyy-mm-dd') <= :endDate ");
+		params.put("startDate", startDate);
+		params.put("endDate", endDate);
+
+		if (!StringUtils.isEmpty(nwmid)) {
+			sb.append(" and tw.nwm = :nwm");
+			params.put("nwm", nwmid);
+		}
+		if (!StringUtils.isEmpty(szdid)) {
+			sb.append(" and tw.szd = :szd");
+			params.put("szd", szdid);
+		}
+		if (!StringUtils.isEmpty(szgkid)) {
+			sb.append(" and tw.szgk = :szgk");
+			params.put("szgk", szgkid);
+		}
+		if (!StringUtils.isEmpty(szgqid)) {
+			sb.append(" and tw.szgq = :szgq");
+			params.put("szgq", szgqid);
+		}
+		if (!StringUtils.isEmpty(jcgid)) {
+			sb.append(" and tw.jcg = :jcg");
+			params.put("jcg", jcgid);
+		}
+		if (!StringUtils.isEmpty(dedlid)) {
+			sb.append(" and tw.hwzldedl = :hwzldedl");
+			params.put("hwzldedl", dedlid);
+		}
+		sb.append(" group by tg.gqmc ");
+		System.out.println(sb.toString());
+		return (List<Object>) dao.nativeQuery(sb.toString(), params);
 	}
 
 	@Override

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

@@ -37,7 +37,7 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 	public List<Object> sumZyslBySzgk(String dydlid, String data, String mdata, String ydata, String szdid, String szgkid, String szgqid,String dedlid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
-		sb.append("select A.szgk,A.s/10000,nvl(round(a.s/b.ss,2)*100,0),nvl(round(a.s/c.sss,2)*100,0)  from ");
+		sb.append("select A.szgk, round(A.s/10000, 4),nvl(round(a.s/b.ss,2)*100,0),nvl(round(a.s/c.sss,2)*100,0)  from ");
 		sb.append(" ( select szgk,nvl(sum(zysl)+sum(zyslteu)*10,0) s  ");
 		sb.append(" from (select szgk,decode(v2,0,v1,v2) zysl,decode(v4,0,v3,v4) zyslteu from( ");
 		sb.append("  select t.SZGK,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.zyslteu,0) v3,nvl(t.zyslteuxg,0) v4 ");
@@ -137,7 +137,7 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 	public List<Object> sumZyslBySzgq(String dydlid, String data, String mdata, String ydata, String szdid, String szgkid, String szgqid,String dedlid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
-		sb.append("select A.szgq,A.s/10000,nvl(round(a.s/b.ss,2)*100,0),nvl(round(a.s/c.sss,2)*100,0)  from ");
+		sb.append("select A.szgq, round(A.s/10000, 4),nvl(round(a.s/b.ss,2)*100,0),nvl(round(a.s/c.sss,2)*100,0)  from ");
 		sb.append(" ( select szgq,nvl(sum(zysl)+sum(zyslteu)*10,0) s  ");
 		sb.append(" from (select szgq,decode(v2,0,v1,v2) zysl,decode(v4,0,v3,v4) zyslteu from( ");
 		sb.append("  select t.SZGq,nvl(t.ZYSL,0) v1,nvl(t.ZYSLxg,0) v2,nvl(t.zyslteu,0) v3,nvl(t.zyslteuxg,0) v4 ");
@@ -236,10 +236,10 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 	public List<Object> sum(String data, String mdata, String ydata, String szdid, String szgkid, String szgqid,String dydlid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
-		sb.append("select aa.s, (nvl(aa.jg,0)+nvl(bb.cg,0))/10000,nvl(round((aa.jg+aa.cg)/decode((bb.jg + bb.cg),0,1), 2)*100,0),");
+		sb.append("select aa.s,  round((nvl(aa.jg,0)+nvl(bb.cg,0))/10000, 4),nvl(round((aa.jg+aa.cg)/decode((bb.jg + bb.cg),0,1), 2)*100,0),");
 		sb.append("nvl(round((aa.jg+aa.cg)/decode((cc.jg + cc.cg),0,1), 2)*100,0),");
-		sb.append("nvl(aa.jg,0)/10000,nvl(round(aa.jg/decode(bb.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(bb.cg,0,1),2)*100,0),");
-		sb.append("nvl(aa.cg,0)/10000,nvl(round(aa.jg/decode(cc.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(cc.cg,0,1),2)*100,0)");
+		sb.append("round(nvl(aa.jg,0)/10000,4),nvl(round(aa.jg/decode(bb.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(bb.cg,0,1),2)*100,0),");
+		sb.append("round(nvl(aa.cg,0)/10000,4),nvl(round(aa.jg/decode(cc.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(cc.cg,0,1),2)*100,0)");
 		sb.append(" from ");
 		sb.append(" (select max(c.text) s,sum(a.jg) jg,sum(a.cg) cg,max(a.hwzl) hwzl ");
 		sb.append(" from (select hwzl,sum(case when (d.jcg = '5701') then  nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as jg, ");
@@ -333,10 +333,10 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 	public List<Object> sum2(String data, String mdata, String ydata, String szdid, String szgkid, String szgqid,String dedlid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
-		sb.append("select aa.s, (nvl(aa.jg,0)+nvl(bb.cg,0))/10000,nvl(round((aa.jg+aa.cg)/ decode((bb.jg + bb.cg),0,1), 2)*100,0),");
+		sb.append("select aa.s, round((nvl(aa.jg,0)+nvl(bb.cg,0))/10000,4),nvl(round((aa.jg+aa.cg)/ decode((bb.jg + bb.cg),0,1), 2)*100,0),");
 		sb.append("nvl(round((aa.jg+aa.cg)/decode((cc.jg + cc.cg),0,1), 2)*100,0),");
-		sb.append("nvl(aa.jg,0)/10000,nvl(round(aa.jg/decode(bb.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(bb.cg,0,1),2)*100,0),");
-		sb.append("nvl(aa.cg,0)/10000,nvl(round(aa.jg/decode(cc.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(cc.cg,0,1),2)*100,0)");
+		sb.append("round(nvl(aa.jg,0)/10000,4),nvl(round(aa.jg/decode(bb.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(bb.cg,0,1),2)*100,0),");
+		sb.append("round(nvl(aa.cg,0)/10000,4),nvl(round(aa.jg/decode(cc.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(cc.cg,0,1),2)*100,0)");
 		sb.append(" from ");
 		sb.append(" (select max(c.text) s,sum(a.jg) jg,sum(a.cg) cg,max(a.hwzldedl) hwzldedl ");
 		sb.append(" from (select hwzldedl,sum(case when (d.jcg = '5701') then  nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as jg, ");

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/gkttlfx/ctl/HwttlfzCtl.java

@@ -210,6 +210,10 @@ public class HwttlfzCtl extends BaseWebCtl {
 				vo.setCgttl(e[7].toString());
 				vo.setCgtb(e[8].toString());
 				vo.setCghb(e[9].toString());
+				BigDecimal a = (BigDecimal) e[4];
+				BigDecimal d = (BigDecimal) e[7];
+				a = a.add(d);
+				vo.setZttl(a.toString());
 				slist.add(vo);
 			}
 			BigDecimal zttl = new BigDecimal("0.0000");
@@ -225,9 +229,10 @@ public class HwttlfzCtl extends BaseWebCtl {
 				Object[] e = (Object[]) ttllist.get(i);
 				SttlVo vo = new SttlVo();
 				vo.setHwzlname(e[0].toString());
-				vo.setZttl(e[1].toString());
+				//vo.setZttl(e[1].toString());
 				BigDecimal b = (BigDecimal) e[1];
-				zttl = zttl.add(b);
+				
+				//zttl = zttl.add(b);
 				vo.setZtb(e[2].toString());
 				b = (BigDecimal) e[2];
 				ztb = ztb.add(b);
@@ -252,7 +257,13 @@ public class HwttlfzCtl extends BaseWebCtl {
 				vo.setCghb(e[9].toString());
 				b = (BigDecimal) e[9];
 				cghb = cghb.add(b);
-				slist.add(vo);
+				
+				BigDecimal a = (BigDecimal) e[4];
+				BigDecimal d = (BigDecimal) e[7];
+				b = a.add(d);
+				vo.setZttl(b.toString());
+				zttl = zttl.add(b);
+				//slist.add(vo);
 			}
 			sum.setZttl(zttl.toString());
 			sum.setZhb(zhb.toString());