From 26f80f9a68cda395ea57a16517998a5f41312dc7 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Sun, 21 Apr 2024 23:34:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=88=A0=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AE=9A=E4=BD=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficDrivingCommitmentController.java | 1 + .../eightwork/AppEightWorkController.java | 15 +++++++-------- .../system/DepartmentController.java | 18 +++++++++--------- src/main/java/com/zcloud/util/Warden.java | 14 ++++++++++++++ 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java index 5a004f3..b683ffc 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java @@ -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"); //是否删除 diff --git a/src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java b/src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java index 8afc65b..09136d1 100644 --- a/src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java +++ b/src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java @@ -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 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 list = body.getJSONArray("rows").toJavaList(JSONObject.class); +// returnMap.put("varList", list); +// returnMap.put("page", page); +// return returnMap; +// } return ReturnMap.error("查询失败"); } diff --git a/src/main/java/com/zcloud/controller/system/DepartmentController.java b/src/main/java/com/zcloud/controller/system/DepartmentController.java index 6398018..27c2b3e 100644 --- a/src/main/java/com/zcloud/controller/system/DepartmentController.java +++ b/src/main/java/com/zcloud/controller/system/DepartmentController.java @@ -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); //返回结果 diff --git a/src/main/java/com/zcloud/util/Warden.java b/src/main/java/com/zcloud/util/Warden.java index 25cb27c..cdfef07 100644 --- a/src/main/java/com/zcloud/util/Warden.java +++ b/src/main/java/com/zcloud/util/Warden.java @@ -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");