From 292883e482732d8f09ae765a7217cfa068525818 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 9 Apr 2024 16:09:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=E7=AE=A1=E7=90=86=EF=BC=8C=E7=94=A8=E6=88=B7=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficSafetyAssessmentController.java | 13 +------------ ...ficSafetyOccupationalHazardsController.java | 16 ---------------- .../TrafficSafetyProductionController.java | 13 +------------ .../TrafficSafetyResponsibilityController.java | 16 ---------------- .../TrafficSecurityCommitmentController.java | 17 ----------------- ...TrafficSecurityLaborContractController.java | 17 +---------------- ...icSecurityManagementStaffingController.java | 18 +----------------- .../controller/system/UsersController.java | 18 +++++++++--------- .../TrafficSafetyAssessmentMapper.xml | 3 +++ .../TrafficSafetyProductionMapper.xml | 12 +++++++++++- .../TrafficSecurityLaborContractMapper.xml | 3 +++ ...TrafficSecurityManagementStaffingMapper.xml | 5 ++++- 12 files changed, 34 insertions(+), 117 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java index 850a857..c8430ce 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java @@ -127,18 +127,7 @@ public class TrafficSafetyAssessmentController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 - if (Tools.notEmpty(SYSTEMNAME)) - pd.put("SYSTEMNAME", SYSTEMNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = safetyAssessmentService.listForSafetyAssessment(page); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java index 13252e0..25dc00f 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java @@ -145,22 +145,6 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); - String OCCUPATIONALNAME = pd.getString("OCCUPATIONALNAME"); // 关键词检索条件 - if (Tools.notEmpty(OCCUPATIONALNAME)) - pd.put("OCCUPATIONALNAME", OCCUPATIONALNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - - String ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件 - if (Tools.notEmpty(ISSIGNED)) - pd.put("ISSIGNED", ISSIGNED.trim()); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java index c11a2e7..d986bc0 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java @@ -135,18 +135,7 @@ public class TrafficSafetyProductionController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 - if (Tools.notEmpty(SYSTEMNAME)) - pd.put("SYSTEMNAME", SYSTEMNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = safetyProductionService.listForSafetyProductionlist(page); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java index 645dfae..376a9ae 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java @@ -139,22 +139,6 @@ public class TrafficSafetyResponsibilityController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); - String RESPONSIBILITYNAME = pd.getString("RESPONSIBILITYNAME"); // 关键词检索条件 - if (Tools.notEmpty(RESPONSIBILITYNAME)) - pd.put("RESPONSIBILITYNAME", RESPONSIBILITYNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - - String ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件 - if (Tools.notEmpty(ISSIGNED)) - pd.put("ISSIGNED", ISSIGNED.trim()); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java index fd92b05..7837422 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java @@ -130,23 +130,6 @@ public class TrafficSecurityCommitmentController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String COMMITMENTNAME = pd.getString("COMMITMENTNAME"); // 关键词检索条件 - if (Tools.notEmpty(COMMITMENTNAME)) - pd.put("COMMITMENTNAME", COMMITMENTNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - - String ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件 - if (Tools.notEmpty(ISSIGNED)) - pd.put("ISSIGNED", ISSIGNED.trim()); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLaborContractController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLaborContractController.java index f576042..37b0342 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLaborContractController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLaborContractController.java @@ -136,22 +136,7 @@ public class TrafficSecurityLaborContractController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String CONTRACTNAME = pd.getString("CONTRACTNAME"); // 关键词检索条件 - if (Tools.notEmpty(CONTRACTNAME)) - pd.put("CONTRACTNAME", CONTRACTNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - - String ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件 - if (Tools.notEmpty(ISSIGNED)) - pd.put("ISSIGNED", ISSIGNED.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = laborContractService.listForLaborContract(page); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java index 60a3a52..8dfa337 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java @@ -122,23 +122,7 @@ public class TrafficSecurityManagementStaffingController extends BaseController String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 - if (Tools.notEmpty(SYSTEMNAME)) - pd.put("SYSTEMNAME", SYSTEMNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - - String OPERATIONTYPE = pd.getString("OPERATIONTYPE"); // 关键词检索条件 - if (Tools.notEmpty(OPERATIONTYPE)) - pd.put("OPERATIONTYPE", OPERATIONTYPE.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = securityManagementStaffingService.listForSecurityStaffing(page); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 863fc53..6767590 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -827,11 +827,11 @@ public class UsersController extends BaseController { String errInfo = "success"; pd = this.getPageData(); FHLOG.save(Jurisdiction.getUsername(), "删除用户ID：" + pd.getString("USER_ID")); //记录日志 - if (!PLSUtil.removeUser(pd)) { - map.put("result", "errInfo"); //返回结果 - map.put("msg", "删除失败，请联系管理员"); //返回结果 - return map; - } +// if (!PLSUtil.removeUser(pd)) { +// map.put("result", "errInfo"); //返回结果 +// map.put("msg", "删除失败，请联系管理员"); //返回结果 +// return map; +// } usersService.deleteUser(pd); //删除用户 ueditorService.delete(pd); //删除副文本关联数据 @@ -1662,7 +1662,7 @@ public class UsersController extends BaseController { } } // 进行定位卡号同步校验 - for (PageData pageData : editUserList) { + /*for (PageData pageData : editUserList) { String msg = usersService.changeOrUpdUserCardNo(pageData); if (!msg.equals(Const.CAN_CHENG_USER)) { errorStr.append("第" + number + "行,"); @@ -1677,15 +1677,15 @@ public class UsersController extends BaseController { errorStr.append("第" + number + "行,"); errorStr.append("人员定位系统用户添加失败，请联系管理员。" + "\n"); } - } + }*/ if (Tools.isEmpty(errorStr.toString())) { for (PageData pageData : addUserList) { usersService.saveUser(pageData); } for (PageData pageData : editUserList) { - if (PLSUtil.editUser(pageData)) { +// if (PLSUtil.editUser(pageData)) { usersService.editUser(pageData); - } +// } } errorStr.append("成功导入" + addUserList.size() + "条数据!"); errorStr.append("成功修改" + editUserList.size() + "条数据!"); diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml index 17cd4a5..b56d975 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml @@ -126,6 +126,9 @@ f left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID where f.ISDELETE = '0' + + and f.OPERATINGCOMPANY = #{pd.CORPINFO_ID} + and f.SYSTEMNAME LIKE CONCAT('%', #{pd.SYSTEMNAME}, '%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml index dadd06d..8094b8a 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml @@ -123,6 +123,9 @@ f left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID where f.ISDELETE = '0' + + and f.OPERATINGCOMPANY = #{pd.CORPINFO_ID} + and f.SYSTEMNAME LIKE CONCAT('%', #{pd.SYSTEMNAME}, '%') @@ -130,7 +133,14 @@ and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS} - and f.VALIDSTATUS = #{pd.VALIDSTATUS} + + + and f.EXPIRYDATE >= date_format(now(),'%Y-%m-%d') + + + and f.EXPIRYDATE < date_format(now(),'%Y-%m-%d') + + ORDER BY f.OPERATTIME DESC diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLaborContractMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLaborContractMapper.xml index 7c8eed2..029bc74 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLaborContractMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLaborContractMapper.xml @@ -146,6 +146,9 @@ where u.ISDELETE = '0' and u.ISMAIN != '1' and (c.VALIDSTATUS != '2' or c.VALIDSTATUS is null) + + and u.CORPINFO_ID = #{pd.CORPINFO_ID} + and c.CONTRACTNAME like CONCAT('%',#{pd.CONTRACTNAME},'%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml index 9246d2b..60257c9 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml @@ -125,8 +125,11 @@ f left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID where f.ISDELETE = '0' + + and f.OPERATINGCOMPANY = #{pd.CORPINFO_ID} + - and f.SYSTEMNAME = #{pd.SYSTEMNAME} + and f.SYSTEMNAME LIKE CONCAT(CONCAT('%', #{pd.SYSTEMNAME}),'%') and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}