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

Merge remote-tracking branch 'origin/dev' into dev

pull/4/head
chenxinying 2024-02-20 16:49:47 +08:00
parent 68796ab8b1 24a7d01b8c
commit 192810971f
3 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,15 +147,15 @@ public class AppHiddenController extends BaseController {
} }
} }
List<PageData> checkorHid = hiddenService.getCountByCheckorId(pd); // 根据人员id获取整改隐患信息 state 1 5 // List<PageData> checkorHid = hiddenService.getCountByCheckorId(pd); // 根据人员id获取整改隐患信息 state 1 5
// List<PageData> checkorHid = hiddenService.getRiskStandardCountByCheckorId(pd); // 根据用户ID获取待验收隐患（app首页） List<PageData> checkorHid = hiddenService.getRiskStandardCountByCheckorId(pd); // 根据用户ID获取待验收隐患（app首页）
for (int i = 0; i < checkorHid.size(); i++) { for (int i = 0; i < checkorHid.size(); i++) {
PageData che = checkorHid.get(i); PageData che = checkorHid.get(i);
if (null == che.get("STATE")) { if (null == che.get("STATE")) {
continue; continue;
} }
if (che.get("STATE").equals("2")) { //原来是3，但是手机端待验收数据与列表数据不对。调整为2 // if (che.get("STATE").equals("2")) { //原来是3，但是手机端待验收数据与列表数据不对。调整为2
// if (che.get("STATE").equals("3") && pd.getString("USER_ID").equals(che.get("CHECKOR"))) { if (che.get("STATE").equals("3") && pd.getString("USER_ID").equals(che.get("CHECKOR"))) {
dys++; dys++;
} }
} }
@ -186,9 +186,9 @@ public class AppHiddenController extends BaseController {
yq++; yq++;
} }
} }
pd.put("APPSELFUSERID", pd.get("userId"));
List<PageData> creatorHid = hiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息 // List<PageData> creatorHid = hiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息
// List<PageData> creatorHid = hiddenService.getRiskStandardCountByCreatorId(pd); // 根据用户ID获取发现隐患信息（app首页） List<PageData> creatorHid = hiddenService.getRiskStandardCountByCreatorId(pd); // 根据用户ID获取发现隐患信息（app首页）
System.out.println(creatorHid); System.out.println(creatorHid);
for (int i = 0; i < creatorHid.size(); i++) { for (int i = 0; i < creatorHid.size(); i++) {
PageData cre = creatorHid.get(i); PageData cre = creatorHid.get(i);

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

@ -1920,4 +1920,25 @@ public class HiddenController extends BaseController {
map.put("yys", yys); map.put("yys", yys);
return map; return map;
} }
@RequestMapping(value = "/listForAhZp")
// @RequiresPermissions("hidden:list")
@ResponseBody
public Object listFoAhZp(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
// pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
page.setPd(pd);
List<PageData> varList = hiddenService.listForSafetyEnvironmental(page); // 列出Hidden列表
varList = hiddenUserService.getHiddebFind(varList);
for (PageData vector : varList) {
safetyenvironmentalService.departmentUtil(vector);
}
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
} }

12
src/main/resources/mybatis/datasource/check/ListManagerMapper.xml
View File

@ -3246,9 +3246,9 @@
and and
f.CORPINFO_ID = #{CORPINFO_ID} f.CORPINFO_ID = #{CORPINFO_ID}
</if> </if>
<!-- <if test="USER_ID != null and USER_ID != ''">&lt;!&ndash; 部门查询条件 &ndash;&gt;--> <if test="USER_ID != null and USER_ID != ''"><!-- 部门查询条件 -->
<!-- and f.USER_ID = #{USER_ID}--> and f.USER_ID = #{USER_ID}
<!-- </if>--> </if>
<choose> <choose>
<when test='ISSUPERVISE != null and ISSUPERVISE != "" and ISSUPERVISE == "1"'> <when test='ISSUPERVISE != null and ISSUPERVISE != "" and ISSUPERVISE == "1"'>
<choose> <choose>
@ -3375,9 +3375,9 @@
<if test="CORPINFO_ID != null and CORPINFO_ID != ''"> <if test="CORPINFO_ID != null and CORPINFO_ID != ''">
and f.CORPINFO_ID = #{CORPINFO_ID} and f.CORPINFO_ID = #{CORPINFO_ID}
</if> </if>
<!-- <if test="USER_ID != null and USER_ID != ''">&lt;!&ndash; 部门查询条件 &ndash;&gt;--> <if test="USER_ID != null and USER_ID != ''"><!-- 部门查询条件 -->
<!-- and f.USER_ID = #{USER_ID}--> and f.USER_ID = #{USER_ID}
<!-- </if>--> </if>
<choose> <choose>
<when test='ISSUPERVISE != null and ISSUPERVISE != "" and ISSUPERVISE == "1"'> <when test='ISSUPERVISE != null and ISSUPERVISE != "" and ISSUPERVISE == "1"'>
<choose> <choose>