Skip to content

A
amos-boot-biz
Commit bf443967 authored by lisong's avatar lisong
Browse files
Options

更新

parent edc54fd3
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 49 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrganizationUserExportDto.java
View file @ bf443967
......@@ -24,4 +24,9 @@ public class OrganizationUserExportDto {
@ExcelProperty(value = "*组员电话", index = 3)
private String telephone;
@ColumnWidth(25)
@ExcelProperty(value = "会商码", index = 4)
private String consultationNub;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/OrganizationMapper.xml
View file @ bf443967
......@@ -69,13 +69,14 @@
</select>
<select id="getOrganizationList" resultType="java.util.Map">
SELECT
cou.emergency_team_id as groupId,
co.emergency_team_name as emergencyTeamName,
cou.member_name as memberName ,
cou.post_name as postName,
cou.telephone,
co.duty,
cou.consultation_nub as consultationNub
cou.sequence_nbr as userId,
ifnull(cou.emergency_team_id, '') as groupId,
ifnull(co.emergency_team_name, '') as emergencyTeamName,
ifnull(cou.member_name, '') as memberName ,
ifnull(cou.post_name, '') as postName,
ifnull(cou.telephone, '')as telephone,
ifnull(co.duty, '') as duty ,
ifnull(cou.consultation_nub, '') as consultationNub
FROM
cb_organization co
LEFT JOIN cb_organization_user cou ON co.sequence_nbr = cou.emergency_team_id
......@@ -110,7 +111,8 @@
cou.emergency_team_name AS emergencyTeamName,
cou.member_name as memberName,
cou.post_name AS postName,
cou.telephone
cou.telephone,
cou.consultation_nub
FROM
cb_organization_user cou
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java
View file @ bf443967
......@@ -87,13 +87,14 @@ public class EmergencyController extends AbstractBaseController {
@GetMapping(value = "/fireMonitor")
public Page<Map<String, Object>> selectFireMonitor(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
@RequestParam(value = "pageNumber") int pageNumber,
@RequestParam(value = "pageSize") int pageSize) {
@RequestParam(value = "pageSize") int pageSize,
@RequestParam(value = "code") String code) {
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
if (ObjectUtils.isEmpty(bizOrgCode)){
ReginParams reginParams = getSelectedOrgInfo();
bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
}
return iEmergencyService.selectFireMonitor(page, bizOrgCode);
return iEmergencyService.selectFireMonitor(page, bizOrgCode, code);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -116,13 +117,14 @@ public class EmergencyController extends AbstractBaseController {
@GetMapping(value = "/selectOilDrainage")
public Page<Map<String, Object>> selectOilDrainage(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode ,
@RequestParam(value = "pageNumber") int pageNumber,
@RequestParam(value = "pageSize") int pageSize) {
@RequestParam(value = "pageSize") int pageSize,
@RequestParam(value = "code") String code) {
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
if (ObjectUtils.isEmpty(bizOrgCode)){
ReginParams reginParams = getSelectedOrgInfo();
bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
}
return iEmergencyService.selectOilDrainage(page, bizOrgCode);
return iEmergencyService.selectOilDrainage(page, bizOrgCode, code);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java
View file @ bf443967
......@@ -32,7 +32,7 @@ public interface EmergencyMapper extends BaseMapper{
* @param bizOrgCode
* @return
*/
Page<Map<String, Object>> selectFireMonitor(Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode);
Page<Map<String, Object>> selectFireMonitor(Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode, @Param("code") String code);
/**
* 泡沫罐
......@@ -46,7 +46,7 @@ public interface EmergencyMapper extends BaseMapper{
* @param bizOrgCode
* @return
*/
Page<Map<String, Object>> selectOilDrainage(Page<Map<String, Object>> page , @Param("bizOrgCode") String bizOrgCode);
Page<Map<String, Object>> selectOilDrainage(Page<Map<String, Object>> page , @Param("bizOrgCode") String bizOrgCode, @Param("code") String code);
/**
* 压力流量
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java
View file @ bf443967
......@@ -26,11 +26,11 @@ public interface IEmergencyService {
Page<Map<String, Object>> emergencyMaterialsDetails(Page<Map<String, Object>> page, String bizOrgCode);
Page<Map<String, Object>> selectFireMonitor(Page<Map<String, Object>> page, String bizOrgCode);
Page<Map<String, Object>> selectFireMonitor(Page<Map<String, Object>> page, String bizOrgCode,String code);
Page<Map<String, Object>> selectFoamTank(Page<Map<String, Object>> page, String bizOrgCode);
Page<Map<String, Object>> selectOilDrainage(Page<Map<String, Object>> page, String bizOrgCode);
Page<Map<String, Object>> selectOilDrainage(Page<Map<String, Object>> page, String bizOrgCode, String code);
Page<Map<String, Object>> selectPressureFlow(Page<Map<String, Object>> page, String bizOrgCode);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java
View file @ bf443967
......@@ -69,8 +69,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
}
@Override
public Page<Map<String, Object>> selectFireMonitor(Page<Map<String, Object>> page, String bizOrgCode) {
return emergencyMapper.selectFireMonitor(page, bizOrgCode);
public Page<Map<String, Object>> selectFireMonitor(Page<Map<String, Object>> page, String bizOrgCode, String code) {
return emergencyMapper.selectFireMonitor(page, bizOrgCode, code);
}
@Override
......@@ -79,8 +79,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
}
@Override
public Page<Map<String, Object>> selectOilDrainage(Page<Map<String, Object>> page, String bizOrgCode) {
return emergencyMapper.selectOilDrainage(page, bizOrgCode);
public Page<Map<String, Object>> selectOilDrainage(Page<Map<String, Object>> page, String bizOrgCode, String code) {
return emergencyMapper.selectOilDrainage(page, bizOrgCode, code);
}
@Override
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrganizationController.java
View file @ bf443967
......@@ -105,12 +105,12 @@ public class OrganizationController extends BaseController {
List<OrganizationUserExportDto> secondSheetVOS = new ArrayList<>();
// 表一写入
// 应急救援小组写入
ExcelWriter writer = EasyExcel.write(response.getOutputStream(), OrganizationExportDto.class).build();
WriteSheet sheet = EasyExcel.writerSheet(0, "应急救援小组").build();
writer.write(firstSheetVOS, sheet);
// 表二写入
// 组员写入
WriteSheet sheet2 = EasyExcel.writerSheet(1, "组员").head(OrganizationUserExportDto.class).build();
writer.write(secondSheetVOS, sheet2);
......@@ -127,8 +127,15 @@ public class OrganizationController extends BaseController {
@GetMapping(value = "/exportData")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "四横八纵", notes = "四横八纵-组织机构导出")
public void exportData(@RequestParam("bizOrgCode") String bizOrgCode
, HttpServletResponse response) {
public void exportData( HttpServletResponse response) {
ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String bizOrgCode = null;
if(null != reginParam) {
bizOrgCode = reginParam.getPersonIdentity().getBizOrgCode();
if (StringUtils.isEmpty(bizOrgCode)) {
return ;
}
}
String file_name = null;
try {
file_name = new String("组织机构信息".getBytes(), "ISO-8859-1");
......@@ -159,9 +166,15 @@ public class OrganizationController extends BaseController {
@GetMapping(value = "/upload")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "四横八纵", notes = "四横八纵-组织机构导入")
public ResponseModel upload(@RequestParam("bizOrgCode") String bizOrgCode
, MultipartFile file) {
public ResponseModel upload(MultipartFile file) {
ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String bizOrgCode = null;
if(null != reginParam) {
bizOrgCode = reginParam.getPersonIdentity().getBizOrgCode();
if (StringUtils.isEmpty(bizOrgCode)) {
return CommonResponseUtil.failure();
}
}
try {
ExcelReader reader = EasyExcel.read(file.getInputStream()).build();
List<OrganizationExportDto> organizationList = ExcelUtil.readExcel(reader, OrganizationExportDto.class, 0);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrganizationImpl.java
View file @ bf443967
......@@ -40,20 +40,21 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
@Override
public Page<Map<String, Object>> getOrganizationList(Page<Map<String, Object>> page, String bizOrgCode) {
Page<Map<String, Object>> groupPage = new Page<>();
Page<Map<String, Object>> group = organizationMapper.getOrganizationGroup(groupPage, bizOrgCode);
Page<Map<String, Object>> mapPage = organizationMapper.getOrganizationList(page, bizOrgCode);
List<Map<String, Object>> records = group.getRecords();
ArrayList<Map<String, Object>> result = new ArrayList<>();
for (Map<String, Object> record : records) {
List<Map<String, Object>> collect = mapPage.getRecords().stream().filter(item -> String.valueOf(record.get("id")).equals(String.valueOf(item.get("groupId")))).collect(Collectors.toList());
record.put("persons", collect);
result.add(record);
}
mapPage.setRecords(result);
return mapPage;
// Page<Map<String, Object>> groupPage = new Page<>();
// Page<Map<String, Object>> group = organizationMapper.getOrganizationGroup(groupPage, bizOrgCode);
// Page<Map<String, Object>> mapPage = organizationMapper.getOrganizationList(page, bizOrgCode);
// List<Map<String, Object>> records = group.getRecords();
// ArrayList<Map<String, Object>> result = new ArrayList<>();
// for (Map<String, Object> record : records) {
//
// List<Map<String, Object>> collect = mapPage.getRecords().stream().filter(item -> String.valueOf(record.get("id")).equals(String.valueOf(item.get("groupId")))).collect(Collectors.toList());
// record.put("persons", collect);
// result.add(record);
//
// }
// mapPage.setRecords(result);
// return mapPage;
return organizationMapper.getOrganizationList(page, bizOrgCode);
}
@Override
......
amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml
View file @ bf443967
......@@ -111,15 +111,17 @@
</select>
<select id="selectEmergencyMaterialsDetails" resultType="java.util.Map">
SELECT
IFNULL(ec.name,'') AS name ,
IFNULL(ec.name,'--') AS name ,
count( 1 ) AS num,
IFNULL(ws.`name`,'') AS buildingname
IFNULL(ws.`name`,'--') AS buildingname,
IFNULL(un.name,'--') as unit
FROM
`wl_equipment_specific` wel
LEFT JOIN wl_warehouse_structure ws ON wel.warehouse_structure_id = ws.id
LEFT JOIN wl_equipment_detail wed ON wel.equipment_detail_id = wed.id
LEFT JOIN wl_equipment we ON wed.equipment_Id = we.id
LEFT JOIN wl_equipment_category ec ON we.category_id = ec.id
LEFT JOIN wl_unit un ON we.unit_id = un.id
WHERE
(
wel.equipment_code LIKE CONCAT( '3104', '%' )
......@@ -153,9 +155,10 @@
1 ELSE 0
END AS alarm
FROM wl_equipment_specific wes
JOIN f_equipment_fire_equipment fire ON wes.id = fire.fire_equipment_id
WHERE
wes.equipment_code LIKE concat( '920322', '%' )
AND fire.equipment_id = (SELECT id FROM f_equipment WHERE `code` = #{code})
AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) temp
......@@ -203,9 +206,10 @@
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'volume' ), 0 ) AS volume
FROM
wl_equipment_specific wes
JOIN f_equipment_fire_equipment fire ON wes.id = fire.fire_equipment_id
WHERE
wes.equipment_code LIKE concat( '920319', '%' )
AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) temp
</select>
......@@ -243,7 +247,9 @@
wl_equipment_specific wes
JOIN f_equipment_fire_equipment fire ON wes.id = fire.fire_equipment_id
WHERE
wes.equipment_code LIKE concat( '921003', '%' ) AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' ) UNION
wes.equipment_code LIKE concat( '921003', '%' )
AND fire.equipment_id = (SELECT id FROM f_equipment WHERE `code` = #{code})
AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' ) UNION
(
SELECT
wes.id,
......@@ -277,7 +283,9 @@
wl_equipment_specific wes
JOIN f_equipment_fire_equipment fire ON wes.id = fire.fire_equipment_id
WHERE
wes.equipment_code LIKE concat( '921002', '%' ) AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
wes.equipment_code LIKE concat( '921002', '%' )
AND fire.equipment_id = (SELECT id FROM f_equipment WHERE `code` = #{code})
AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) UNION
(
SELECT
......@@ -312,7 +320,9 @@
wl_equipment_specific wes
JOIN f_equipment_fire_equipment fire ON wes.id = fire.fire_equipment_id
WHERE
wes.equipment_code LIKE concat( '921004', '%' )AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
wes.equipment_code LIKE concat( '921004', '%' )
AND fire.equipment_id = (SELECT id FROM f_equipment WHERE `code` = #{code})
AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) UNION
(
SELECT
......@@ -347,7 +357,9 @@
wl_equipment_specific wes
JOIN f_equipment_fire_equipment fire ON wes.id = fire.fire_equipment_id
WHERE
wes.equipment_code LIKE concat( '921005', '%' )AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
wes.equipment_code LIKE concat( '921005', '%' )
AND fire.equipment_id = (SELECT id FROM f_equipment WHERE `code` = #{code})
AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
)
</select>
......
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