Commit afb98290 authored by chenzhao's avatar chenzhao

yanshou

parent 011f9c21
......@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
......@@ -40,6 +41,20 @@ public class AcceptanceCheckController extends BaseController {
@Autowired
AcceptanceCheckServiceImpl acceptanceCheckServiceImpl;
@Value("${admin.tourong.roleId}")
Long tourongId;
@Value("${admin.fawu.roleId}")
Long fawuId;
@Value("${admin.area.roleId}")
Long areaId;
@Value("${admin.zichan.roleId}")
Long zichanId;
@Value("${admin.delerKaId.roleId}")
Long kaifaId;
@Value("${admin.delerAdmin.roleId}")
Long delerAdminId;
/**
* 新增并网验收节点
*
......@@ -93,23 +108,6 @@ public class AcceptanceCheckController extends BaseController {
return ResponseHelper.buildResponse(acceptanceCheckServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "并网验收节点分页查询", notes = "并网验收节点分页查询")
public ResponseModel<Page<AcceptanceCheckDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<AcceptanceCheckDto> page = new Page<AcceptanceCheckDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(acceptanceCheckServiceImpl.queryForAcceptanceCheckPage(page));
}
/**
* 列表全部数据查询
......@@ -214,27 +212,31 @@ public class AcceptanceCheckController extends BaseController {
for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
roleIds.addAll(longs);
// if (longs.contains(areaId)) {
// basicGridNodes.add("bw-area");
// }
// if (longs.contains(engineeringId)) {
// basicGridNodes.add("bw-engineering");
// }
// if (longs.contains(designId)) {
// basicGridNodes.add("bw-design");
// }
// if (longs.contains(delerAdminId)) {
// basicGridNodes.add("bw-design");
// basicGridNodes.add("bw-engineering");
// basicGridNodes.add("bw-area");
// }
if (longs.contains(areaId)) {
basicGridNodes.add("ys-area");
}
if (longs.contains(tourongId)) {
basicGridNodes.add("ys-tourong");
}
if (longs.contains(fawuId)) {
basicGridNodes.add("ys-fawu");
}
if (longs.contains(zichanId)) {
basicGridNodes.add("ys-zichan");
}
if (longs.contains(delerAdminId)) {
basicGridNodes.add("ys-tourong");
basicGridNodes.add("ys-area");
basicGridNodes.add("ys-fawu");
basicGridNodes.add("ys-zichan");
}
}
Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "",basicGridNodes,type);
//根据角色及当前节点判断是否有操作权限
if (basicGridNodes != null){
for (AcceptanceCheckDto e : page.getRecords()) {
for (String g : basicGridNodes) {
if (null != e.getBasicGridNode() && e.getBasicGridNode().contains(g) ){ //&& (roleIds.contains(areaId) ||roleIds.contains(designId) || roleIds.contains(engineeringId))
if (null != e.getBasicGridNode() && e.getBasicGridNode().contains(g) && (roleIds.contains(areaId) ||roleIds.contains(fawuId) || roleIds.contains(zichanId)|| roleIds.contains(tourongId))){
e.setIsAudit("0");
break;
}else {
......
......@@ -75,6 +75,9 @@ dealer.amosDealerId=1767820997374775298
admin.engineering.roleId=1702512052154687489
admin.area.roleId=1822904567478620161
admin.design.roleId=1702511991735738370
admin.tourong.roleId=1702511733832179714
admin.fawu.roleId=1702511782167339010
admin.zichan.roleId=1827897297053159426
admin.deveEngineering.roleId=1702550832882413570
admin.delerAdmin.roleId=1702512164058718210
admin.delerKaId.roleId=1702551022574006274
......
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