From 3bc08cd718d0f629c12a0ed4c4b9f521b07de8fc Mon Sep 17 00:00:00 2001 From: wangpeng Date: Fri, 29 Mar 2024 13:51:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=A1=AE=E8=AE=A4=E8=BF=87=E7=A8=8B=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=8B=92=E7=BB=9D=E6=97=B6=E7=9A=84=E5=90=8E=E7=BB=AD?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/service/system/impl/UserCorpServiceImpl.java | 1 + .../java/com/zcloud/service/system/impl/UsersServiceImpl.java | 1 + src/main/resources/mybatis/datasource/system/UserCorpMapper.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/java/com/zcloud/service/system/impl/UserCorpServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UserCorpServiceImpl.java index a6e2fcc..1305bfc 100644 --- a/src/main/java/com/zcloud/service/system/impl/UserCorpServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UserCorpServiceImpl.java @@ -199,6 +199,7 @@ public class UserCorpServiceImpl implements UserCorpService { uc.put("USER_CORP_ID", pd.getString("USER_CORP_ID")); uc.put("USER_ID", pd.getString("USER_ID")); uc.put("APPLY_STATUS", pd.getString("REVIEW_RESULT")); + uc.put("ISDELETE", "2"); if ("1".equals(pd.getString("REVIEW_RESULT"))) { pd.put("DUTIES", ""); pd.put("TITLE", ""); diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index a80b4f0..365c114 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -933,6 +933,7 @@ public class UsersServiceImpl implements UsersService { uc.put("USER_CORP_ID", pd.getString("USER_CORP_ID")); uc.put("USER_ID", pd.getString("USER_ID")); uc.put("APPLY_STATUS", pd.getString("REVIEW_RESULT")); + uc.put("ISDELETE", "2"); if ("1".equals(pd.getString("REVIEW_RESULT"))) { pd.put("DUTIES", ""); pd.put("TITLE", ""); diff --git a/src/main/resources/mybatis/datasource/system/UserCorpMapper.xml b/src/main/resources/mybatis/datasource/system/UserCorpMapper.xml index 6eaf54c..b3af41c 100644 --- a/src/main/resources/mybatis/datasource/system/UserCorpMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UserCorpMapper.xml @@ -250,6 +250,7 @@ set APPLY_STATUS = #{APPLY_STATUS}, + ISDELETE = #{ISDELETE}, OPERATOR = #{OPERATOR}, OPERATORNAME = #{OPERATORNAME}, OPERATTIME = #{OPERATTIME}, From ac04cc695cf427b5b7992728a361618a3939400a Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Fri, 29 Mar 2024 14:16:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BE=8B=E4=BC=9A?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E6=9F=A5=E7=9C=8B=E8=87=AA=E5=B7=B1=E5=8F=AF=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E7=9A=84=E4=BC=9A=E8=AE=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comprehensive/AppTrafficSafetyMeetingController.java | 4 ---- .../TrafficSecurityManagementAgreementController.java | 5 +++-- .../datasource/comprehensive/TrafficSafetyMeetingMapper.xml | 4 ++++ .../TrafficSecurityManagementAgreementMapper.xml | 4 +++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java index 08be2ab..787e9c4 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java @@ -43,10 +43,6 @@ public class AppTrafficSafetyMeetingController extends BaseController { if (Tools.notEmpty(MEETING_TITLE)) pd.put("MEETING_TITLE", MEETING_TITLE.trim()); -// String MEETING_TYPE = pd.getString("MEETING_TYPE"); // 关键词检索条件 -// if (Tools.notEmpty(MEETING_TYPE)) -// pd.put("MEETING_TYPE", MEETING_TYPE.trim()); - page.setPd(pd); List varList = trafficSafetyMeetingService.listForSafetyMeeting(page); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java index 8791b34..be8204a 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java @@ -59,7 +59,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController map.put("msg", "文件格式不正确！"); return map; } - String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName =file.getOriginalFilename(); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); @@ -97,7 +97,8 @@ public class TrafficSecurityManagementAgreementController extends BaseController map.put("msg", "文件格式不正确！"); return map; } - String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + //String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName =file.getOriginalFilename(); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml index 4b6aaf0..7d6abbe 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml @@ -142,13 +142,17 @@ from f left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join bus_traffic_safety_meeting_recipient e on f.SAFETY_MEETING_ID = e.SAFETY_MEETING_ID where f.ISDELETE = '0' + AND + e.PRACTITIONER = #{pd.USER_ID} and f.MEETING_TITLE like CONCAT('%',#{pd.MEETING_TITLE},'%') and f.MEETING_TYPE = #{pd.MEETING_TYPE} + ORDER BY f.CREATETIME DESC select - + , + i.CORP_NAME from f + left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID where f.MANAGEMENTAGREEMENT_ID = #{MANAGEMENTAGREEMENT_ID} From 6ff71d1f1f2c46fec23cbc592b40478c73e08dcf Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Fri, 29 Mar 2024 14:34:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BE=8B=E4=BC=9A?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E6=9F=A5=E7=9C=8B=E8=87=AA=E5=B7=B1=E5=8F=AF=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E7=9A=84=E4=BC=9A=E8=AE=AE=E4=BC=98=E5=8C=96v2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppTrafficSafetyMeetingController.java | 2 +- .../TrafficSafetyMeetingMapper.java | 7 ++++++- .../TrafficSafetyMeetingService.java | 1 + .../impl/TrafficSafetyMeetingServiceImpl.java | 10 ++++++++++ .../TrafficSafetyMeetingMapper.xml | 18 ++++++++++++++++++ 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java index 787e9c4..971238d 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java @@ -44,7 +44,7 @@ public class AppTrafficSafetyMeetingController extends BaseController { pd.put("MEETING_TITLE", MEETING_TITLE.trim()); page.setPd(pd); - List varList = trafficSafetyMeetingService.listForSafetyMeeting(page); + List varList = trafficSafetyMeetingService.listForSafetyMeetingUser(page); map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java index a141d82..999e0b1 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java @@ -13,7 +13,12 @@ public interface TrafficSafetyMeetingMapper { * @param page * @return */ - List datalistPage(Page page); + List datalistPage(Page page); /** + * 列表 + * @param page + * @return + */ + List datalistPageUser(Page page); /**删除 * @param pd diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingService.java index 63ab1d4..f094008 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingService.java @@ -7,6 +7,7 @@ import java.util.List; public interface TrafficSafetyMeetingService { List listForSafetyMeeting(Page page); + List listForSafetyMeetingUser(Page page); void delete(PageData pd) throws Exception; diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java index 64e7efc..1da1bb4 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java @@ -26,6 +26,16 @@ public class TrafficSafetyMeetingServiceImpl implements TrafficSafetyMeetingServ return trafficSafetyMeetingMapper.datalistPage(page); } + /** + * 列表 + * @param page + * @return + */ + @Override + public List listForSafetyMeetingUser(Page page) { + return trafficSafetyMeetingMapper.datalistPageUser(page); + } + /**删除 * @param pd * @throws Exception diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml index 7d6abbe..891b931 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml @@ -136,6 +136,24 @@ + + +