shilei
/
E10-secondev-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#E10-04# 优化项目收款、项目合同收款金额接口

Browse Source
main
shilei 1 year ago
parent 826c8f5e2a
commit 7a1784f387
1 changed files with 59 additions and 61 deletions
Show Stats Download Patch File Download Diff File

28
src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java
Unescape Escape View File

@ -1525,10 +1525,8 @@ public class HrmSelfHelpController {
} }
public static String null2String(String s,String def) { public static String null2String(String s,String def) {
return s == null ?(def==null?"":def) : s; return s == null ?(def==null?"":def) : s;
} }
@ -1564,9 +1562,9 @@ public class HrmSelfHelpController {
String groupId = "weaver-ebuilder-form-service"; String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC"; String sourceType = "LOGIC";
String sql =" select sum(cast(t1.htzje as decimal(18,2))) as htzje," + String sql =" select CONVERT(sum(cast(t1.htzje as decimal(18,2))),CHAR) as htzje," +
" sum(cast(t1.htyxje as decimal(18,2))) as htyxje," + " CONVERT(sum(cast(t1.htyxje as decimal(18,2))),CHAR) as htyxje," +
" sum(cast(t1.sumsk as decimal(18,2))) as sumsk " + " CONVERT(sum(cast(t1.sumsk as decimal(18,2))),CHAR) as sumsk " +
" from uf_jxhs_xmys t1 \n" + " from uf_jxhs_xmys t1 \n" +
" where t1.ysrq>='" +startday+"' and t1.ysrq<='"+endday+"' " + " where t1.ysrq>='" +startday+"' and t1.ysrq<='"+endday+"' " +
" and ( t1.qyjl = '"+employeeId+"' "+ " and ( t1.qyjl = '"+employeeId+"' "+
@ -1632,21 +1630,21 @@ public class HrmSelfHelpController {
String sourceType = "LOGIC"; String sourceType = "LOGIC";
String sql =" SELECT \n" + String sql =" SELECT \n" +
" sum(cast(t1.skje as decimal(18,2))) as skje,\n" + //收款金额 " CONVERT(sum(cast(t1.skje as decimal(18,2))),CHAR) as skje,\n" + //收款金额
" sum(cast(t1.xmskje as decimal(18,2))) as xmskje,\n" + // 项目收款金额 " CONVERT(sum(cast(t1.xmskje as decimal(18,2))),CHAR) as xmskje,\n" + // 项目收款金额
" sum(cast(t1.xsyxje as decimal(18,2))) as xsyxje," + // 销售有效金额 " CONVERT(sum(cast(t1.xsyxje as decimal(18,2))),CHAR) as xsyxje," + // 销售有效金额
" sum(cast(t1.xsje as decimal(18,2))) as xsje," + // 销售金额 " CONVERT(sum(cast(t1.xsje as decimal(18,2))),CHAR) as xsje," + // 销售金额
" sum(cast(t1.xmyxje as decimal(18,2))) as xmyxje," + //项目有效金额 " CONVERT(sum(cast(t1.xmyxje as decimal(18,2))),CHAR) as xmyxje," + //项目有效金额
" sum(cast(t1.xsjxhk as decimal(18,2))) as xsjxhk," + //有效绩效回款 " CONVERT(sum(cast(t1.xsjxhk as decimal(18,2))),CHAR) as xsjxhk," + //有效绩效回款
" sum(cast(t1.sumsk as decimal(18,2))) as sumsk," + //总收款金额 " CONVERT(sum(cast(t1.sumsk as decimal(18,2))),CHAR) as sumsk," + //总收款金额
" sum(cast(t1.sjjsk as decimal(18,2))) as sjjsk," + //实际结算款 " CONVERT(sum(cast(t1.sjjsk as decimal(18,2))),CHAR) as sjjsk," + //实际结算款
" sum(cast(t1.skjs as decimal(18,2))) as skjs " + //收款结算 " CONVERT(sum(cast(t1.skjs as decimal(18,2))),CHAR) as skjs " + //收款结算
" FROM uf_jxhs_skmx t1\n" + " FROM uf_jxhs_skmx t1\n" +
" LEFT JOIN uf_jxhs_zxhtzb t2 ON t1.hth = t2.hth AND t2.hth != '' AND t2.hth IS NOT NULL \n" + " LEFT JOIN uf_jxhs_zxhtzb t2 ON t1.hth = t2.hth AND t2.hth != '' AND t2.hth IS NOT NULL \n" +
" JOIN ebdf_physical_data epd on t1.id = epd.form_data_id and epd.delete_type = 0 \n" + " JOIN ebdf_physical_data epd on t1.id = epd.form_data_id and epd.delete_type = 0 \n" +
" WHERE t1.skje != 0 \n" + " WHERE t1.skje != 0 \n" +
" and t1.skje IS NOT NULL " + " and t1.skje IS NOT NULL " +
" and t1.skrq >= '" + startday+"' and skrq <='"+endday+"' "+ " and t1.xshsny >= '" + startday+"' and t1.xshsny <='"+endday+"' "+
" and (" + " and (" +
" '"+employeeId+"' IN ( 2, 27, 166, 10285, 11661, 300, 876, 3593, 1416, 1647, 1844,3044480226941419013,794508876297846787 ) \n" + " '"+employeeId+"' IN ( 2, 27, 166, 10285, 11661, 300, 876, 3593, 1416, 1647, 1844,3044480226941419013,794508876297846787 ) \n" +
" or cast(t1.xsjl AS decimal(25,0)) in( \n" + " or cast(t1.xsjl AS decimal(25,0)) in( \n" +

Write Preview
Loading…
Cancel
Save