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

部门删除，去掉定位功能

dev
wangpeng 2024-04-21 23:34:19 +08:00
parent 43abb7c7e0
commit 26f80f9a68
4 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java
View File

@ -42,6 +42,7 @@ public class TrafficDrivingCommitmentController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
Warden.initDate(pd);
pd.put("DRIVINGCOMMITMENT_ID", this.get32UUID());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键
pd.put("ISDELETE", "0"); //是否删除

15
src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java
View File

@ -148,14 +148,13 @@ public class AppEightWorkController extends BaseController {
ReturnMap returnMap = new ReturnMap();
PageData pd = new PageData();
pd = this.getPageData();
JSONObject body = PLSUtil.getRyRegionList(pd.getString("CORPINFO_ID"),"",1,99999,0);
if (body != null) {
List<JSONObject> list = body.getJSONArray("rows").toJavaList(JSONObject.class);
returnMap.put("varList", list);
returnMap.put("page", page);
return returnMap;
}
// JSONObject body = PLSUtil.getRyRegionList(pd.getString("CORPINFO_ID"),"",1,99999,0);
// if (body != null) {
// List<JSONObject> list = body.getJSONArray("rows").toJavaList(JSONObject.class);
// returnMap.put("varList", list);
// returnMap.put("page", page);
// return returnMap;
// }
return ReturnMap.error("查询失败");
}

18
src/main/java/com/zcloud/controller/system/DepartmentController.java
View File

@ -115,15 +115,15 @@ public class DepartmentController extends BaseController {
errInfo = "havelist";
map.put("msg", "该部门有清单，请先删除清单"); //返回结果
}else{
PageData dept = new PageData();
dept.put("DEPARTMENT_ID",DEPARTMENT_ID);
PageData byId = departmentService.findById(dept);
JSONObject body = PLSUtil.GeneralDelete("/deploy/dept/", byId.getString("deptId"),Jurisdiction.getCORPINFO_ID());
if (body != null) {
if (!"200".equals(body.getString("code"))) {
return ReturnMap.error(body.getString("msg"));
}
}
// PageData dept = new PageData();
// dept.put("DEPARTMENT_ID",DEPARTMENT_ID);
// PageData byId = departmentService.findById(dept);
// JSONObject body = PLSUtil.GeneralDelete("/deploy/dept/", byId.getString("deptId"),Jurisdiction.getCORPINFO_ID());
// if (body != null) {
// if (!"200".equals(body.getString("code"))) {
// return ReturnMap.error(body.getString("msg"));
// }
// }
departmentService.delete(pd); //执行删除
}
map.put("result", errInfo); //返回结果

14
src/main/java/com/zcloud/util/Warden.java
View File

@ -63,6 +63,19 @@ public class Warden {
entity.put("ISDELETE", "0");
}
public static void initDateNew(PageData entity) {
entity.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键
entity.put("CREATOR", Jurisdiction.getUSER_ID());
entity.put("CREATORNAME", Jurisdiction.getName());
entity.put("CREATE_TIME", DateUtil.getTime());
entity.put("CREATTIME", DateUtil.getTime());
entity.put("OPERATOR", Jurisdiction.getUSER_ID());
entity.put("OPERATORNAME", Jurisdiction.getName());
entity.put("OPERAT_TIME", DateUtil.getTime());
entity.put("OPERATTIME", DateUtil.getTime());
entity.put("ISDELETE", "0");
}
public static void initData(PageData entity, String source, PageData pd) {
entity.put("ISDELETE", "0");
@ -76,6 +89,7 @@ public class Warden {
public static void updateDate(PageData entity) {
entity.put("OPERATOR", Jurisdiction.getUSER_ID());
entity.put("OPERATORNAME", Jurisdiction.getName());
entity.put("OPERAT_TIME", DateUtil.getTime());
entity.put("OPERATTIME", DateUtil.getTime());
entity.put("ISDELETE", "0");