Commit 4ce836a7 authored by litengwei's avatar litengwei

获取换流站已配备消防人员的换流站数量

parent 594121c9
...@@ -161,4 +161,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> { ...@@ -161,4 +161,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
List<Map<String, Object>> getFireProtectionAndMaintenance(); List<Map<String, Object>> getFireProtectionAndMaintenance();
Map<String, Object> getPersonType(@Param("typeCode") String typeCode); Map<String, Object> getPersonType(@Param("typeCode") String typeCode);
List<Map<String, Object>> reportResult(String startTime, String endTime, String bizOrgCode);
} }
...@@ -402,4 +402,6 @@ public interface IOrgUsrService { ...@@ -402,4 +402,6 @@ public interface IOrgUsrService {
void updatePersonStatus(String status, String id); void updatePersonStatus(String status, String id);
String reportResult(String startTime, String endTime, String bizOrgCode);
} }
...@@ -1433,4 +1433,30 @@ LEFT JOIN ( ...@@ -1433,4 +1433,30 @@ LEFT JOIN (
AND dfi.field_code = 'peopleType' AND dfi.field_code = 'peopleType'
limit 1 limit 1
</select> </select>
<select id="reportResult" resultType="java.util.Map">
SELECT
*
FROM
(
SELECT
*
FROM
(
SELECT
person.biz_org_name AS NAME,
person.biz_org_code AS bizOrgCode,
person.parent_id AS parentId,
cdf.field_value AS peopleType
FROM
( SELECT sequence_nbr, biz_org_name, biz_org_code, parent_id FROM cb_org_usr WHERE biz_org_type = 'PERSON' AND is_delete = 0 AND biz_org_code LIKE concat(#{bizOrgCode}, '%')
AND rec_date >= #{startTime} AND #{endTime} >= rec_date ) person
LEFT JOIN ( SELECT field_value, instance_id FROM cb_dynamic_form_instance WHERE group_code = '246' AND field_code = 'peopleType' ) cdf ON person.sequence_nbr = cdf.instance_id
) AS a
WHERE
a.peopleType IS NOT NULL
AND a.peopleType = '1601'
) AS a
GROUP BY
parentId
</select>
</mapper> </mapper>
...@@ -3580,6 +3580,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -3580,6 +3580,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
orgUsrMapper.updatePersonStatus(status,id); orgUsrMapper.updatePersonStatus(status,id);
} }
@Override
public String reportResult(String startTime, String endTime, String bizOrgCode) {
List<Map<String, Object>> stringObjectMap = orgUsrMapper.reportResult(startTime, endTime, bizOrgCode);
return String.valueOf(stringObjectMap.size());
}
private RiskBizInfoVo getRiskBizInfo(RiskBizInfoVo riskBizInfoVo, PeopleInfoDto peopleInfoDto,String id) { private RiskBizInfoVo getRiskBizInfo(RiskBizInfoVo riskBizInfoVo, PeopleInfoDto peopleInfoDto,String id) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
riskBizInfoVo.setWarningObjectName(peopleInfoDto.getFirefighters().getName()); riskBizInfoVo.setWarningObjectName(peopleInfoDto.getFirefighters().getName());
......
package com.yeejoin.amos.boot.module.jcs.biz.controller;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
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 org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
@Api(tags = "报表填充字段接口")
@RestController
@RequestMapping("/reportSource")
public class ReportController {
@Autowired
private IOrgUsrService orgUsrService;
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(value = "获取换流站已配备消防人员的换流站数量", notes = "获取换流站已配备消防人员的换流站数量")
@RequestMapping(value = "/station/count", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public ResponseModel getPersonDetailById(@RequestParam(value = "bizOrgCode") String bizOrgCode,
@RequestParam(value = "startTime") String startTime,
@RequestParam(value = "endTime") String endTime
) {
return CommonResponseUtil.success(orgUsrService.reportResult(startTime,endTime, bizOrgCode));
}
}
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