Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
fc63c15c
Commit
fc63c15c
authored
Aug 15, 2024
by
麻笑宇
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…
Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into develop_tzs_register_to_0715
parents
7ebe3e37
a3ef9dda
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
41 additions
and
30 deletions
+41
-30
TzBaseEnterpriseInfoMapper.xml
.../src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml
+1
-1
SecurityIndexCountItemDto.java
.../module/statistics/api/dto/SecurityIndexCountItemDto.java
+10
-0
AQZSDPStatisticsMapper.xml
...-api/src/main/resources/mapper/AQZSDPStatisticsMapper.xml
+4
-4
CylinderStatisticsMapper.xml
...pi/src/main/resources/mapper/CylinderStatisticsMapper.xml
+4
-3
AQZSDPStatisticsController.java
.../statistcs/biz/controller/AQZSDPStatisticsController.java
+22
-22
AQZSDPStatisticsServiceImpl.java
...atistcs/biz/service/impl/AQZSDPStatisticsServiceImpl.java
+0
-0
No files found.
amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml
View file @
fc63c15c
...
...
@@ -96,7 +96,7 @@
<where>
<if
test=
"tzBaseEnterpriseInfoDto.unitType!=null and tzBaseEnterpriseInfoDto.unitType!='' "
>
AND unit_type
= #{tzBaseEnterpriseInfoDto.unitType}
AND unit_type
LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.unitType},'%')
</if>
<if
test=
"tzBaseEnterpriseInfoDto.useUnit!=null and tzBaseEnterpriseInfoDto.useUnit!='' "
>
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/SecurityIndexCountItemDto.java
View file @
fc63c15c
...
...
@@ -42,4 +42,14 @@ public class SecurityIndexCountItemDto {
* 充装检查率
*/
String
czjchege
;
/**
* 人员合规率(资质有效期统计)
*/
String
ryhg
;
/**
* 数据合规率
*/
String
sjhg
;
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AQZSDPStatisticsMapper.xml
View file @
fc63c15c
...
...
@@ -38,7 +38,7 @@
and date_le(CAST(problem_time as date),#{dto.endDate})
</if>
AND source_type_code = #{sourceTypeCode}
<if
test=
"null != equ
ipTyp
e"
>
<if
test=
"null != equ
ListCod
e"
>
AND equip_list_code = #{equListCode}
</if>
AND problem_type IN
...
...
@@ -69,8 +69,8 @@
GROUP BY t.problem_type
</select>
<select
id=
"getIssueCountByMonth"
resultType=
"java.util.Map"
>
SELECT
COUNT
( 1
),
SELECT
COUNT(1
),
DATE_FORMAT(problem_time,'%Y-%m') AS time
FROM
tzs_safety_problem_tracing
...
...
@@ -215,7 +215,7 @@
FROM
tzs_safety_problem_tracing
WHERE
governing_body_org_code LIKE concat ( #{orgCode}, '%'
)
governing_body_org_code LIKE concat ( #{orgCode}, '%')
<if
test=
"null != status"
>
AND problem_status_code = #{status}
</if>
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/CylinderStatisticsMapper.xml
View file @
fc63c15c
...
...
@@ -19,11 +19,12 @@
count(DISTINCT(a.use_unit_credit_code)) as num
FROM
"tzs_jg_use_registration_manage" a,
privilege_company c
"tz_base_enterprise_info" tbei
where
a.receive_company_code = c.company_code
a.use_unit_credit_code = tbei.use_code
AND tbei.unit_type LIKE'%充装单位%'
and a.certificate_status='已登记'
and c.
org_code like concat(#{orgCode},'%')) s1,
and tbei.supervise_
org_code like concat(#{orgCode},'%')) s1,
(SELECT
count(1) as total
FROM "tz_base_enterprise_info"
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/AQZSDPStatisticsController.java
View file @
fc63c15c
...
...
@@ -123,12 +123,12 @@ public class AQZSDPStatisticsController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
value
=
"大屏-安全追溯-右屏-按月统计近12个月的问题数量趋势"
)
@PostMapping
(
value
=
"/issueCountByMonth"
)
public
ResponseModel
<
Map
<
String
,
Object
>>
issueCountByMonth
(
@
RequestBody
Map
<
String
,
Object
>
map
)
{
Object
regionCode
=
map
.
get
(
"cityCode"
);
if
(
ObjectUtils
.
isEmpty
(
regionCode
))
{
regionCode
=
"610000"
;
public
ResponseModel
<
Map
<
String
,
Object
>>
issueCountByMonth
(
@
Validated
@RequestBody
DPFilterParamDto
dpFilterParamDto
,
BindingResult
bindingResult
)
throws
Exception
{
List
<
FieldError
>
fieldErrors
=
bindingResult
.
getFieldErrors
(
);
if
(
!
fieldErrors
.
isEmpty
(
))
{
throw
new
BadRequest
(
fieldErrors
.
get
(
0
).
getDefaultMessage
())
;
}
Map
<
String
,
Object
>
result
=
statisticsService
.
issueCountByMonth
(
regionCode
.
toString
()
);
Map
<
String
,
Object
>
result
=
statisticsService
.
issueCountByMonth
(
dpFilterParamDto
);
return
ResponseHelper
.
buildResponse
(
result
);
}
...
...
@@ -161,7 +161,7 @@ public class AQZSDPStatisticsController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
value
=
"大屏-安全追溯-中屏-当前区域子区域数据统计"
)
@PostMapping
(
value
=
"/issueChildrenCityCountOld"
)
public
ResponseModel
<
List
<
Map
<
String
,
Object
>>>
issueChildrenCityCount
(
@RequestBody
Map
<
String
,
Object
>
map
)
throws
Exception
{
public
ResponseModel
<
List
<
Map
<
String
,
Object
>>>
issueChildrenCityCount
(
@RequestBody
Map
<
String
,
Object
>
map
)
{
Object
regionCode
=
map
.
get
(
"cityCode"
);
if
(
ObjectUtils
.
isEmpty
(
regionCode
))
{
regionCode
=
"610000"
;
...
...
@@ -186,24 +186,24 @@ public class AQZSDPStatisticsController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
value
=
"大屏-安全追溯-右屏-当年问题等级分类统计"
)
@PostMapping
(
value
=
"/issueProblemLevelCount"
)
public
ResponseModel
<
Map
<
String
,
Object
>>
issueProblemLevelCount
(
@
RequestBody
Map
<
String
,
Object
>
map
)
{
Object
regionCode
=
map
.
get
(
"cityCode"
);
if
(
ObjectUtils
.
isEmpty
(
regionCode
))
{
regionCode
=
"610000"
;
public
ResponseModel
<
Map
<
String
,
Object
>>
issueProblemLevelCount
(
@
Validated
@RequestBody
DPFilterParamDto
dpFilterParamDto
,
BindingResult
bindingResult
)
throws
Exception
{
List
<
FieldError
>
fieldErrors
=
bindingResult
.
getFieldErrors
(
);
if
(
!
fieldErrors
.
isEmpty
(
))
{
throw
new
BadRequest
(
fieldErrors
.
get
(
0
).
getDefaultMessage
())
;
}
Map
<
String
,
Object
>
result
=
statisticsService
.
issueProblemLevelCount
(
regionCode
.
toString
()
);
Map
<
String
,
Object
>
result
=
statisticsService
.
issueProblemLevelCount
(
dpFilterParamDto
);
return
ResponseHelper
.
buildResponse
(
result
);
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
value
=
"大屏-安全追溯-右屏-
按问题类型排名top 10
"
)
@ApiOperation
(
value
=
"大屏-安全追溯-右屏-
当年主体单位问题排名(Top10)
"
)
@PostMapping
(
value
=
"/issueCompanyTop"
)
public
ResponseModel
<
List
<
Map
<
String
,
Object
>>>
issueCompanyTop
(
@
RequestBody
Map
<
String
,
Object
>
map
)
{
Object
regionCode
=
map
.
get
(
"cityCode"
);
if
(
ObjectUtils
.
isEmpty
(
regionCode
))
{
regionCode
=
"610000"
;
public
ResponseModel
<
List
<
Map
<
String
,
Object
>>>
issueCompanyTop
(
@
Validated
@RequestBody
DPFilterParamDto
dpFilterParamDto
,
BindingResult
bindingResult
)
throws
Exception
{
List
<
FieldError
>
fieldErrors
=
bindingResult
.
getFieldErrors
(
);
if
(
!
fieldErrors
.
isEmpty
(
))
{
throw
new
BadRequest
(
fieldErrors
.
get
(
0
).
getDefaultMessage
())
;
}
List
<
Map
<
String
,
Object
>>
result
=
statisticsService
.
issueCompanyTop
(
regionCode
.
toString
()
);
List
<
Map
<
String
,
Object
>>
result
=
statisticsService
.
issueCompanyTop
(
dpFilterParamDto
);
return
ResponseHelper
.
buildResponse
(
result
);
}
...
...
@@ -221,12 +221,12 @@ public class AQZSDPStatisticsController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
value
=
"大屏-安全追溯-右屏-当年下级区域问题闭环率排名"
)
@PostMapping
(
value
=
"/issueChildrenCityCountTop"
)
public
ResponseModel
<
List
<
Map
<
String
,
Object
>>>
issueChildrenCityCountTop
(
@
RequestBody
Map
<
String
,
Object
>
map
)
throws
Exception
{
Object
regionCode
=
map
.
get
(
"cityCode"
);
if
(
ObjectUtils
.
isEmpty
(
regionCode
))
{
regionCode
=
"610000"
;
public
ResponseModel
<
List
<
Map
<
String
,
Object
>>>
issueChildrenCityCountTop
(
@
Validated
@RequestBody
DPFilterParamDto
dpFilterParamDto
,
BindingResult
bindingResult
)
{
List
<
FieldError
>
fieldErrors
=
bindingResult
.
getFieldErrors
(
);
if
(
!
fieldErrors
.
isEmpty
(
))
{
throw
new
BadRequest
(
fieldErrors
.
get
(
0
).
getDefaultMessage
())
;
}
List
<
Map
<
String
,
Object
>>
result
=
statisticsService
.
issueChildrenCityCountTop
(
regionCode
.
toString
()
);
List
<
Map
<
String
,
Object
>>
result
=
statisticsService
.
issueChildrenCityCountTop
(
dpFilterParamDto
);
return
ResponseHelper
.
buildResponse
(
result
);
}
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/AQZSDPStatisticsServiceImpl.java
View file @
fc63c15c
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment