Skip to content

C
cloud-fb
Commit 336216ca by 闫恒
Options

Merge branch 'feature/dataSourceQueryBug' into 'develop' 

Feature/data source query bug

See merge request kunlun/xyst_dinas/xyst_dinas_backend!95
parents b72093a5 d566b203
Showing with 193 additions and 652 deletions
backend/inz.authmgr/src/main/java/com/beecode/inz/authmgr/web/AuthMgrController.java
package com.beecode.inz.authmgr.web; package com.beecode.inz.authmgr.web;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.ModelMap;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.beecode.amino.core.Amino; import com.beecode.amino.core.Amino;
import com.beecode.bap.staff.BapContext; import com.beecode.bap.staff.BapContext;
import com.beecode.bap.staff.service.StaffService; import com.beecode.bap.staff.service.StaffService;
...@@ -52,6 +28,17 @@ import com.beecode.inz.authmgr.vo.AccessorPrivilegePara; ...@@ -52,6 +28,17 @@ import com.beecode.inz.authmgr.vo.AccessorPrivilegePara;
import com.beecode.inz.common.service.ByIdService; import com.beecode.inz.common.service.ByIdService;
import com.beecode.inz.common.service.FollowerPrivilegeService; import com.beecode.inz.common.service.FollowerPrivilegeService;
import com.beecode.inz.common.service.FollowerPrivilegeType; import com.beecode.inz.common.service.FollowerPrivilegeType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.ModelMap;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.text.MessageFormat;
import java.util.*;
import java.util.stream.Collectors;
@RequestMapping(value = "basis/auth") @RequestMapping(value = "basis/auth")
@RestController @RestController
...@@ -85,7 +72,9 @@ public class AuthMgrController { ...@@ -85,7 +72,9 @@ public class AuthMgrController {
private final static String CLUEPOOL = "CluePool"; private final static String CLUEPOOL = "CluePool";
// 锚点顺序 // 锚点顺序
private final static String[] ANCHOR_ORDER = { "项目", "合同", "监控", "生产", "销售", "资金" , "运输", "安健环", "价格", "OA办公", "报表", "综合BI", "业务管理", "其他" }; //modify by 去除OA办公模块 from yanHeng
// private final static String[] ANCHOR_ORDER = { "项目", "合同", "监控", "生产", "销售", "资金" , "运输", "安健环", "价格", "OA办公", "报表", "综合BI", "业务管理", "其他" };
private final static String[] ANCHOR_ORDER = { "项目", "合同", "监控", "生产", "销售", "资金" , "运输", "安健环", "价格", "报表", "综合BI", "业务管理", "其他" };
protected final static Logger logger = LoggerFactory.getLogger(AuthMgrController.class); protected final static Logger logger = LoggerFactory.getLogger(AuthMgrController.class);
......
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
...@@ -1044,365 +1044,7 @@ ...@@ -1044,365 +1044,7 @@
</m:function-node> </m:function-node>
</m:children> </m:children>
</m:function-node> </m:function-node>
<m:function-node>
<m:id>c0e69182-be70-44a2-ad59-2207a94bee24</m:id>
<m:name>oawork</m:name>
<m:title>OA办公</m:title>
<m:index>11000</m:index>
<m:license>md_oa</m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>functions</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:children>
<m:function-node>
<m:id>2dc2eefe-ea55-498f-8467-65ff4cc8aa01</m:id>
<m:name>portal_remind</m:name>
<m:title>待办提醒</m:title>
<m:index>800</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.OARemind</m:privilege>
<m:function-definition>
<m:view>function-portal-remind</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconyujingshezhi1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>f257e7b4-f544-4321-ae8c-f1b1c187f47b</m:id>
<m:name>stamp_lend</m:name>
<m:title>证章借出</m:title>
<m:index>900</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>functions</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:children>
<m:function-node>
<m:id>c3c631ec-cefd-410e-8b83-713648b9d577</m:id>
<m:name>stamp_lend</m:name>
<m:title>证章借出申请</m:title>
<m:index>910</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.StampLendList</m:privilege>
<m:function-definition>
<m:view>function-stamp-lend</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconzhengzhangjiechushenqing1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>732f06a0-5351-42fa-9229-d421a450189f</m:id>
<m:name>stamp_lend_approve</m:name>
<m:title>证章借出审批</m:title>
<m:index>920</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.StampLendApproveList</m:privilege>
<m:function-definition>
<m:view>function-stamp-lend-approve</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconzhengzhangjiechushenpi1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>bb8121b9-c0b0-4ebe-90ab-a56245134ef8</m:id>
<m:name>stamp_lend_record</m:name>
<m:title>证章借出备案</m:title>
<m:index>930</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.StampLendRecordList</m:privilege>
<m:function-definition>
<m:view>function-stamp-lend-record</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconzhengzhangjiechubeian1x</m:icon>
</m:function-node>
</m:children>
</m:function-node>
<m:function-node>
<m:id>99ffda3d-2cd5-4e83-9cca-c01d7edf0ea0</m:id>
<m:name>seal_approve</m:name>
<m:title>用印</m:title>
<m:index>1000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>functions</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:children>
<m:function-node>
<m:id>52c3c2e9-1eb8-468a-bcd9-370f351f3a79</m:id>
<m:name>seal_approve</m:name>
<m:title>用印申请</m:title>
<m:index>1100</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.SealList</m:privilege>
<m:function-definition>
<m:view>function-seal-approve</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconyongyinshenqing1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>050bb00c-c209-4751-a325-5e9ffb2e1251</m:id>
<m:name>seal_approve_list</m:name>
<m:title>用印审批</m:title>
<m:index>1200</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.SealApproveList</m:privilege>
<m:function-definition>
<m:view>function-seal-approve-list</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconyongyinshenpi1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>8617f315-93ec-4af8-92ce-075e41bd32e8</m:id>
<m:name>seal_record</m:name>
<m:title>用印备案</m:title>
<m:index>1300</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.SealRecordList</m:privilege>
<m:function-definition>
<m:view>function-seal-record</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconyongyinbeian1x</m:icon>
</m:function-node>
</m:children>
</m:function-node>
<m:function-node>
<m:id>398754b6-600f-41eb-82fe-ea6bef7dbb24</m:id>
<m:name>use_car_apply</m:name>
<m:title>用车</m:title>
<m:index>4000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>functions</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:children>
<m:function-node>
<m:id>dea5f843-6f51-4542-8003-ef9d9a8ece1d</m:id>
<m:name>use_car_apply</m:name>
<m:title>用车申请</m:title>
<m:index>4100</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.UseCarList</m:privilege>
<m:function-definition>
<m:view>function-use-car-apply</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconyongcheshenqing1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>a31c04ff-3cb8-4068-bab4-aff5a54b4856</m:id>
<m:name>use_car_apply_approve</m:name>
<m:title>用车审批</m:title>
<m:index>4200</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.UseCarApproveList</m:privilege>
<m:function-definition>
<m:view>function-use-car-apply-approve</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconyongcheshenpi1x</m:icon>
</m:function-node>
</m:children>
</m:function-node>
<m:function-node>
<m:id>5b5e3ec0-339a-4f3e-adc7-e02be41fd4f0</m:id>
<m:name>business_trip_apply</m:name>
<m:title>出差</m:title>
<m:index>2000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>functions</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:children>
<m:function-node>
<m:id>04c323e8-2069-4a85-b033-55873a957132</m:id>
<m:name>business_trip_apply</m:name>
<m:title>出差申请</m:title>
<m:index>2100</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.BusinessTripList</m:privilege>
<m:function-definition>
<m:view>function-business-trip-apply</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconchuchashenqing1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>4b706ddf-53cb-4d96-bc45-3196fd87235c</m:id>
<m:name>business_trip_apply_approve</m:name>
<m:title>出差审批</m:title>
<m:index>2200</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.BusinessTripApproveList</m:privilege>
<m:function-definition>
<m:view>function-business-trip-apply-approve</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconchuchashenpi1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>b978f8e0-e10a-4207-8309-baca6c079909</m:id>
<m:name>business_trip_record</m:name>
<m:title>出差备案</m:title>
<m:index>2300</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.BusinessTripRecordList</m:privilege>
<m:function-definition>
<m:view>function-business-trip-record</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconchuchabeian1x</m:icon>
</m:function-node>
</m:children>
</m:function-node>
<m:function-node>
<m:id>687c287f-7980-4cb0-a8c8-ef411b5b2602</m:id>
<m:name>article_list</m:name>
<m:title>拟文</m:title>
<m:index>5000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>functions</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:children>
<m:function-node>
<m:id>4309b084-ce82-435f-a754-bfbd8b0e75a3</m:id>
<m:name>article_list</m:name>
<m:title>拟文</m:title>
<m:index>5100</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.ArticleList</m:privilege>
<m:function-definition>
<m:view>function-article-list</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconniwen1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>6d89680b-ad26-4387-9b51-bfe7155277c2</m:id>
<m:name>article_list_approve</m:name>
<m:title>拟文审批</m:title>
<m:index>5200</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.ArticleApproveList</m:privilege>
<m:function-definition>
<m:view>function-article-list-approve</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconniwenshenpi1x</m:icon>
</m:function-node>
</m:children>
</m:function-node>
<m:function-node>
<m:id>ae3587bc-8e00-459a-923b-c8d1ea8511ec</m:id>
<m:name>performance_assess</m:name>
<m:title>绩效考核</m:title>
<m:index>3000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>functions</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:children>
<m:function-node>
<m:id>63807f52-8fd9-4ff0-ad23-15ab4d5d7176</m:id>
<m:name>performance_assess_leader</m:name>
<m:title>绩效考核计划</m:title>
<m:index>3100</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.PerformanceAssessPlanList</m:privilege>
<m:function-definition>
<m:view>function-performance-assess-leader</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconjixiaokaohejihua1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>2af192a1-1d3b-459d-a9e5-72636396fc35</m:id>
<m:name>performance_assess_approve</m:name>
<m:title>绩效考核审批</m:title>
<m:index>3300</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.PerformanceAssessApproveList</m:privilege>
<m:function-definition>
<m:view>function-performance-assess-approve</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconjixiaokaoheshenpi1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>a56eb79b-7b3f-4920-95e5-21418693553c</m:id>
<m:name>performance_assess_staff</m:name>
<m:title>绩效考核打分</m:title>
<m:index>3200</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.PerformanceAssessScoreList</m:privilege>
<m:function-definition>
<m:view>function-performance-assess-staff</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconjixiaokaohedafen1x</m:icon>
</m:function-node>
</m:children>
</m:function-node>
<m:function-node>
<m:id>57704bb3-6369-4d77-896d-47f3352313c9</m:id>
<m:name>oa_setting</m:name>
<m:title>OA设置</m:title>
<m:index>6000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>functions</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:children>
<m:function-node>
<m:id>9ae2f4e0-0535-4d9f-9f00-780eb022edab</m:id>
<m:name>oa_workflow_setting</m:name>
<m:title>工作流管理</m:title>
<m:index>6100</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.OAWorkflowSetting</m:privilege>
<m:function-definition>
<m:view>function-oa-workflow-setting</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont icongongzuoliuguanli1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>3eaaf094-73b6-47b0-af3d-9975dfd34bce</m:id>
<m:name>oa_workflow_entrust</m:name>
<m:title>工作流委托</m:title>
<m:index>6200</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.oa.auth.OAWorkflowEntrust</m:privilege>
<m:function-definition>
<m:view>function-oa-workflow-entrust</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont icongongzuoliuguanli1x</m:icon>
</m:function-node>
</m:children>
</m:function-node>
</m:children>
</m:function-node>
<m:function-node> <m:function-node>
<m:id>66c0dc01-f646-4faa-9699-715d430b0934</m:id> <m:id>66c0dc01-f646-4faa-9699-715d430b0934</m:id>
<m:name>bill</m:name> <m:name>bill</m:name>
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/task/SalesPlanAutoCreateTask.java
package com.xyst.dinas.sales.task; package com.xyst.dinas.sales.task;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.UUID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import com.beecode.amino.core.Amino; import com.beecode.amino.core.Amino;
import com.beecode.bap.scheduler.core.Task; import com.beecode.bap.scheduler.core.Task;
import com.beecode.bap.scheduler.core.TaskContext; import com.beecode.bap.scheduler.core.TaskContext;
...@@ -25,6 +14,11 @@ import com.xyst.dinas.contract.internal.dao.ContractDao; ...@@ -25,6 +14,11 @@ import com.xyst.dinas.contract.internal.dao.ContractDao;
import com.xyst.dinas.sales.constant.SalesPlanConstant; import com.xyst.dinas.sales.constant.SalesPlanConstant;
import com.xyst.dinas.sales.dao.SalesPlanDao; import com.xyst.dinas.sales.dao.SalesPlanDao;
import com.xyst.dinas.sales.service.SalesPlanService; import com.xyst.dinas.sales.service.SalesPlanService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import java.util.*;
/** /**
* 销售计划自动创建任务 * 销售计划自动创建任务
* *
...@@ -68,7 +62,7 @@ public class SalesPlanAutoCreateTask implements Task{ ...@@ -68,7 +62,7 @@ public class SalesPlanAutoCreateTask implements Task{
weekDate = getWeekOfDate(new Date()); weekDate = getWeekOfDate(new Date());
} }
if (oldWeek.equals(weekDate) || planningCycle.equalsIgnoreCase(PlanningCycleEnum.DAY.name())) { if (weekDate.equals(oldWeek) || planningCycle.equalsIgnoreCase(PlanningCycleEnum.DAY.name())) {
PlanningCycleEnum planningCycleType = PlanningCycleEnum.DAY.name().equalsIgnoreCase(planningCycle)?PlanningCycleEnum.DAY:PlanningCycleEnum.WEEK; PlanningCycleEnum planningCycleType = PlanningCycleEnum.DAY.name().equalsIgnoreCase(planningCycle)?PlanningCycleEnum.DAY:PlanningCycleEnum.WEEK;
KObject planningCycleObj = planningCycleService.getPlanningCycleObj(planningCycleType, new Date()); KObject planningCycleObj = planningCycleService.getPlanningCycleObj(planningCycleType, new Date());
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/task/SalesPlanAutoCreateTaskRegister.java
package com.xyst.dinas.sales.task; package com.xyst.dinas.sales.task;
import java.util.Optional;
import javax.annotation.PostConstruct;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.beecode.amino.metadata.context.ApplicationMetadataContext; import com.beecode.amino.metadata.context.ApplicationMetadataContext;
import com.beecode.amino.metadata.runtime.ServiceInitializer; import com.beecode.amino.metadata.runtime.ServiceInitializer;
import com.beecode.bap.scheduler.entity.ScheduleDetail; import com.beecode.bap.scheduler.entity.ScheduleDetail;
import com.beecode.bap.scheduler.entity.TaskDetail; import com.beecode.bap.scheduler.entity.TaskDetail;
import com.beecode.bap.scheduler.service.ScheduleService; import com.beecode.bap.scheduler.service.ScheduleService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
import java.util.Optional;
public class SalesPlanAutoCreateTaskRegister implements ServiceInitializer{ public class SalesPlanAutoCreateTaskRegister implements ServiceInitializer{
...@@ -38,8 +36,8 @@ public class SalesPlanAutoCreateTaskRegister implements ServiceInitializer{ ...@@ -38,8 +36,8 @@ public class SalesPlanAutoCreateTaskRegister implements ServiceInitializer{
TaskDetail TaskDetail = new TaskDetail(TASK_NAME, SalesPlanAutoCreateTask.class.getName()); TaskDetail TaskDetail = new TaskDetail(TASK_NAME, SalesPlanAutoCreateTask.class.getName());
// 每天凌晨12点执行调度，如测试可修改为每十五秒：*/15 * * * * ?（表达式由至少6个由空格分隔的时间元素，从左至右可分为秒，分，时，日，月，星期） // 每天凌晨12点执行调度，如测试可修改为每十五秒：*/15 * * * * ?（表达式由至少6个由空格分隔的时间元素，从左至右可分为秒，分，时，日，月，星期）
scheduleService.scheduleTask(TaskDetail, "0 0 0 * * ?"); scheduleService.scheduleTask(TaskDetail, "0 0 0 * * ?");
// 测试调度时进行调用 // 测试调度时进行调用 测试时每3分钟一次
// scheduleService.scheduleTask(TaskDetail, "0 */5 * * * ?"); // scheduleService.scheduleTask(TaskDetail, "0 */3 * * * ?");
logger.info("销售计划自动创建任务初始化成功!"); logger.info("销售计划自动创建任务初始化成功!");
} }
......
backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/internal/dao/SalesSummaryDaoImpl.java
package com.xyst.dinas.statistics.internal.dao; package com.xyst.dinas.statistics.internal.dao;
import java.util.ArrayList; import com.beecode.bcp.type.KObject;
import java.util.List; import com.xyst.dinas.statistics.constant.SalesSummaryConstants;
import java.util.UUID; import com.xyst.dinas.statistics.dao.SalesSummaryDao;
import com.xyst.dinas.statistics.entity.SalesSummary;
import javax.persistence.Tuple;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.query.Query; import org.hibernate.query.Query;
...@@ -13,10 +11,10 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -13,10 +11,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateCallback; import org.springframework.orm.hibernate5.HibernateCallback;
import org.springframework.orm.hibernate5.HibernateOperations; import org.springframework.orm.hibernate5.HibernateOperations;
import com.beecode.bcp.type.KObject; import javax.persistence.Tuple;
import com.xyst.dinas.statistics.constant.SalesSummaryConstants; import java.util.ArrayList;
import com.xyst.dinas.statistics.dao.SalesSummaryDao; import java.util.List;
import com.xyst.dinas.statistics.entity.SalesSummary; import java.util.UUID;
public class SalesSummaryDaoImpl implements SalesSummaryDao { public class SalesSummaryDaoImpl implements SalesSummaryDao {
@Autowired @Autowired
...@@ -50,244 +48,162 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao { ...@@ -50,244 +48,162 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao {
+ " FORMAT( result.novAmount , 2) AS novAmount,\r\n" + " FORMAT( result.novAmount , 2) AS novAmount,\r\n"
+ " FORMAT( result.decAmount , 2) AS decAmount "); + " FORMAT( result.decAmount , 2) AS decAmount ");
hql.append(" FROM "); hql.append(" FROM ");
hql.append(" (\r\n" + " SELECT\r\n" + " '总计' as station,\r\n" hql.append(" (\r\n" + "SELECT\n" +
+ " '--' as dinasType,\r\n" "\t '总计' AS station,\n" +
+ " SUM(salesSummary.sale_Deal_Amount) as saleDealAmount,\r\n" "\t '--' AS dinasType,\n" +
+ " SUM(salesSummary.sale_Amount) as saleAmount,\r\n" "\t SUM( aggre.saleDealAmount ) AS saleDealAmount,\n" +
+ " '0.00' as avgAmount,\r\n" + " janAmount.janAmount1 as janAmount,\r\n" "\t SUM( aggre.saleAmount ) AS saleAmount,\n" +
+ " febAmount.febAmount1 as febAmount,\r\n" "\t AVG(avgAmount) AS avgAmount,\n" +
+ " marAmount.marAmount1 as marAmount,\r\n" "\t sum(aggre.janAmount) AS janAmount,\n" +
+ " aprAmount.aprAmount1 as aprAmount,\r\n" "\t sum(aggre.febAmount) AS febAmount,\n" +
+ " mayAmount.mayAmount1 as mayAmount,\r\n" "\t sum(aggre.marAmount) AS marAmount,\n" +
+ " junAmount.junAmount1 as junAmount,\r\n" "\t sum(aggre.aprAmount) AS aprAmount,\n" +
+ " julAmount.julAmount1 as julAmount,\r\n" "\t sum(aggre.mayAmount) AS mayAmount,\n" +
+ " augAmount.augAmount1 as augAmount,\r\n" "\t sum(aggre.junAmount) AS junAmount,\n" +
+ " septAmount.septAmount1 as septAmount,\r\n" "\t sum(aggre.julAmount) AS julAmount,\n" +
+ " octAmount.octAmount1 as octAmount,\r\n" "\t sum(aggre.augAmount) AS augAmount,\n" +
+ " novAmount.novAmount1 as novAmount,\r\n" "\t sum(aggre.septAmount) AS septAmount,\n" +
+ " decAmount.decAmount1 as decAmount,\r\n" "\t sum(aggre.octAmount) AS octAmount,\n" +
+ " salesSummary.deal_Year AS dealYear\r\n" + " FROM\r\n" "\t sum(aggre.novAmount) AS novAmount,\n" +
+ " xyst_dinas_statistics_sale_summary AS salesSummary\r\n" "\t sum(aggre.decAmount) AS decAmount,\n" +
+ " LEFT JOIN xyst_dinas_biz_station AS station ON station.id = salesSummary.station_id \r\n" "\t aggre.dealYear AS dealYear \n" +
+ " LEFT JOIN xyst_dinas_biz_dinas_type AS dinasType ON dinasType.id = salesSummary.dinas_Type_id\r\n" "FROM ");
+ " LEFT JOIN (\r\n" + " SELECT\r\n" hql.append(" ( SELECT\r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " station.station_Name as station,\r\n"
+ " SUM( salesSummary1.sale_Amount ) AS janAmount1 ,\r\n" + " dinasType.dinas_Type_Name as dinasType,\r\n"
+ " salesSummary1.deal_Year AS dealYear1\r\n" + " FROM\r\n" + " SUM(salesSummary.sale_Deal_Amount) as saleDealAmount,\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " SUM(salesSummary.sale_Amount) as saleAmount,\r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 1 \r\n" + " ( SUM(salesSummary.sale_Amount) / SUM(salesSummary.sale_Deal_Amount) ) as avgAmount,\r\n"
+ " GROUP BY salesSummary1.station_id\r\n" + " janAmount.janAmount1 as janAmount,\r\n"
+ " ) AS janAmount ON janAmount.dealYear1 = salesSummary.deal_Year \r\n" + " febAmount.febAmount1 as febAmount,\r\n"
+ " LEFT JOIN (\r\n" + " SELECT\r\n" + " marAmount.marAmount1 as marAmount,\r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " aprAmount.aprAmount1 as aprAmount,\r\n"
+ " SUM( salesSummary1.sale_Amount ) AS febAmount1,\r\n" + " mayAmount.mayAmount1 as mayAmount,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n" + " junAmount.junAmount1 as junAmount,\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " julAmount.julAmount1 as julAmount,\r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 2 \r\n" + " augAmount.augAmount1 as augAmount,\r\n"
+ " GROUP BY salesSummary1.station_id \r\n" + " septAmount.septAmount1 as septAmount,\r\n"
+ " ) AS febAmount ON febAmount.dealYear1 = salesSummary.deal_Year\r\n" + " octAmount.octAmount1 as octAmount,\r\n"
+ " LEFT JOIN (\r\n" + " SELECT\r\n" + " novAmount.novAmount1 as novAmount,\r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " decAmount.decAmount1 as decAmount,\r\n"
+ " SUM( salesSummary1.sale_Amount ) AS marAmount1,\r\n" + " salesSummary.deal_Year AS dealYear\r\n" + " FROM\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " LEFT JOIN xyst_dinas_biz_station AS station ON station.id = salesSummary.station_id \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 3 \r\n" + " LEFT JOIN xyst_dinas_biz_dinas_type AS dinasType ON dinasType.id = salesSummary.dinas_Type_id \r\n"
+ " GROUP BY salesSummary1.station_id \r\n" + " LEFT JOIN (\r\n" + " SELECT\r\n"
+ " ) AS marAmount ON marAmount.dealYear1 = salesSummary.deal_Year\r\n" + " salesSummary1.dinas_Type_id AS dinasType1,\r\n"
+ " LEFT JOIN (\r\n" + " SELECT\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " SUM( salesSummary1.sale_Amount ) AS janAmount1,\r\n"
+ " SUM( salesSummary1.sale_Amount ) AS aprAmount1,\r\n" + " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " WHERE\r\n" + " salesSummary1.deal_Month = 1 \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 4 \r\n" + " GROUP BY salesSummary1.station_id,salesSummary1.dinas_Type_id \r\n"
+ " GROUP BY salesSummary1.station_id \r\n" + " ) AS janAmount ON janAmount.station1 = salesSummary.station_id AND janAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " ) AS aprAmount ON aprAmount.dealYear1 = salesSummary.deal_Year\r\n" + " AND janAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " LEFT JOIN (\r\n" + " SELECT\r\n" + " SELECT\r\n" + " salesSummary1.dinas_Type_id AS dinasType1,\r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS mayAmount1,\r\n" + " SUM( salesSummary1.sale_Amount ) AS febAmount1,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n" + " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 5 \r\n" + " WHERE\r\n" + " salesSummary1.deal_Month = 2 \r\n"
+ " GROUP BY salesSummary1.station_id \r\n" + " GROUP BY salesSummary1.station_id,salesSummary1.dinas_Type_id\r\n"
+ " ) AS mayAmount ON mayAmount.dealYear1 = salesSummary.deal_Year \r\n" + " ) AS febAmount ON febAmount.station1 = salesSummary.station_id AND febAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " LEFT JOIN (\r\n" + " SELECT\r\n" + " AND febAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " SELECT\r\n" + " salesSummary1.dinas_Type_id AS dinasType1,\r\n"
+ " SUM( salesSummary1.sale_Amount ) AS junAmount1,\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n" + " SUM( salesSummary1.sale_Amount ) AS marAmount1,\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 6 \r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " GROUP BY salesSummary1.station_id \r\n" + " WHERE\r\n" + " salesSummary1.deal_Month = 3 \r\n"
+ " ) AS junAmount ON junAmount.dealYear1 = salesSummary.deal_Year \r\n" + " GROUP BY salesSummary1.station_id,salesSummary1.dinas_Type_id \r\n"
+ " LEFT JOIN (\r\n" + " SELECT\r\n" + " ) AS marAmount ON marAmount.station1 = salesSummary.station_id AND marAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " AND marAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " SUM( salesSummary1.sale_Amount ) AS julAmount1,\r\n" + " SELECT\r\n" + " salesSummary1.dinas_Type_id AS dinasType1,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " SUM( salesSummary1.sale_Amount ) AS aprAmount1,\r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 7 \r\n" + " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " GROUP BY salesSummary1.station_id \r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " ) AS julAmount ON julAmount.dealYear1 = salesSummary.deal_Year\r\n" + " WHERE\r\n" + " salesSummary1.deal_Month = 4 \r\n"
+ " LEFT JOIN (\r\n" + " SELECT\r\n" + " GROUP BY salesSummary1.station_id,salesSummary1.dinas_Type_id \r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " ) AS aprAmount ON aprAmount.station1 = salesSummary.station_id AND aprAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " SUM( salesSummary1.sale_Amount ) AS augAmount1,\r\n" + " AND aprAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n" + " SELECT\r\n" + " salesSummary1.dinas_Type_id AS dinasType1,\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 8 \r\n" + " SUM( salesSummary1.sale_Amount ) AS mayAmount1,\r\n"
+ " GROUP BY salesSummary1.station_id \r\n" + " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " ) AS augAmount ON augAmount.dealYear1 = salesSummary.deal_Year \r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " LEFT JOIN (\r\n" + " SELECT\r\n" + " WHERE\r\n" + " salesSummary1.deal_Month = 5 \r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " GROUP BY salesSummary1.station_id,salesSummary1.dinas_Type_id\r\n"
+ " SUM( salesSummary1.sale_Amount ) AS septAmount1,\r\n" + " ) AS mayAmount ON mayAmount.station1 = salesSummary.station_id AND mayAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n" + " AND mayAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " SELECT\r\n" + " salesSummary1.dinas_Type_id AS dinasType1,\r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 9 \r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " GROUP BY salesSummary1.station_id \r\n" + " SUM( salesSummary1.sale_Amount ) AS junAmount1,\r\n"
+ " ) AS septAmount ON septAmount.dealYear1 = salesSummary.deal_Year\r\n" + " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " LEFT JOIN (\r\n" + " SELECT\r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " WHERE\r\n" + " salesSummary1.deal_Month = 6 \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS octAmount1,\r\n" + " GROUP BY salesSummary1.station_id,salesSummary1.dinas_Type_id \r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n" + " ) AS junAmount ON junAmount.station1 = salesSummary.station_id AND junAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " AND junAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 10 \r\n" + " SELECT\r\n" + " salesSummary1.dinas_Type_id AS dinasType1,\r\n"
+ " GROUP BY salesSummary1.station_id \r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " ) AS octAmount ON octAmount.dealYear1 = salesSummary.deal_Year \r\n" + " SUM( salesSummary1.sale_Amount ) AS julAmount1,\r\n"
+ " LEFT JOIN (\r\n" + " SELECT\r\n" + " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS novAmount1,\r\n" + " WHERE\r\n" + " salesSummary1.deal_Month = 7 \r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n" + " GROUP BY salesSummary1.station_id,salesSummary1.dinas_Type_id \r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " ) AS julAmount ON julAmount.station1 = salesSummary.station_id AND julAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 11 \r\n" + " AND julAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " GROUP BY salesSummary1.station_id \r\n" + " SELECT\r\n" + " salesSummary1.dinas_Type_id AS dinasType1,\r\n"
+ " ) AS novAmount ON novAmount.dealYear1 = salesSummary.deal_Year\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " LEFT JOIN (\r\n" + " SELECT\r\n" + " SUM( salesSummary1.sale_Amount ) AS augAmount1,\r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " SUM( salesSummary1.sale_Amount ) AS decAmount1,\r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n" + " WHERE\r\n" + " salesSummary1.deal_Month = 8 \r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " GROUP BY salesSummary1.station_id,salesSummary1.dinas_Type_id \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 12 \r\n" + " ) AS augAmount ON augAmount.station1 = salesSummary.station_id AND augAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " GROUP BY salesSummary1.station_id\r\n" + " AND augAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " ) AS decAmount ON decAmount.dealYear1 = salesSummary.deal_Year "); + " SELECT\r\n" + " salesSummary1.dinas_Type_id AS dinasType1,\r\n"
if (stationList != null && !(stationList.isEmpty())) + " salesSummary1.station_id AS station1 , \r\n"
hql.append(" WHERE 1=1 AND salesSummary.station_id IN ( :stationList ) "); + " SUM( salesSummary1.sale_Amount ) AS septAmount1,\r\n"
hql.append(" GROUP BY salesSummary.deal_Year\r\n" + " UNION ALL\r\n" + " SELECT\r\n" + " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " station.station_Name as station,\r\n" + " '小计' as dinas_Type,\r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " SUM(salesSummary.sale_Deal_Amount) as saleDealAmount,\r\n" + " WHERE\r\n" + " salesSummary1.deal_Month = 9 \r\n"
+ " SUM(salesSummary.sale_Amount) as saleAmount,\r\n" + " GROUP BY salesSummary1.station_id,salesSummary1.dinas_Type_id \r\n"
+ " '0.00' as avgAmount,\r\n" + " janAmount.janAmount1 as janAmount,\r\n" + " ) AS septAmount ON septAmount.station1 = salesSummary.station_id AND septAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " febAmount.febAmount1 as febAmount,\r\n" + " AND septAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " marAmount.marAmount1 as marAmount,\r\n" + " SELECT\r\n" + " salesSummary1.dinas_Type_id AS dinasType1,\r\n"
+ " aprAmount.aprAmount1 as aprAmount,\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " mayAmount.mayAmount1 as mayAmount,\r\n" + " SUM( salesSummary1.sale_Amount ) AS octAmount1,\r\n"
+ " junAmount.junAmount1 as junAmount,\r\n" + " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " julAmount.julAmount1 as julAmount,\r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " augAmount.augAmount1 as augAmount,\r\n" + " WHERE\r\n" + " salesSummary1.deal_Month = 10 \r\n"
+ " septAmount.septAmount1 as septAmount,\r\n" + " GROUP BY salesSummary1.station_id,salesSummary1.dinas_Type_id\r\n"
+ " octAmount.octAmount1 as octAmount,\r\n" + " ) AS octAmount ON octAmount.station1 = salesSummary.station_id AND octAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " novAmount.novAmount1 as novAmount,\r\n" + " AND octAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " decAmount.decAmount1 as decAmount,\r\n" + " SELECT\r\n" + " salesSummary1.dinas_Type_id AS dinasType1,\r\n"
+ " salesSummary.deal_Year AS dealYear\r\n" + " FROM\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary\r\n" + " SUM( salesSummary1.sale_Amount ) AS novAmount1,\r\n"
+ " LEFT JOIN xyst_dinas_biz_station AS station ON station.id = salesSummary.station_id \r\n" + " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " LEFT JOIN xyst_dinas_biz_dinas_type AS dinasType ON dinasType.id = salesSummary.dinas_Type_id\r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " LEFT JOIN (\r\n" + " SELECT\r\n" + " WHERE\r\n" + " salesSummary1.deal_Month = 11 \r\n"
+ " salesSummary1.station_id AS station1 , \r\n" + " GROUP BY salesSummary1.station_id,salesSummary1.dinas_Type_id \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS janAmount1 ,\r\n" + " ) AS novAmount ON novAmount.station1 = salesSummary.station_id AND novAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " salesSummary1.deal_Year AS dealYear1\r\n" + " FROM\r\n" + " AND novAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " SELECT\r\n" + " salesSummary1.dinas_Type_id AS dinasType1,\r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 1 \r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " GROUP BY salesSummary1.station_id\r\n" + " SUM( salesSummary1.sale_Amount ) AS decAmount1,\r\n"
+ " ) AS janAmount ON janAmount.station1 = salesSummary.station_id\r\n" + " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " AND janAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n" + " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " SELECT\r\n" + " salesSummary1.station_id AS station1 , \r\n" + " WHERE\r\n" + " salesSummary1.deal_Month = 12 \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS febAmount1,\r\n" + " GROUP BY salesSummary1.station_id,salesSummary1.dinas_Type_id\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n" + " ) AS decAmount ON decAmount.station1 = salesSummary.station_id AND decAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n" + " AND decAmount.dealYear1 = salesSummary.deal_Year ");
+ " WHERE\r\n" + " salesSummary1.deal_Month = 2 \r\n"
+ " GROUP BY salesSummary1.station_id \r\n"
+ " ) AS febAmount ON febAmount.station1 = salesSummary.station_id\r\n"
+ " AND febAmount.dealYear1 = salesSummary.deal_Year\r\n" + " LEFT JOIN (\r\n"
+ " SELECT\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS marAmount1,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 3 \r\n"
+ " GROUP BY salesSummary1.station_id \r\n"
+ " ) AS marAmount ON marAmount.station1 = salesSummary.station_id\r\n"
+ " AND marAmount.dealYear1 = salesSummary.deal_Year\r\n" + " LEFT JOIN (\r\n"
+ " SELECT\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS aprAmount1,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 4 \r\n"
+ " GROUP BY salesSummary1.station_id \r\n"
+ " ) AS aprAmount ON aprAmount.station1 = salesSummary.station_id\r\n"
+ " AND aprAmount.dealYear1 = salesSummary.deal_Year\r\n" + " LEFT JOIN (\r\n"
+ " SELECT\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS mayAmount1,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 5 \r\n"
+ " GROUP BY salesSummary1.station_id \r\n"
+ " ) AS mayAmount ON mayAmount.station1 = salesSummary.station_id\r\n"
+ " AND mayAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " SELECT\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS junAmount1,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 6 \r\n"
+ " GROUP BY salesSummary1.station_id \r\n"
+ " ) AS junAmount ON junAmount.station1 = salesSummary.station_id\r\n"
+ " AND junAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " SELECT\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS julAmount1,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 7 \r\n"
+ " GROUP BY salesSummary1.station_id \r\n"
+ " ) AS julAmount ON julAmount.station1 = salesSummary.station_id\r\n"
+ " AND julAmount.dealYear1 = salesSummary.deal_Year\r\n" + " LEFT JOIN (\r\n"
+ " SELECT\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS augAmount1,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 8 \r\n"
+ " GROUP BY salesSummary1.station_id \r\n"
+ " ) AS augAmount ON augAmount.station1 = salesSummary.station_id\r\n"
+ " AND augAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " SELECT\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS septAmount1,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 9 \r\n"
+ " GROUP BY salesSummary1.station_id \r\n"
+ " ) AS septAmount ON septAmount.station1 = salesSummary.station_id\r\n"
+ " AND septAmount.dealYear1 = salesSummary.deal_Year\r\n" + " LEFT JOIN (\r\n"
+ " SELECT\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS octAmount1,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 10 \r\n"
+ " GROUP BY salesSummary1.station_id \r\n"
+ " ) AS octAmount ON octAmount.station1 = salesSummary.station_id\r\n"
+ " AND octAmount.dealYear1 = salesSummary.deal_Year \r\n" + " LEFT JOIN (\r\n"
+ " SELECT\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS novAmount1,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 11 \r\n"
+ " GROUP BY salesSummary1.station_id \r\n"
+ " ) AS novAmount ON novAmount.station1 = salesSummary.station_id\r\n"
+ " AND novAmount.dealYear1 = salesSummary.deal_Year\r\n" + " LEFT JOIN (\r\n"
+ " SELECT\r\n" + " salesSummary1.station_id AS station1 , \r\n"
+ " SUM( salesSummary1.sale_Amount ) AS decAmount1,\r\n"
+ " salesSummary1.deal_Year AS dealYear1 \r\n" + " FROM\r\n"
+ " xyst_dinas_statistics_sale_summary AS salesSummary1 \r\n"
+ " WHERE\r\n" + " salesSummary1.deal_Month = 12 \r\n"
+ " GROUP BY salesSummary1.station_id\r\n"
+ " ) AS decAmount ON decAmount.station1 = salesSummary.station_id\r\n"
+ " AND decAmount.dealYear1 = salesSummary.deal_Year ");
if (stationList != null && !(stationList.isEmpty())) if (stationList != null && !(stationList.isEmpty()))
hql.append(" WHERE 1=1 AND salesSummary.station_id IN ( :stationList ) "); hql.append(" WHERE 1=1 AND salesSummary.station_id IN ( :stationList ) ");
hql.append(" GROUP BY salesSummary.station_id\r\n" + " UNION ALL\r\n" + " SELECT\r\n" if (dealYear != null && !(dealYear.isEmpty()))
hql.append(" and salesSummary.deal_year = :dealYear ");
hql.append(" GROUP BY salesSummary.dinas_Type_id) aggre\r\n" + " UNION ALL\r\n" + " SELECT\r\n"
+ " station.station_Name as station,\r\n" + " station.station_Name as station,\r\n"
+ " dinasType.dinas_Type_Name as dinasType,\r\n" + " dinasType.dinas_Type_Name as dinasType,\r\n"
+ " SUM(salesSummary.sale_Deal_Amount) as saleDealAmount,\r\n" + " SUM(salesSummary.sale_Deal_Amount) as saleDealAmount,\r\n"
...@@ -420,6 +336,8 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao { ...@@ -420,6 +336,8 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao {
+ " AND decAmount.dealYear1 = salesSummary.deal_Year"); + " AND decAmount.dealYear1 = salesSummary.deal_Year");
if (stationList != null && !(stationList.isEmpty())) if (stationList != null && !(stationList.isEmpty()))
hql.append(" WHERE 1=1 AND salesSummary.station_id IN ( :stationList ) "); hql.append(" WHERE 1=1 AND salesSummary.station_id IN ( :stationList ) ");
if (dealYear != null && !(dealYear.isEmpty()))
hql.append(" and salesSummary.deal_year = :dealYear ");
hql.append(" GROUP BY salesSummary.dinas_Type_id " + " ) AS result "); hql.append(" GROUP BY salesSummary.dinas_Type_id " + " ) AS result ");
hql.append(" WHERE 1=1 "); hql.append(" WHERE 1=1 ");
if (dealYear != null && !(dealYear.isEmpty())) if (dealYear != null && !(dealYear.isEmpty()))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment