Merge branch 'feature/form_statistics_05' into 'develop'

修改统计查询 数据间断问题 及 修改经营类报表返回数据带逗号问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!61

backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/internal/dao/OperationsReportsDaoImpl.java

@@ -28,8 +28,8 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
 		StringBuffer hql = new StringBuffer(" SELECT ");
 		hql.append("        result.stationName AS stationName, "
 				+ "         result.dinasTypeName AS dinasTypeName,\r\n"
-				+ "			FORMAT( result.saleDealAmount ,2) AS saleDealAmount, \r\n"
-				+ "			FORMAT( result.saleAmount ,2) AS saleAmount FROM  ");
+				+ "			CAST( result.saleDealAmount as DECIMAL(18,2)) AS saleDealAmount, \r\n"
+				+ "			CAST( result.saleAmount as DECIMAL(18,2)) AS saleAmount FROM  ");
 		hql.append(" ( SELECT  station.station_Name AS stationName, \r\n "
 				+ "	 dinasType.dinas_Type_Name AS dinasTypeName,  ");
 		if (OperationsReportType != null && OperationsReportType != "" ) {
@@ -37,8 +37,8 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
 				hql.append("	SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n"
 						+ "	    SUM( salesSummary.sale_Amount ) AS saleAmount, ");
 			} else {
-				hql.append("  FORMAT(  SUM( salesSummary.sale_Deal_Amount ) / 10000 ,2) AS saleDealAmount, \r\n"
-						+ "   FORMAT(  SUM( salesSummary.sale_Amount ) / 10000  ,2) AS saleAmount, ");
+				hql.append("  CAST(  SUM( salesSummary.sale_Deal_Amount ) / 10000  as DECIMAL(18,2) ) AS saleDealAmount, \r\n"
+						+ "   CAST(   SUM( salesSummary.sale_Amount ) / 10000  as DECIMAL(18,2) ) AS saleAmount, ");
 			}
 		}else {
 			hql.append("	SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n"
@@ -64,8 +64,8 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
 				hql.append("	SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n"
 						+ "	    SUM( salesSummary.sale_Amount ) AS saleAmount, ");
 			} else {
-				hql.append("  FORMAT(  SUM( salesSummary.sale_Deal_Amount ) / 10000 ,2) AS saleDealAmount, \r\n"
-						+ "   FORMAT(  SUM( salesSummary.sale_Amount ) / 10000  ,2) AS saleAmount, ");
+				hql.append("  CAST(   SUM( salesSummary.sale_Deal_Amount ) / 10000  as DECIMAL(18,2)) AS saleDealAmount, \r\n"
+						+ "   CAST(   SUM( salesSummary.sale_Amount ) / 10000   as DECIMAL(18,2)) AS saleAmount, ");
 			}
 		}else {
 			hql.append("	SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n"

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ContractNumberTrendStatisticsAdvQuery.jmx

@@ -12,15 +12,25 @@
 			<sql-type>SQL</sql-type>
 			<sql>
 			SELECT
-				COUNT(1) AS contractNumber,
-				monthof(contract.createTime) AS createTime
+				COUNT(contract.id) AS contractNumber,
+				yearof(planningCycle.startTime) as createYear,
+				monthof(planningCycle.startTime) AS createTime
 			FROM
-				Contract AS contract
+				(select  
+				contract1.id as id ,
+				contract1.createTime as createTime
+				from Contract as contract1 
+				where contract1.approveState = 2 
+				)AS contract
+				RIGHT JOIN PlanningCycle AS planningCycle ON 1=1
+					AND yearof(contract.createTime) = yearof(planningCycle.startTime)
+			        AND monthof(contract.createTime) = monthof(planningCycle.startTime)
+			        AND dayof(contract.createTime) = dayof(planningCycle.startTime)
 				WHERE 1=1
-				AND contract.approveState = 2
-				AND contract.createTime &gt;=  :?startDate
-				AND contract.createTime &lt;=  :?endDate
-				GROUP BY monthof(contract.createTime)
+				AND planningCycle.cycleType &lt;&gt; 'WEEK'
+				AND planningCycle.startTime &gt;=  :?startDate
+				AND planningCycle.startTime &lt;=  :?endDate
+				GROUP BY yearof(planningCycle.startTime),monthof(planningCycle.startTime)
 			</sql>
 		</template>
 	</content>

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ContractNumberTrendStatisticsQueryView.jmx

@@ -71,6 +71,18 @@
                                     }
                                 }
                             }
+                            ,
+                            {
+                                "type": "VALUE",
+                                "title": "签订年份",
+                                "key": "createYear",
+                                "columnType": {
+                                    "name": "select",
+                                    "data": {
+                                        "selected": true
+                                    }
+                                }
+                            }
                         ]
                     }
                    }

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ProjectDinasTypeStatisticsAdvQuery.jmx

@@ -18,7 +18,9 @@
 				ProjectFiled AS projectFiled
 				LEFT JOIN ProjectFiledAssociatedProjectFiledDinasDetail AS projectFiledDinasDetail ON projectFiledDinasDetail.master = projectFiled.id
 				LEFT JOIN DinasType AS dinasType ON projectFiledDinasDetail.dinasType = dinasType.id 
-			WHERE 1=1 and projectFiled.regionalCompany = :?regionalCompany
+			WHERE 1=1 
+			and projectFiledDinasDetail.dinasType is not null
+			and projectFiled.regionalCompany = :?regionalCompany
 			GROUP BY
 				projectFiledDinasDetail.dinasType
 				</sql>

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ProjectNumberTrendStatisticsAdvQuery.jmx

@@ -12,15 +12,25 @@
 			<sql-type>SQL</sql-type>
 			<sql>
 			SELECT
-					count(0) as projectNumber,
-					monthof(projectFiled.createTime) as projectTime
+					count(projectFiled.id) as projectNumber,
+					yearof(planningCycle.startTime) as projectYear,
+					monthof(planningCycle.startTime) as projectTime
 			FROM
-					ProjectFiled AS projectFiled
+					PlanningCycle AS planningCycle
+					LEFT JOIN (
+					select projectFiled1.createTime as createTime,
+					projectFiled1.id as id
+					
+					 from ProjectFiled as projectFiled1 where projectFiled1.regionalCompany = :?regionalCompany
+					) AS projectFiled ON 1=1
+					AND yearof(projectFiled.createTime) = yearof(planningCycle.startTime)
+			        AND monthof(projectFiled.createTime) = monthof(planningCycle.startTime)
+			        AND dayof(projectFiled.createTime) = dayof(planningCycle.startTime)  
 					WHERE 1=1
-					AND projectFiled.createTime &gt;=  :?startDate
-					AND projectFiled.createTime &lt;=  :?endDate
-					AND projectFiled.regionalCompany = :?regionalCompany
-					GROUP BY monthof(projectFiled.createTime)
+					AND planningCycle.cycleType &lt;&gt; 'WEEK'
+					AND planningCycle.startTime &gt;=  :?startDate
+					AND planningCycle.startTime &lt;=  :?endDate 
+					GROUP BY yearof(planningCycle.startTime),monthof(planningCycle.startTime)
 			</sql>
 		</template>
 	</content>

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ProjectNumberTrendStatisticsQueryView.jmx

@@ -70,6 +70,17 @@
                                         "selected": true
                                     }
                                 }
+                            },
+                            {
+                                "type": "VALUE",
+                                "title": "项目年份",
+                                "key": "projectYear",
+                                "columnType": {
+                                    "name": "select",
+                                    "data": {
+                                        "selected": true
+                                    }
+                                }
                             }
                         ]
                     }

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendDayStatisticsAdvQuery.jmx

@@ -25,7 +25,12 @@
 			FROM
 			DinasType AS dinasType
 			JOIN PlanningCycle AS planningCycle ON 1=1
-			LEFT JOIN SalesRecord AS salesRecord ON salesRecord.dinasType = dinasType.id 
+			LEFT JOIN (select  salesRecord1.dealTime as dealTime,
+			salesRecord1.dealAmount as dealAmount,
+			salesRecord1.dinasType as dinasType
+			from SalesRecord as salesRecord1 where 
+			salesRecord1.regionalCompany = :?regionalCompany  
+			)  AS salesRecord ON salesRecord.dinasType = dinasType.id 
 			AND yearof(salesRecord.dealTime) = yearof(planningCycle.startTime)
 			AND monthof(salesRecord.dealTime) = monthof(planningCycle.startTime)
 			AND dayof(salesRecord.dealTime) = dayof(planningCycle.startTime) 
@@ -33,7 +38,7 @@
 				AND planningCycle.cycleType <> 'WEEK'
 				AND planningCycle.startTime >= :?startDate
 				AND planningCycle.startTime <= :?endDate
-				AND salesRecord.regionalCompany = :?regionalCompany 
+				
 				group by dinasType.id,yearof(planningCycle.startTime) , monthof(planningCycle.startTime),dayof(planningCycle.startTime)
 			</sql>
 		</template>

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendMonthStatisticsAdvQuery.jmx

@@ -24,7 +24,12 @@
 			FROM
 			DinasType AS dinasType
 			JOIN PlanningCycle AS planningCycle ON 1=1
-			LEFT JOIN SalesRecord AS salesRecord ON salesRecord.dinasType = dinasType.id 
+			LEFT JOIN  (select  salesRecord1.dealTime as dealTime,
+			salesRecord1.dealAmount as dealAmount,
+			salesRecord1.dinasType as dinasType
+			from SalesRecord as salesRecord1 where 
+			salesRecord1.regionalCompany = :?regionalCompany  
+			)  AS salesRecord ON salesRecord.dinasType = dinasType.id 
 			AND yearof(salesRecord.dealTime) = yearof(planningCycle.startTime)
 			AND monthof(salesRecord.dealTime) = monthof(planningCycle.startTime)
 			AND dayof(salesRecord.dealTime) = dayof(planningCycle.startTime) 
@@ -32,7 +37,7 @@
 				AND planningCycle.cycleType <> 'WEEK'
 				AND planningCycle.startTime >= :?startDate
 				AND planningCycle.startTime <= :?endDate
-				AND salesRecord.regionalCompany = :?regionalCompany 
+				
 				group by  dinasType.id,yearof(planningCycle.startTime) , monthof(planningCycle.startTime)
 			</sql>
 		</template>

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendYearStatisticsAdvQuery.jmx

@@ -23,7 +23,12 @@
 			FROM
 			DinasType AS dinasType
 			JOIN PlanningCycle AS planningCycle ON 1=1
-			LEFT JOIN SalesRecord AS salesRecord ON salesRecord.dinasType = dinasType.id 
+			LEFT JOIN  (select  salesRecord1.dealTime as dealTime,
+			salesRecord1.dealAmount as dealAmount,
+			salesRecord1.dinasType as dinasType
+			from SalesRecord as salesRecord1 where 
+			salesRecord1.regionalCompany = :?regionalCompany  
+			)  AS salesRecord ON salesRecord.dinasType = dinasType.id 
 			AND yearof(salesRecord.dealTime) = yearof(planningCycle.startTime)
 			AND monthof(salesRecord.dealTime) = monthof(planningCycle.startTime)
 			AND dayof(salesRecord.dealTime) = dayof(planningCycle.startTime) 
@@ -31,7 +36,7 @@
 				AND planningCycle.cycleType <> 'WEEK'
 				AND planningCycle.startTime >= :?startDate
 				AND planningCycle.startTime <= :?endDate
-				AND salesRecord.regionalCompany = :?regionalCompany 
+				
 				group by dinasType.id,yearof(planningCycle.startTime) 
 			</sql>
 		</template>