wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

验收打回隐患报错 14308

pull/5/head
dearlin 2024-02-27 17:27:09 +08:00
parent d179e54f87
commit b16405202a
4 changed files with 2078 additions and 2039 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/zcloud/controller/app/AppHiddenController.java
View File

@ -108,6 +108,7 @@ public class AppHiddenController extends BaseController {
private MessageService messageService;
@Autowired
private Smb smb;
/**
* app首页获取数量
*
@ -156,7 +157,8 @@ public class AppHiddenController extends BaseController {
}
// if (che.get("STATE").equals("2")) { //原来是3，但是手机端待验收数据与列表数据不对。调整为2
//待验收 清单排查是3，安全环保检查是2
if ((che.get("STATE").equals("2") || che.get("STATE").equals("3")) && pd.getString("USER_ID").equals(che.get("CHECKOR"))) {
// if ((che.get("STATE").equals("2") || che.get("STATE").equals("3")) && pd.getString("USER_ID").equals(che.get("CHECKOR"))) {
if ((che.get("STATE").equals("2") || che.get("STATE").equals("3"))) {
dys++;
}
}
@ -202,9 +204,10 @@ public class AppHiddenController extends BaseController {
if (cre.get("STATE").equals("4")) {
yys++;
}
if(cre.get("STATE").equals("3")) {
dys++;
}
// bug 14034
// if(cre.get("STATE").equals("3")) {
// dys++;
// }
if (cre.get("STATE").equals("-1")) {
ycq++;
}
@ -386,7 +389,8 @@ public class AppHiddenController extends BaseController {
if (Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人
map.put("msg", "所在部门未维护部门负责人");
return map;
}{
}
{
userpd.put("USER_ID", departmentService.findById(userpd).getString("HEADMAN"));
userpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID"));
if (Tools.isEmpty(usersService.findById(userpd))) {
@ -629,7 +633,8 @@ public class AppHiddenController extends BaseController {
if (Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人
map.put("msg", "所在部门未维护部门负责人");
return map;
}{
}
{
userpd.put("USER_ID", departmentService.findById(userpd).getString("HEADMAN"));
userpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID"));
PageData usersPd = usersService.findById(userpd);
@ -713,7 +718,9 @@ public class AppHiddenController extends BaseController {
return map;
}
/**去修改页面获取数据
/**
* 去修改页面获取数据
*
* @param
* @throws Exception
*/
@ -958,7 +965,9 @@ public class AppHiddenController extends BaseController {
hiddenUserService.delete(pd); //删除隐患相关人员 -- 隐患发现人
if (pd.getString("STATE").equals("16")) {//如果状态等于16进入此方法肯定是提交过来的，赋值给待确认
pd.put("STATE", "-2");
if(Tools.notEmpty(pd.getString("POSITIONDESC"))){hiddenService.editInformation(pd);}
if (Tools.notEmpty(pd.getString("POSITIONDESC"))) {
hiddenService.editInformation(pd);
}
hiddenService.editstate(pd);
}
hiddenService.editInfo(pd);
@ -979,7 +988,6 @@ public class AppHiddenController extends BaseController {
}
/**
* 修改
*
@ -1657,6 +1665,7 @@ public class AppHiddenController extends BaseController {
map.put("result", errInfo);
return map;
}
/**
* 获取检查记录风险点
*
@ -1675,6 +1684,7 @@ public class AppHiddenController extends BaseController {
map.put("hiddenList", hiddenList);
return map;
}
/**
* 列表 隐患列表接口
*
@ -1860,6 +1870,7 @@ public class AppHiddenController extends BaseController {
/**
* 获取隐患部位列表(菜单管理)
*
* @return
*/
@RequestMapping(value = "/getTreehiddenRegionListAll")
@ -2009,6 +2020,7 @@ public class AppHiddenController extends BaseController {
map.put("result", errInfo);
return map;
}
/**
* 安全环保检查隐患指派
*
@ -2122,6 +2134,7 @@ public class AppHiddenController extends BaseController {
/**
* 隐患确认打回
*
* @param
* @throws Exception
*/
@ -2175,6 +2188,7 @@ public class AppHiddenController extends BaseController {
/**
* 判断登录人是否已经验收
*
* @param
* @throws Exception
*/

4
src/main/java/com/zcloud/controller/hidden/HiddenController.java
View File

@ -456,8 +456,8 @@ public class HiddenController extends BaseController {
PageData checkUser = new PageData();
checkUser.put("HIDDENCHECK_ID", this.get32UUID()); // 主键
checkUser.put("HIDDEN_ID", pd.get("HIDDEN_ID"));
checkUser.put("DEPARTMENT_ID", pd.get("CHECKDEPT"));
checkUser.put("USER_ID", pd.get("CHECKOR"));
checkUser.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
checkUser.put("USER_ID", Jurisdiction.getUSER_ID());
checkUser.put("STATUS", "0");
hiddenCheckService.save(checkUser);
if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) {

25
src/main/java/com/zcloud/controller/positioning/PositAlarmController.java
View File

@ -509,4 +509,29 @@ public class PositAlarmController extends BaseController {
}
return returnMap;
}
@RequestMapping(value = "/alarmRecordgoEdit")
@ResponseBody
public ReturnMap alarmRecordgoEdit(Page page) throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralList("/old/gatherAlarms/regAlarmGatherInfoList", pageData);
if (body != null) {
returnMap.putAll(body);
page.setTotalResult(body.getIntValue("total"));
returnMap.put("page", page);
}
return returnMap;
}
@RequestMapping(value = "/getAlarmGatherPsnInfo")
@ResponseBody
public ReturnMap getAlarmGatherPsnInfo() throws Exception {
PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralGetById("/old/gatherAlarms/getAlarmGatherPsnInfo", pageData.getString("id"),Jurisdiction.getCORPINFO_ID());
if (body != null) {
returnMap.putAll(body);
}
return returnMap;
}
}

4
src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml
View File

@ -3852,7 +3852,7 @@
<!-- 根据用户ID获取待验收隐患（app首页） -->
<select id="getRiskStandardCountByCheckorId" parameterType="pd" resultType="pd">
SELECT
f.CREATOR,f.STATE,f.CREATOR
f.CREATOR,f.STATE,f.HIDDEN_ID,'H' as TYPE
FROM
BUS_HIDDEN f
WHERE f.ISDELETE = '0' and f.STATE != '0'
@ -3866,7 +3866,7 @@
union all
SELECT
f.CREATOR,f.STATE,f.CREATOR
f.CREATOR,f.STATE,f.HIDDEN_ID,'D' as TYPE
FROM
BUS_HIDDENDANGERCHECKSTANDARD_HIDDEN f
WHERE f.ISDELETE = '0' and f.STATE != '0'