安全例会模块优化->查看人员列表页，详情页

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<String, Object> map = new HashMap<String, Object>();
         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);
 

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<String, Object> map = new HashMap<String, Object>();
+        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;
+    }
 }

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<String,Object> map = new HashMap<String,Object>();
+        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;
+    }
 }

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);
 }

src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java

@@ -13,4 +13,6 @@ public interface TrafficSecurityManagementStaffingMapper {
     List<PageData> datalistPage(Page page);
 
     void edit(PageData pd);
+
+    PageData findById(PageData pd);
 }

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);
 }

src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java

@@ -12,4 +12,5 @@ public interface TrafficSecurityManagementStaffingService {
 
     void edit(PageData pd);
 
+    PageData findById(PageData pd);
 }

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);
+    }
 }

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);
+    }
 }

src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.xml

@@ -101,26 +101,38 @@
     <!-- 修改 -->
     <update id="edit" parameterType="pd">
         update
-        <include refid="tableName"></include>
+        <include refid="tableName"/> f
         set
-        OPERATOR = #{OPERATOR},
+        f.OPERATOR = #{OPERATOR},
-        OPERATORNAME = #{OPERATORNAME},
+        f.OPERATORNAME = #{OPERATORNAME},
-        OPERATTIME = #{OPERATTIME},
+        f.OPERATTIME = #{OPERATTIME},
-        SIGNATUREPICTURE = #{SIGNATUREPICTURE},
+        f.SIGNATUREPICTURE = #{SIGNATUREPICTURE},
-        LIVEPHOTOS = #{LIVEPHOTOS},
+        f.LIVEPHOTOS = #{LIVEPHOTOS},
-        ATTENDANCE_STATUS = #{ATTENDANCE_STATUS}
+        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>
+    <!--移除-->
+    <update id="remove">
+        update
+        <include refid="tableName"/> f
+        set
+        f.ATTENDANCE_STATUS = #{ATTENDANCE_STATUS}
+        where
+        f.SAFETY_MEETING_ID = #{SAFETY_MEETING_ID}
+        and f.PRACTITIONER = #{PRACTITIONER}
     </update>
 
     <!--列表-->
     <select id="datalistPage" parameterType="page" resultType="pd">
         select
         <include refid="Field"></include>,
-        u.NAME as userName <!-- 添加用户名称字段，别名为userName -->
+        u.NAME,
+        u.USERNAME
         from
         <include refid="tableName"></include> f
-        join sys_user u on f.PRACTITIONER = u.USER_ID <!-- 关联 sys_user 表 -->
+        join sys_user u on f.PRACTITIONER = u.USER_ID
         where f.ISDELETE = '0'
         <if test="pd.PRACTITIONER != null and pd.PRACTITIONER != ''"><!-- 关键词检索-从业人员 -->
             and f.PRACTITIONER = #{pd.PRACTITIONER}
@@ -138,12 +150,17 @@
 
     <select id="listForSafetyMeetingRecipient" parameterType="page" resultType="pd">
         select
-        <include refid="Field"></include>
+        f.*,
+        u.NAME as NAME,
+        u.PHONE as USERNAME,
+        u.USERAVATARURL
         from
         <include refid="tableName"></include> f
+        left join sys_user u on f.PRACTITIONER = u.USER_ID
         where f.ISDELETE = '0'
         <if test="SAFETY_MEETING_ID != null and SAFETY_MEETING_ID != ''">
             and f.SAFETY_MEETING_ID = #{SAFETY_MEETING_ID}
         </if>
     </select>
+
 </mapper>

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml

@@ -123,4 +123,13 @@
         </if>
     </select>
 
+    <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include> f
+        where
+        f.STAFFING_ID = #{STAFFING_ID}
+    </select>
+
 </mapper>