验收打回隐患报错 14308

src/main/java/com/zcloud/controller/hidden/HiddenController.java

@@ -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("")) {

src/main/java/com/zcloud/controller/positioning/PositAlarmController.java

@@ -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;
+    }
 }

src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml

@@ -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'