From 8fe6d4c2ab44e0d3493e32a20a7812ffa6621e41 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Mon, 8 Apr 2024 17:21:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/惠州项目管理政务版/在建项目指标.ms | 4 ++-- .../magic/api/惠州项目管理政务版/投资管理.ms | 24 +++++++++---------- .../环境报警列表(最近20条).ms | 4 ++-- .../magic/api/监管决策BI/企业资质统计.ms | 4 ++-- .../magic/api/监管决策BI/实名制信息统计.ms | 4 ++-- .../magic/api/监管决策BI/扬尘报警类型统计.ms | 6 ++--- .../magic/api/监管决策BI/查询工程分类统计.ms | 8 +++---- .../magic/api/监管决策BI/查询工程详细信息.ms | 4 ++-- .../magic/api/监管决策BI/查询所有项目数.ms | 4 ++-- .../magic/api/监管决策BI/查询项目详细信息.ms | 4 ++-- .../api/监管决策BI/顶部查询工程统计信息.ms | 4 ++-- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/main/resources/magic/api/惠州项目管理政务版/在建项目指标.ms b/src/main/resources/magic/api/惠州项目管理政务版/在建项目指标.ms index 6e933cd..5ea07af 100644 --- a/src/main/resources/magic/api/惠州项目管理政务版/在建项目指标.ms +++ b/src/main/resources/magic/api/惠州项目管理政务版/在建项目指标.ms @@ -5,7 +5,7 @@ "groupId" : "1f3d3e5b9fe340bab84de67b0de08f44", "name" : "在建项目指标", "createTime" : null, - "updateTime" : 1693376503935, + "updateTime" : 1706864647618, "lock" : null, "createBy" : null, "updateBy" : "admin", @@ -34,4 +34,4 @@ "responseBodyDefinition" : null } ================================ -return db.selectOne("SELECT IFNULL(SUM(IF(is_important = 1 AND examine_state = 3, 1, 0)), 0) importance, IFNULL(SUM(IF(engineering_type = 2 AND state = 2 AND examine_state = 3, 1, 0)), 0) bridge, IFNULL(SUM(IF(engineering_type = 3 AND state = 2 AND examine_state = 3, 1, 0)), 0) tunnel, IFNULL(SUM(IF(engineering_type = 4 AND state = 2 AND examine_state = 3, 1, 0)), 0) station, IFNULL(SUM(IF(state = 8, 1, 0)), 0) reBuild, IFNULL(SUM(IF(state = 9, 1, 0)), 0) extension, IFNULL(SUM(IF(state IN(2, 8, 9), 1, 0)), 0) total, IFNULL(SUM(IF(state = 7, 1, 0)), 0) finished, IFNULL(SUM(IF(state in (3, 4), 1, 0)), 0) shutdown, IFNULL(SUM(IF(state in (2, 3, 4, 7), 1, 0)), 0) total1,(SELECT COUNT( * ) FROM engineering WHERE YEAR(examine_time) = YEAR(CURDATE()) AND examine_state = 3) newBuild FROM engineering WHERE #project ") \ No newline at end of file +return db.selectOne("SELECT COUNT( id ) num,SUM( engineering_cost ) cost,IFNULL( SUM( IF ( is_important = 1 AND examine_state = 3, 1, 0 )), 0 ) importance,IFNULL( SUM( IF ( engineering_type = 2, 1, 0 )), 0 ) bridge,IFNULL( SUM( IF ( engineering_type = 3, 1, 0 )), 0 ) tunnel,IFNULL( SUM( IF ( engineering_type = 4, 1, 0 )), 0 ) station,IFNULL( SUM( IF ( nature = 1, 1, 0 )), 0 ) newBuild, IFNULL( SUM( IF ( nature = 2, 1, 0 )), 0 ) reBuild,IFNULL( SUM( IF ( nature = 3, 1, 0 )), 0 ) extension,IFNULL( SUM( IF ( state = 4, 1, 0 )), 0 ) finished,IFNULL( SUM( IF ( state = 2, 1, 0 )), 0 ) building,IFNULL( SUM( IF ( state = 3, 1, 0 )), 0 ) shutdown FROM engineering WHERE #project ") \ No newline at end of file diff --git a/src/main/resources/magic/api/惠州项目管理政务版/投资管理.ms b/src/main/resources/magic/api/惠州项目管理政务版/投资管理.ms index e662c90..74ee45b 100644 --- a/src/main/resources/magic/api/惠州项目管理政务版/投资管理.ms +++ b/src/main/resources/magic/api/惠州项目管理政务版/投资管理.ms @@ -5,7 +5,7 @@ "groupId" : "1f3d3e5b9fe340bab84de67b0de08f44", "name" : "投资管理", "createTime" : null, - "updateTime" : 1698730660209, + "updateTime" : 1706587043096, "lock" : null, "createBy" : "admin", "updateBy" : "admin", @@ -37,20 +37,20 @@ BigDecimal applyAmountTotal = db.selectValue("SELECT IFNULL(SUM(apply_payment), BigDecimal paymentTotal = db.selectValue("SELECT IFNULL(SUM(payment), 0) FROM investment_payment_stat WHERE #project") BigDecimal big = new BigDecimal(10000); -result.put("paymentByMonth", paymentByMonth.divide(big)) -result.put("applyAmountByMonth", applyAmountByMonth.divide(big)) -result.put("realPayAmountByMonth", realPayAmountByMonth.divide(big)) +result.put("paymentByMonth", paymentByMonth.divide(big, 2, BigDecimal.ROUND_HALF_UP)) +result.put("applyAmountByMonth", applyAmountByMonth.divide(big, 2, BigDecimal.ROUND_HALF_UP)) +result.put("realPayAmountByMonth", realPayAmountByMonth.divide(big, 2, BigDecimal.ROUND_HALF_UP)) var unPayAmountByMonth = applyAmountByMonth.subtract(realPayAmountByMonth); -result.put("unPayAmountByMonth", unPayAmountByMonth > 0 ? unPayAmountByMonth.divide(big) : 0) +result.put("unPayAmountByMonth", unPayAmountByMonth > 0 ? unPayAmountByMonth.divide(big, 2, BigDecimal.ROUND_HALF_UP) : 0) -result.put("totalAmount", totalAmount.divide(big)) +result.put("totalAmount", totalAmount.divide(big, 2, BigDecimal.ROUND_HALF_UP)) result.put("payRatio", realPayAmountTotal == 0 ? 0 : realPayAmountTotal.divide(totalAmount, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).doubleValue()) -result.put("paymentTotal", paymentTotal.divide(big)) -result.put("applyAmountTotal", applyAmountTotal.divide(big)) -result.put("settlementAmount", settlementAmount.divide(big)) +result.put("paymentTotal", paymentTotal.divide(big, 2, BigDecimal.ROUND_HALF_UP)) +result.put("applyAmountTotal", applyAmountTotal.divide(big, 2, BigDecimal.ROUND_HALF_UP)) +result.put("settlementAmount", settlementAmount.divide(big, 2, BigDecimal.ROUND_HALF_UP)) result.put("payRatio1", realPayAmountTotal == 0 ? 0 : realPayAmountTotal.divide(settlementAmount, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).doubleValue()) -result.put("settlementAmountByYear", settlementAmountByYear.divide(big)) +result.put("settlementAmountByYear", settlementAmountByYear.divide(big, 2, BigDecimal.ROUND_HALF_UP)) result.put("payRatio2", realPayAmountByYear == 0 ? 0 : realPayAmountByYear.divide(totalAmountByYear, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).doubleValue()) -result.put("realPayAmountTotal", realPayAmountTotal.divide(big)) -result.put("realPayAmountByYear", realPayAmountByYear.divide(big)) +result.put("realPayAmountTotal", realPayAmountTotal.divide(big, 2, BigDecimal.ROUND_HALF_UP)) +result.put("realPayAmountByYear", realPayAmountByYear.divide(big, 2, BigDecimal.ROUND_HALF_UP)) return result \ No newline at end of file diff --git a/src/main/resources/magic/api/惠州项目管理政务版/环境报警列表(最近20条).ms b/src/main/resources/magic/api/惠州项目管理政务版/环境报警列表(最近20条).ms index 93a2511..723eff9 100644 --- a/src/main/resources/magic/api/惠州项目管理政务版/环境报警列表(最近20条).ms +++ b/src/main/resources/magic/api/惠州项目管理政务版/环境报警列表(最近20条).ms @@ -5,7 +5,7 @@ "groupId" : "1f3d3e5b9fe340bab84de67b0de08f44", "name" : "环境报警列表(最近20条)", "createTime" : null, - "updateTime" : 1688215422339, + "updateTime" : 1706838795058, "lock" : null, "createBy" : null, "updateBy" : "admin", @@ -22,4 +22,4 @@ "responseBodyDefinition" : null } ================================ -return db.select("SELECT type, cause, create_time, state FROM environment_alarm WHERE #project order by create_time desc limit 20") \ No newline at end of file +return db.select("SELECT type, cause, date_format(create_time,'%Y-%m-%d %H:%i:%S') as create_time, state FROM environment_alarm WHERE #project order by create_time desc limit 20") \ No newline at end of file diff --git a/src/main/resources/magic/api/监管决策BI/企业资质统计.ms b/src/main/resources/magic/api/监管决策BI/企业资质统计.ms index 1f5b3f2..aa08cac 100644 --- a/src/main/resources/magic/api/监管决策BI/企业资质统计.ms +++ b/src/main/resources/magic/api/监管决策BI/企业资质统计.ms @@ -5,7 +5,7 @@ "groupId" : "485e36d471af4f809398babc4abadafe", "name" : "企业资质统计", "createTime" : null, - "updateTime" : 1691553575758, + "updateTime" : 1712567948590, "lock" : null, "createBy" : null, "updateBy" : "admin", @@ -34,7 +34,7 @@ "responseBodyDefinition" : null } ================================ -List list = db.select("SELECT REPLACE(d.dict_value, '单位', '') dict_value, COUNT(m.id) num FROM enterprise a LEFT JOIN enterprise_main m ON m.enterprise_sn = a.enterprise_sn LEFT JOIN system_dict_data d ON m.main_type = d.dict_label AND d.dict_type = 'enterprise_main' WHERE a.state = 1 AND #govalias GROUP BY d.dict_value") +List list = db.select("SELECT REPLACE(d.dict_value, '单位', '') dict_value, COUNT(m.id) num FROM wisdomsitezw.enterprise a LEFT JOIN wisdomsitezw.enterprise_main m ON m.enterprise_sn = a.enterprise_sn LEFT JOIN wisdomsitezw.system_dict_data d ON m.main_type = d.dict_label AND d.dict_type = 'enterprise_main' WHERE a.state = 1 AND #govalias GROUP BY d.dict_value") List dict = Arrays.asList("勘察", "建设", "施工", "监理", "设计"); Integer other = 0; diff --git a/src/main/resources/magic/api/监管决策BI/实名制信息统计.ms b/src/main/resources/magic/api/监管决策BI/实名制信息统计.ms index da5db8f..d0d6cbc 100644 --- a/src/main/resources/magic/api/监管决策BI/实名制信息统计.ms +++ b/src/main/resources/magic/api/监管决策BI/实名制信息统计.ms @@ -5,7 +5,7 @@ "groupId" : "485e36d471af4f809398babc4abadafe", "name" : "实名制信息统计", "createTime" : null, - "updateTime" : 1684201864834, + "updateTime" : 1712567953141, "lock" : null, "createBy" : null, "updateBy" : "admin", @@ -35,7 +35,7 @@ } ================================ import java.math.BigDecimal -Map map = db.selectOne("SELECT COUNT(id) total,IFNULL(SUM(IF(person_type = 1, 1, 0)),0) manager,IFNULL(SUM(IF(person_type = 2, 1, 0)),0) worker FROM worker_info WHERE #project") +Map map = db.selectOne("SELECT COUNT(id) total,IFNULL(SUM(IF(person_type = 1, 1, 0)),0) manager,IFNULL(SUM(IF(person_type = 2, 1, 0)),0) worker FROM wisdomsitezw.worker_info WHERE #project") var total = map.get("total")::int var manager = map.get("manager")::int var worker = map.get("worker")::int diff --git a/src/main/resources/magic/api/监管决策BI/扬尘报警类型统计.ms b/src/main/resources/magic/api/监管决策BI/扬尘报警类型统计.ms index cce560e..da5179a 100644 --- a/src/main/resources/magic/api/监管决策BI/扬尘报警类型统计.ms +++ b/src/main/resources/magic/api/监管决策BI/扬尘报警类型统计.ms @@ -5,7 +5,7 @@ "groupId" : "485e36d471af4f809398babc4abadafe", "name" : "扬尘报警类型统计", "createTime" : null, - "updateTime" : 1684405471022, + "updateTime" : 1712567966222, "lock" : null, "createBy" : null, "updateBy" : "admin", @@ -83,9 +83,9 @@ } ================================ import java.math.BigDecimal -List list = db.select("SELECT d.dict_value as type, COUNT(a.id) num FROM system_dict_data d LEFT JOIN environment_alarm a ON d.dict_value = a.type AND TO_DAYS(a.create_time) = TO_DAYS(NOW()) AND #project WHERE d.dict_type = 'environment_alarm_type' GROUP BY d.dict_value") +List list = db.select("SELECT d.dict_value as type, COUNT(a.id) num FROM wisdomsitezw.system_dict_data d LEFT JOIN wisdomsitezw.environment_alarm a ON d.dict_value = a.type AND TO_DAYS(a.create_time) = TO_DAYS(NOW()) AND #project WHERE d.dict_type = 'environment_alarm_type' GROUP BY d.dict_value") -Map totalMap = db.selectOne("SELECT COUNT( id ) num FROM environment_alarm WHERE TO_DAYS( create_time ) = TO_DAYS(NOW()) AND #project") +Map totalMap = db.selectOne("SELECT COUNT( id ) num FROM wisdomsitezw.environment_alarm WHERE TO_DAYS( create_time ) = TO_DAYS(NOW()) AND #project") String total = totalMap.get("num")::int for (item in list) { Map map = item; diff --git a/src/main/resources/magic/api/监管决策BI/查询工程分类统计.ms b/src/main/resources/magic/api/监管决策BI/查询工程分类统计.ms index 6a8aa95..2b5d5bf 100644 --- a/src/main/resources/magic/api/监管决策BI/查询工程分类统计.ms +++ b/src/main/resources/magic/api/监管决策BI/查询工程分类统计.ms @@ -5,7 +5,7 @@ "groupId" : "485e36d471af4f809398babc4abadafe", "name" : "查询工程分类统计", "createTime" : null, - "updateTime" : 1699250036244, + "updateTime" : 1712567831373, "lock" : null, "createBy" : null, "updateBy" : "admin", @@ -83,11 +83,11 @@ } ================================ import java.math.BigDecimal -List list = db.select("SELECT d.dict_value, COUNT( a.id ) num FROM engineering a RIGHT JOIN system_dict_data d ON a.engineering_type = d.dict_label AND #projectalias WHERE a.examine_state = 3 AND d.dict_type = 'engineering_type' GROUP BY d.dict_value ORDER BY d.dict_sort") +List list = db.select("SELECT d.dict_value, COUNT( a.id ) num FROM wisdomsitezw.engineering a RIGHT JOIN wisdomsitezw.system_dict_data d ON a.engineering_type = d.dict_label AND #projectalias WHERE a.examine_state = 3 AND d.dict_type = 'engineering_type' GROUP BY d.dict_value ORDER BY d.dict_sort") -List dictList = db.select("SELECT dict_value, dict_label num FROM system_dict_data where dict_type = 'engineering_type' ORDER BY dict_sort") +List dictList = db.select("SELECT dict_value, dict_label num FROM wisdomsitezw.system_dict_data where dict_type = 'engineering_type' ORDER BY dict_sort") -Map totalMap = db.selectOne("SELECT COUNT(id) num FROM engineering WHERE examine_state = 3 AND #project") +Map totalMap = db.selectOne("SELECT COUNT(id) num FROM wisdomsitezw.engineering WHERE examine_state = 3 AND #project") String total = totalMap.get("num") List result = new ArrayList(); Integer other = 0; diff --git a/src/main/resources/magic/api/监管决策BI/查询工程详细信息.ms b/src/main/resources/magic/api/监管决策BI/查询工程详细信息.ms index 5f15861..4d09189 100644 --- a/src/main/resources/magic/api/监管决策BI/查询工程详细信息.ms +++ b/src/main/resources/magic/api/监管决策BI/查询工程详细信息.ms @@ -5,7 +5,7 @@ "groupId" : "485e36d471af4f809398babc4abadafe", "name" : "查询工程详细信息", "createTime" : null, - "updateTime" : 1684476794685, + "updateTime" : 1712567922984, "lock" : null, "createBy" : null, "updateBy" : "admin", @@ -34,4 +34,4 @@ "responseBodyDefinition" : null } ================================ -return db.select("SELECT e.*, ent.enterprise_name FROM engineering e LEFT JOIN engineering_main m ON e.engineering_sn = m.engineering_sn LEFT JOIN enterprise ent ON m.enterprise_sn = ent.enterprise_sn WHERE examine_state = 3 AND m.type = 1 AND #project") \ No newline at end of file +return db.select("SELECT e.*, ent.enterprise_name FROM wisdomsitezw.engineering e LEFT JOIN wisdomsitezw.engineering_main m ON e.engineering_sn = m.engineering_sn LEFT JOIN wisdomsitezw.enterprise ent ON m.enterprise_sn = ent.enterprise_sn WHERE examine_state = 3 AND m.type = 1 AND #project") \ No newline at end of file diff --git a/src/main/resources/magic/api/监管决策BI/查询所有项目数.ms b/src/main/resources/magic/api/监管决策BI/查询所有项目数.ms index 2c02723..a6c8673 100644 --- a/src/main/resources/magic/api/监管决策BI/查询所有项目数.ms +++ b/src/main/resources/magic/api/监管决策BI/查询所有项目数.ms @@ -5,7 +5,7 @@ "groupId" : "485e36d471af4f809398babc4abadafe", "name" : "查询所有项目数", "createTime" : null, - "updateTime" : 1684201839337, + "updateTime" : 1712567927180, "lock" : null, "createBy" : null, "updateBy" : "admin", @@ -34,6 +34,6 @@ "responseBodyDefinition" : null } ================================ -Map map = db.selectOne("SELECT COUNT(project_id) as total FROM project WHERE state = 1 AND #gov") +Map map = db.selectOne("SELECT COUNT(project_id) as total FROM wisdomsitezw.project WHERE state = 1 AND #gov") map.put("total", map.get("total")::int) return map \ No newline at end of file diff --git a/src/main/resources/magic/api/监管决策BI/查询项目详细信息.ms b/src/main/resources/magic/api/监管决策BI/查询项目详细信息.ms index 5d98b70..c3f3984 100644 --- a/src/main/resources/magic/api/监管决策BI/查询项目详细信息.ms +++ b/src/main/resources/magic/api/监管决策BI/查询项目详细信息.ms @@ -5,7 +5,7 @@ "groupId" : "485e36d471af4f809398babc4abadafe", "name" : "查询项目详细信息", "createTime" : null, - "updateTime" : 1689755920273, + "updateTime" : 1712567931221, "lock" : null, "createBy" : null, "updateBy" : "admin", @@ -22,4 +22,4 @@ "responseBodyDefinition" : null } ================================ -return db.select("SELECT * FROM project WHERE state = 1 AND #gov") \ No newline at end of file +return db.select("SELECT * FROM wisdomsitezw.project WHERE state = 1 AND #gov") \ No newline at end of file diff --git a/src/main/resources/magic/api/监管决策BI/顶部查询工程统计信息.ms b/src/main/resources/magic/api/监管决策BI/顶部查询工程统计信息.ms index cc90054..f39e2bc 100644 --- a/src/main/resources/magic/api/监管决策BI/顶部查询工程统计信息.ms +++ b/src/main/resources/magic/api/监管决策BI/顶部查询工程统计信息.ms @@ -5,7 +5,7 @@ "groupId" : "485e36d471af4f809398babc4abadafe", "name" : "顶部查询工程统计信息", "createTime" : null, - "updateTime" : 1684807167570, + "updateTime" : 1712567936389, "lock" : null, "createBy" : null, "updateBy" : "admin", @@ -34,4 +34,4 @@ "responseBodyDefinition" : null } ================================ -return db.selectOne("SELECT IFNULL(SUM(IF(examine_state = 3, 1, 0)),0) total,IFNULL(SUM(IF(YEAR(start_time) = YEAR(NOW()) AND state > 1, 1, 0)),0) newBuild,IFNULL(SUM(IF(YEAR(start_time) = YEAR(NOW()) AND state = 7, 1, 0)),0) finish,IFNULL(SUM(IF(is_important = 1 AND state > 1, 1, 0)),0) important FROM engineering WHERE #project") \ No newline at end of file +return db.selectOne("SELECT IFNULL(SUM(IF(examine_state = 3, 1, 0)),0) total,IFNULL(SUM(IF(YEAR(start_time) = YEAR(NOW()) AND state > 1, 1, 0)),0) newBuild,IFNULL(SUM(IF(YEAR(start_time) = YEAR(NOW()) AND state = 7, 1, 0)),0) finish,IFNULL(SUM(IF(is_important = 1 AND state > 1, 1, 0)),0) important,IFNULL( SUM( IF ( examine_state = 3 AND state = 1, 1, 0 )), 0 ) unStart,IFNULL( SUM( IF ( examine_state = 3 AND state = 2, 1, 0 )), 0 ) building,IFNULL( SUM( IF ( examine_state = 3 AND state = 4, 1, 0 )), 0 ) complete FROM wisdomsitezw.engineering WHERE #project") \ No newline at end of file