Commit f2028451 authored by chenzhao's avatar chenzhao

修改bug

parent 02445729
...@@ -95,7 +95,7 @@ public class FireFightingSystemController extends BaseController { ...@@ -95,7 +95,7 @@ public class FireFightingSystemController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "消防系统信息列表全部数据查询", notes = "消防系统信息列表全部数据查询") @ApiOperation(httpMethod = "GET",value = "消防系统信息列表全部数据查询", notes = "消防系统信息列表全部数据查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public ResponseModel<List<FireFightingSystemDto>> selectForList() { public ResponseModel<List<FireFightingSystemDto>> selectForList(String bizOrgCode) {
return ResponseHelper.buildResponse(fireFightingSystemServiceImpl.queryForFireFightingSystemList()); return ResponseHelper.buildResponse(fireFightingSystemServiceImpl.queryForFireFightingSystemList(bizOrgCode));
} }
} }
...@@ -4,9 +4,13 @@ import com.yeejoin.amos.boot.module.ccs.api.entity.FireFightingSystem; ...@@ -4,9 +4,13 @@ import com.yeejoin.amos.boot.module.ccs.api.entity.FireFightingSystem;
import com.yeejoin.amos.boot.module.ccs.api.mapper.FireFightingSystemMapper; import com.yeejoin.amos.boot.module.ccs.api.mapper.FireFightingSystemMapper;
import com.yeejoin.amos.boot.module.ccs.api.service.IFireFightingSystemService; import com.yeejoin.amos.boot.module.ccs.api.service.IFireFightingSystemService;
import com.yeejoin.amos.boot.module.ccs.api.dto.FireFightingSystemDto; import com.yeejoin.amos.boot.module.ccs.api.dto.FireFightingSystemDto;
import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import javax.ws.rs.OPTIONS;
import java.util.List; import java.util.List;
/** /**
...@@ -27,7 +31,7 @@ public class FireFightingSystemServiceImpl extends BaseService<FireFightingSyste ...@@ -27,7 +31,7 @@ public class FireFightingSystemServiceImpl extends BaseService<FireFightingSyste
/** /**
* 列表查询 示例 * 列表查询 示例
*/ */
public List<FireFightingSystemDto> queryForFireFightingSystemList() { public List<FireFightingSystemDto> queryForFireFightingSystemList(@Condition(Operator.like) String bizOrgCode) {
return this.queryForList("" , false); return this.queryForList("" , false,bizOrgCode);
} }
} }
\ No newline at end of file
...@@ -80,13 +80,13 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe ...@@ -80,13 +80,13 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
Map map = new HashMap<String, Object>(); Map map = new HashMap<String, Object>();
List<EquipmentManageVo> utils = equipmentManageMapper.getUtils(); List<EquipmentManageVo> utils = equipmentManageMapper.getUtils();
List<DynamicFormGroup> list = iEqDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>() /* List<DynamicFormGroup> list = iEqDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
.eq(DynamicFormGroup::getOrgCode, orgCode) // .eq(DynamicFormGroup::getOrgCode, orgCode)
.eq(DynamicFormGroup::getParentId, 0) .eq(DynamicFormGroup::getParentId, 0)
.orderByDesc(BaseEntity::getCreateDate)); .orderByDesc(BaseEntity::getCreateDate));*/
// List<EquipmentManageVo> systemList = equipmentManageMapper.getSystemList(); List<EquipmentManageVo> systemList = equipmentManageMapper.getSystemList();
map.put("utils", utils); map.put("utils", utils);
map.put("systemType", list); map.put("systemType", systemList);
return map; return map;
} }
......
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