延时监火改为多人同时监火,在同一个部门中都可以查看和发布监火信息2
parent
98dc83e051
commit
f53539025c
|
@ -88,22 +88,24 @@ public class AppHomeController extends BaseController {
|
|||
if(!Tools.isEmpty(pd.get("USER_ID"))){
|
||||
varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID"));
|
||||
PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID"));
|
||||
if (varList.size() > 0) {
|
||||
boolean isDelayedExist = false;
|
||||
for (PageData data : varList) {
|
||||
if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true;
|
||||
}
|
||||
if (isDelayedExist) {
|
||||
for (PageData pageData : varList){
|
||||
if (StringUtils.equals(pageData.getString("STATE"),"10")) {
|
||||
pageData.put("count",delayedCount.getString("count"));
|
||||
if (Integer.parseInt(delayedCount.getString("count")) != 0) {
|
||||
if (varList.size() > 0) {
|
||||
boolean isDelayedExist = false;
|
||||
for (PageData data : varList) {
|
||||
if (StringUtils.equals(data.getString("STATE"), "10")) isDelayedExist = true;
|
||||
}
|
||||
if (isDelayedExist) {
|
||||
for (PageData pageData : varList) {
|
||||
if (StringUtils.equals(pageData.getString("STATE"), "10")) {
|
||||
pageData.put("count", delayedCount.getString("count"));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
varList.add(delayedCount);
|
||||
}
|
||||
} else {
|
||||
varList.add(delayedCount);
|
||||
}
|
||||
} else {
|
||||
varList.add(delayedCount);
|
||||
}
|
||||
myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID"));
|
||||
}
|
||||
|
@ -146,22 +148,24 @@ public class AppHomeController extends BaseController {
|
|||
if(!Tools.isEmpty(pd.get("USER_ID"))){
|
||||
varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID"));
|
||||
PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID"));
|
||||
if (varList.size() > 0) {
|
||||
boolean isDelayedExist = false;
|
||||
for (PageData data : varList) {
|
||||
if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true;
|
||||
}
|
||||
if (isDelayedExist) {
|
||||
for (PageData pageData : varList){
|
||||
if (StringUtils.equals(pageData.getString("STATE"),"10")) {
|
||||
pageData.put("count",delayedCount.getString("count"));
|
||||
if (Integer.parseInt(delayedCount.getString("count")) != 0) {
|
||||
if (varList.size() > 0) {
|
||||
boolean isDelayedExist = false;
|
||||
for (PageData data : varList) {
|
||||
if (StringUtils.equals(data.getString("STATE"), "10")) isDelayedExist = true;
|
||||
}
|
||||
if (isDelayedExist) {
|
||||
for (PageData pageData : varList) {
|
||||
if (StringUtils.equals(pageData.getString("STATE"), "10")) {
|
||||
pageData.put("count", delayedCount.getString("count"));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
varList.add(delayedCount);
|
||||
}
|
||||
} else {
|
||||
varList.add(delayedCount);
|
||||
}
|
||||
} else {
|
||||
varList.add(delayedCount);
|
||||
}
|
||||
myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID"));
|
||||
}
|
||||
|
|
|
@ -746,42 +746,44 @@ public class AppHotWorkApplicationController extends BaseController {
|
|||
}
|
||||
}
|
||||
PageData hotUser = new PageData();
|
||||
hotUser.put("hotIds", hotIds);
|
||||
List<PageData> hotUserAllList = hotWorkApplicationUserService.listAll(hotUser);
|
||||
for (PageData userPageData : hotUserAllList){
|
||||
String hotAndType = userPageData.getString("FOREIGN_KEY");
|
||||
if(hotIdKeyMap.containsKey(hotAndType)){
|
||||
PageData hot = varList.get(hotIdKeyMap.get(hotAndType));
|
||||
String type = userPageData.get("STATE").toString();
|
||||
if("0".equals(type)){ // 申请办理人
|
||||
hot.put("APPLY_DEPARTMENT_NAME",userPageData.getString("deptName"));
|
||||
hot.put("APPLY_USER_NAME",userPageData.getString("userName"));
|
||||
hot.put("APPLY_USER_ID",userPageData.getString("USER_ID"));
|
||||
}else if("1".equals(type)){ //动火单位负责人
|
||||
hot.put("HOT_WORK_UNIT_LEADER_NAME",userPageData.getString("userName"));
|
||||
hot.put("HOT_WORK_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
|
||||
}else if("2".equals(type)){ // 项目发包单位负责人
|
||||
hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName"));
|
||||
hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
|
||||
}else if("3".equals(type)){ // 现场管辖单位负责人
|
||||
hot.put("UNIT_LEADER_NAME",userPageData.getString("userName"));
|
||||
hot.put("UNIT_LEADER_ID",userPageData.getString("USER_ID"));
|
||||
}else if("5".equals(type)){ // 动火前 负责人
|
||||
hot.put("HOT_WORK_BEFORE_UNIT_LEADER",userPageData.getString("userName"));
|
||||
}else if("6".equals(type)){ // 现场负责人
|
||||
hot.put("SITE_LEADER_NAME",userPageData.getString("userName"));
|
||||
hot.put("SITE_LEADER_PHONE",userPageData.getString("userPhone"));
|
||||
}else if("7".equals(type)){ // 动火后 负责人
|
||||
hot.put("HOT_WORK_AFTER_UNIT_LEADER",userPageData.getString("userName"));
|
||||
} else if("11".equals(type)){ // 特级动火 申请人
|
||||
hot.put("DEPARTMENT_PERSONNEL_NAME",userPageData.getString("userName"));
|
||||
hot.put("DEPARTMENT_PERSONNEL_ID",userPageData.getString("USER_ID"));
|
||||
}else if("20".equals(type)){ // 特级动火 申请人
|
||||
hot.put("SUPERVISOR_OF_HOT_WORK_UNIT",userPageData.getString("USER_ID"));
|
||||
}else if("21".equals(type)){ // 动火后 负责人
|
||||
String userName = userPageData.getString("userName2") +",";
|
||||
String oldName = Tools.isEmpty(pd.get("HOT_WORK_OPERATOR_NAME"))?"":pd.get("HOT_WORK_OPERATOR_NAME").toString();
|
||||
hot.put("HOT_WORK_OPERATOR_NAME",oldName + userName);
|
||||
if (hotIds.size() > 0) {
|
||||
hotUser.put("hotIds", hotIds);
|
||||
List<PageData> hotUserAllList = hotWorkApplicationUserService.listAll(hotUser);
|
||||
for (PageData userPageData : hotUserAllList){
|
||||
String hotAndType = userPageData.getString("FOREIGN_KEY");
|
||||
if(hotIdKeyMap.containsKey(hotAndType)){
|
||||
PageData hot = varList.get(hotIdKeyMap.get(hotAndType));
|
||||
String type = userPageData.get("STATE").toString();
|
||||
if("0".equals(type)){ // 申请办理人
|
||||
hot.put("APPLY_DEPARTMENT_NAME",userPageData.getString("deptName"));
|
||||
hot.put("APPLY_USER_NAME",userPageData.getString("userName"));
|
||||
hot.put("APPLY_USER_ID",userPageData.getString("USER_ID"));
|
||||
}else if("1".equals(type)){ //动火单位负责人
|
||||
hot.put("HOT_WORK_UNIT_LEADER_NAME",userPageData.getString("userName"));
|
||||
hot.put("HOT_WORK_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
|
||||
}else if("2".equals(type)){ // 项目发包单位负责人
|
||||
hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName"));
|
||||
hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
|
||||
}else if("3".equals(type)){ // 现场管辖单位负责人
|
||||
hot.put("UNIT_LEADER_NAME",userPageData.getString("userName"));
|
||||
hot.put("UNIT_LEADER_ID",userPageData.getString("USER_ID"));
|
||||
}else if("5".equals(type)){ // 动火前 负责人
|
||||
hot.put("HOT_WORK_BEFORE_UNIT_LEADER",userPageData.getString("userName"));
|
||||
}else if("6".equals(type)){ // 现场负责人
|
||||
hot.put("SITE_LEADER_NAME",userPageData.getString("userName"));
|
||||
hot.put("SITE_LEADER_PHONE",userPageData.getString("userPhone"));
|
||||
}else if("7".equals(type)){ // 动火后 负责人
|
||||
hot.put("HOT_WORK_AFTER_UNIT_LEADER",userPageData.getString("userName"));
|
||||
} else if("11".equals(type)){ // 特级动火 申请人
|
||||
hot.put("DEPARTMENT_PERSONNEL_NAME",userPageData.getString("userName"));
|
||||
hot.put("DEPARTMENT_PERSONNEL_ID",userPageData.getString("USER_ID"));
|
||||
}else if("20".equals(type)){ // 特级动火 申请人
|
||||
hot.put("SUPERVISOR_OF_HOT_WORK_UNIT",userPageData.getString("USER_ID"));
|
||||
}else if("21".equals(type)){ // 动火后 负责人
|
||||
String userName = userPageData.getString("userName2") +",";
|
||||
String oldName = Tools.isEmpty(pd.get("HOT_WORK_OPERATOR_NAME"))?"":pd.get("HOT_WORK_OPERATOR_NAME").toString();
|
||||
hot.put("HOT_WORK_OPERATOR_NAME",oldName + userName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1361,22 +1363,24 @@ public class AppHotWorkApplicationController extends BaseController {
|
|||
if(!Tools.isEmpty(pd.get("USER_ID"))){
|
||||
varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID"));
|
||||
PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID"));
|
||||
if (varList.size() > 0) {
|
||||
boolean isDelayedExist = false;
|
||||
for (PageData data : varList) {
|
||||
if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true;
|
||||
}
|
||||
if (isDelayedExist) {
|
||||
for (PageData pageData : varList){
|
||||
if (StringUtils.equals(pageData.getString("STATE"),"10")) {
|
||||
pageData.put("count",delayedCount.getString("count"));
|
||||
if (Integer.parseInt(delayedCount.getString("count")) != 0) {
|
||||
if (varList.size() > 0) {
|
||||
boolean isDelayedExist = false;
|
||||
for (PageData data : varList) {
|
||||
if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true;
|
||||
}
|
||||
if (isDelayedExist) {
|
||||
for (PageData pageData : varList){
|
||||
if (StringUtils.equals(pageData.getString("STATE"),"10")) {
|
||||
pageData.put("count",delayedCount.getString("count"));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
varList.add(delayedCount);
|
||||
}
|
||||
} else {
|
||||
varList.add(delayedCount);
|
||||
}
|
||||
} else {
|
||||
varList.add(delayedCount);
|
||||
}
|
||||
myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID"));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue