Commit fc63c15c authored by 麻笑宇's avatar 麻笑宇

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
......@@ -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!='' ">
......
......@@ -42,4 +42,14 @@ public class SecurityIndexCountItemDto {
* 充装检查率
*/
String czjchege;
/**
* 人员合规率(资质有效期统计)
*/
String ryhg;
/**
* 数据合规率
*/
String sjhg;
}
......@@ -38,7 +38,7 @@
and date_le(CAST(problem_time as date),#{dto.endDate})
</if>
AND source_type_code = #{sourceTypeCode}
<if test="null != equipType">
<if test="null != equListCode">
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>
......
......@@ -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"
......
......@@ -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);
}
......
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