From 6298ab6596d00e3c46659eb31233084ba06818bb Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Wed, 6 Mar 2024 16:10:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BE=8B=E4=BC=9A=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BC=98=E5=8C=96->=E6=9F=A5=E7=9C=8B=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E9=A1=B5=EF=BC=8C=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppTrafficSafetyMeetingController.java | 21 +--------- .../TrafficSafetyMeetingController.java | 17 ++++++++ ...cSecurityManagementStaffingController.java | 20 ++++++++++ .../TrafficSafetyMeetingRecipientMapper.java | 2 + ...afficSecurityManagementStaffingMapper.java | 2 + .../TrafficSafetyMeetingRecipienService.java | 2 + ...fficSecurityManagementStaffingService.java | 1 + ...afficSafetyMeetingRecipienServiceImpl.java | 5 +++ ...SecurityManagementStaffingServiceImpl.java | 5 +++ .../TrafficSafetyMeetingRecipientMapper.xml | 39 +++++++++++++------ ...rafficSecurityManagementStaffingMapper.xml | 9 +++++ 11 files changed, 92 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java index cc23727..7b89178 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java @@ -27,8 +27,6 @@ public class AppTrafficSafetyMeetingController extends BaseController { private TrafficSafetyMeetingService trafficSafetyMeetingService; @Autowired private TrafficSafetyMeetingRecipienService meetingRecipienService; - @Autowired - private Smb smb; //列表 @RequestMapping(value = "/listForSafetyMeeting") @ResponseBody @@ -104,7 +102,7 @@ public class AppTrafficSafetyMeetingController extends BaseController { //修改 @RequestMapping(value = "/edit") @ResponseBody - public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + public Object edit() throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); @@ -113,23 +111,6 @@ public class AppTrafficSafetyMeetingController extends BaseController { pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 - String ffile = DateUtil.getDays(); - - if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){ - pd.put("COMPLETIONSTATUS", "1"); - String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); - if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } - String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); - pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); - pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); - pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); - } meetingRecipienService.edit(pd); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java index 34a3a97..0fbb46a 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java @@ -228,5 +228,22 @@ public class TrafficSafetyMeetingController extends BaseController { map.put("result", errInfo); return map; } + //修改 + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + + trafficSafetyMeasureetingRecipienService.remove(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java index 5bd237f..3ba203c 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java @@ -109,6 +109,12 @@ public class TrafficSecurityManagementStaffingController extends BaseController return map; } + /** + * 列表 + * @param page + * @return + * @throws Exception + */ @RequestMapping(value = "/listForSecurityStaffing") @ResponseBody public Object listForSecurityWaybillRegistra(Page page) throws Exception { @@ -140,4 +146,18 @@ public class TrafficSecurityManagementStaffingController extends BaseController map.put("result", errInfo); return map; } + + //详情 + @RequestMapping(value="/goEdit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = securityManagementStaffingService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.java index 902bc2e..8216e2e 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.java @@ -25,4 +25,6 @@ public interface TrafficSafetyMeetingRecipientMapper { void edit(PageData pd); void save(PageData pd); + + void remove(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java index 507fac6..ebe514e 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java @@ -13,4 +13,6 @@ public interface TrafficSecurityManagementStaffingMapper { List datalistPage(Page page); void edit(PageData pd); + + PageData findById(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingRecipienService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingRecipienService.java index 5df1b84..c6a5bb1 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingRecipienService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingRecipienService.java @@ -11,4 +11,6 @@ public interface TrafficSafetyMeetingRecipienService { void edit(PageData pd); void save(PageData pd); + + void remove(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java index 86373a3..7bfd1c5 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java @@ -12,4 +12,5 @@ public interface TrafficSecurityManagementStaffingService { void edit(PageData pd); + PageData findById(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingRecipienServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingRecipienServiceImpl.java index 28c42df..130148f 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingRecipienServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingRecipienServiceImpl.java @@ -28,4 +28,9 @@ public class TrafficSafetyMeetingRecipienServiceImpl implements TrafficSafetyMee public void save(PageData pd) { trafficSafetyMeetingRecordMapper.save(pd); } + + @Override + public void remove(PageData pd) { + trafficSafetyMeetingRecordMapper.remove(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java index a3e0ccf..d81c2fe 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java @@ -28,4 +28,9 @@ public class TrafficSecurityManagementStaffingServiceImpl implements TrafficSecu public void edit(PageData pd) { securityManagementStaffingMapper.edit(pd); } + + @Override + public PageData findById(PageData pd) { + return securityManagementStaffingMapper.findById(pd); + } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.xml index d31bbce..5136f2c 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.xml @@ -101,26 +101,38 @@ update - + f set - OPERATOR = #{OPERATOR}, - OPERATORNAME = #{OPERATORNAME}, - OPERATTIME = #{OPERATTIME}, - SIGNATUREPICTURE = #{SIGNATUREPICTURE}, - LIVEPHOTOS = #{LIVEPHOTOS}, - ATTENDANCE_STATUS = #{ATTENDANCE_STATUS} + f.OPERATOR = #{OPERATOR}, + f.OPERATORNAME = #{OPERATORNAME}, + f.OPERATTIME = #{OPERATTIME}, + f.SIGNATUREPICTURE = #{SIGNATUREPICTURE}, + f.LIVEPHOTOS = #{LIVEPHOTOS}, + f.ATTENDANCE_STATUS = #{ATTENDANCE_STATUS} where - SAFETY_MEETING_RECIPIENT_ID = #{SAFETY_MEETING_RECIPIENT_ID} + f.SAFETY_MEETING_ID = #{SAFETY_MEETING_ID} + and f.PRACTITIONER = #{OPERATOR} + + + + update + f + set + f.ATTENDANCE_STATUS = #{ATTENDANCE_STATUS} + where + f.SAFETY_MEETING_ID = #{SAFETY_MEETING_ID} + and f.PRACTITIONER = #{PRACTITIONER} select - + f.*, + u.NAME as NAME, + u.PHONE as USERNAME, + u.USERAVATARURL from f + left join sys_user u on f.PRACTITIONER = u.USER_ID where f.ISDELETE = '0' and f.SAFETY_MEETING_ID = #{SAFETY_MEETING_ID} + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml index 6f4a535..b979d6e 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml @@ -123,4 +123,13 @@ + +