4/4

RMS/src/main/java/cn/cslg/report/common/model/dto/ReportDTO.java

@@ -187,4 +187,9 @@ public class ReportDTO  {
      */
     private List<EventAddNewDTO> eventAddNewDTOs;
 
+    /**
+     * 后续事项
+     */
+    private List<FollowUpDTO> followUps;
+
 }

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -2,6 +2,7 @@ package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.model.dto.EventAddNewDTO;
+import cn.cslg.report.common.model.dto.FollowUpDTO;
 import cn.cslg.report.common.model.dto.ReportDTO;
 import cn.cslg.report.common.model.vo.ClientVO;
 import cn.cslg.report.common.model.vo.PersonnelVO;
@@ -16,10 +17,7 @@ import cn.cslg.report.entity.*;
 import cn.cslg.report.entity.asso.AssoReportFile;
 import cn.cslg.report.entity.asso.AssoReportPerson;
 import cn.cslg.report.mapper.ReportMapper;
-import cn.cslg.report.service.IAssoEventReportService;
-import cn.cslg.report.service.IAvoidDesignDirectionService;
-import cn.cslg.report.service.IProductService;
-import cn.cslg.report.service.OutInterfaceService;
+import cn.cslg.report.service.*;
 import cn.cslg.report.service.business.asso.AssoReportPersonService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -73,6 +71,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
     private final SystemDictItemService systemDictItemService;
     private final AssoReportPersonService assoReportPersonService;
     private final IAssoEventReportService assoEventReportService;
+    private final IFollowUpService followUpService;
 
     private Report loadReport(ReportDTO reportDto) {
         Report report = new Report();
@@ -169,6 +168,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             reportFieldService.addDefaultField(report.getId(), report.getType());
         }
 
+        Integer reportId = report.getId();
 
         //新增事件(若有事件)
         List<EventAddNewDTO> eventAddNewDTOs = reportDto.getEventAddNewDTOs();
@@ -188,10 +188,19 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                 eventIds.add(oldEventAddNewDTO.getId());
             }
             //新增事件和报告关联
-            assoEventReportService.addNew(eventIds, report.getId());
+            assoEventReportService.addNew(eventIds, reportId);
 
         }
 
+        //新增后续事项
+        List<FollowUpDTO> followUps = reportDto.getFollowUps();
+        if (followUps != null && followUps.size() > 0) {
+            for (FollowUpDTO followUp : followUps) {
+                followUp.setReportId(reportId);
+            }
+            followUpService.add(followUps);
+        }
+
         return report.getId();
 
     }

RMS/src/main/resources/mapper/FollowUpMapper.xml

@@ -5,18 +5,17 @@
     <!--插入数据-->
     <!--int add(FollowUp followUp);-->
     <insert id="add" useGeneratedKeys="true" keyProperty="id">
-        insert into follow_up(report_id, parent_id, follow_up_name, remark, time_limit,
-                              agent, assist_person, finish_time, status, conclusion, create_person_id,
-                              create_person_name)
-        values
-               (#{reportId}, #{parentId}, #{followUpName}, #{remark},
+        insert into rms_test.follow_up(report_id, parent_id, follow_up_name, remark, time_limit,
+                                       agent, assist_person, finish_time, status, conclusion, create_person_id,
+                                       create_person_name)
+        values (#{reportId}, #{parentId}, #{followUpName}, #{remark},
                 #{timeLimit}, #{agent}, #{assistPerson}, #{finishTime}, #{status},
                 #{conclusion}, #{createPersonId}, #{createPersonName})
     </insert>
     <!--根据id修改数据-->
     <!--int update(FollowUp followUp);-->
     <update id="update">
-        update follow_up
+        update rms_test.follow_up
         <set>
             <if test="followUpName != null">
                 follow_up_name = #{followUpName},
@@ -78,31 +77,68 @@
         <result column="file_name" property="fileName"/>
     </resultMap>
 
-<!--    <select id="query" resultMap="queryMap">-->
-<!--        select id,-->
-<!--               report_id,-->
-<!--               parent_id,-->
-<!--               follow_up_name,-->
-<!--               remark,-->
-<!--               time_limit,-->
-<!--               agent,-->
-<!--               assist_person,-->
-<!--               finish_time,-->
-<!--               status,-->
-<!--               conclusion,-->
-<!--               create_person_id,-->
-<!--               create_person_name,-->
-<!--               create_time-->
-<!--        from follow_up-->
-<!--        where report_id = #{reportId}-->
-<!--    </select>-->
+    <!--    <select id="query" resultMap="queryMap">-->
+    <!--        select id,-->
+    <!--               report_id,-->
+    <!--               parent_id,-->
+    <!--               follow_up_name,-->
+    <!--               remark,-->
+    <!--               time_limit,-->
+    <!--               agent,-->
+    <!--               assist_person,-->
+    <!--               finish_time,-->
+    <!--               status,-->
+    <!--               conclusion,-->
+    <!--               create_person_id,-->
+    <!--               create_person_name,-->
+    <!--               create_time-->
+    <!--        from follow_up-->
+    <!--        where report_id = #{reportId}-->
+    <!--    </select>-->
 
     <select id="query" resultMap="queryMap">
-        select a.id, a.report_id, a.parent_id, a.follow_up_name,a.remark,a.time_limit,a.agent,a.assist_person,a.finish_time,a.status, a.conclusion,
-               a.create_person_id, a.create_person_name, a.create_time, d.FILE_ID, d.NAME, d.ADDRESS, d.ZID,d.FILEREMARK, d.UPDATE_TIME, d.UID,d.TYPE, d.SIZE, d.SUFFIX, d.FILE_NAME
-        from follow_up a left JOIN (SELECT b.follow_up_id, b.FILE_ID, c.ID, c.NAME, c.ADDRESS, c.ZID, c.REMARK AS FILEREMARK, c.UPDATE_TIME, c.UID, c.TYPE, c.SIZE, c.SUFFIX, c.FILE_NAME
-                                    FROM asso_follow_up_file b LEFT JOIN report_file c ON b.FILE_ID = c.ID) d
-                                   ON a.ID = d.FOLLOW_UP_ID
+        select a.id,
+               a.report_id,
+               a.parent_id,
+               a.follow_up_name,
+               a.remark,
+               a.time_limit,
+               a.agent,
+               a.assist_person,
+               a.finish_time,
+               a.status,
+               a.conclusion,
+               a.create_person_id,
+               a.create_person_name,
+               a.create_time,
+               d.FILE_ID,
+               d.NAME,
+               d.ADDRESS,
+               d.ZID,
+               d.FILEREMARK,
+               d.UPDATE_TIME,
+               d.UID,
+               d.TYPE,
+               d.SIZE,
+               d.SUFFIX,
+               d.FILE_NAME
+        from rms_test.follow_up a
+                 left JOIN (SELECT b.follow_up_id,
+                                   b.FILE_ID,
+                                   c.ID,
+                                   c.NAME,
+                                   c.ADDRESS,
+                                   c.ZID,
+                                   c.REMARK AS FILEREMARK,
+                                   c.UPDATE_TIME,
+                                   c.UID,
+                                   c.TYPE,
+                                   c.SIZE,
+                                   c.SUFFIX,
+                                   c.FILE_NAME
+                            FROM rms_test.asso_follow_up_file b
+                                     LEFT JOIN rms_test.report_file c ON b.FILE_ID = c.ID) d
+                           ON a.ID = d.FOLLOW_UP_ID
         WHERE a.report_id = #{reportId}
     </select>
 
@@ -110,7 +146,7 @@
     <!--int countByReportId();-->
     <select id="countByReportId" resultType="int">
         select count(*)
-        from follow_up
+        from rms_test.follow_up
         where report_id = #{reportId}
     </select>
 
@@ -118,7 +154,7 @@
     <!--int delete(List<Integer> ids);-->
     <delete id="delete" parameterType="java.util.List">
         delete
-        from follow_up
+        from rms_test.follow_up
         where id in
         <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
             #{id}
@@ -129,28 +165,29 @@
     <!--int deleteAssoId(Integer followUpId, Integer fileId);-->
     <delete id="deleteAssoId">
         delete
-        from asso_follow_up_file
+        from rms_test.asso_follow_up_file
         where follow_up_id = #{followUpId}
         and FILE_ID in
-            <foreach collection="fileIds" item="fileId" index="index" open="(" close=")" separator=",">
-                #{fileId}
-            </foreach>
+        <foreach collection="fileIds" item="fileId" index="index" open="(" close=")" separator=",">
+            #{fileId}
+        </foreach>
     </delete>
 
 
     <!--根据报告id统计后续事项数量-->
     <!--List<Integer> queryFileIdByFollowUpId(Integer followUpId);-->
     <select id="queryFileIdByFollowUpId" resultType="Integer">
-        SELECT FILE_ID FROM asso_follow_up_file WHERE FOLLOW_UP_ID = #{followUpId};
+        SELECT FILE_ID
+        FROM rms_test.asso_follow_up_file
+        WHERE FOLLOW_UP_ID = #{followUpId};
     </select>
 
 
     <!--插入数据-->
     <!--int addAssoIds(List<AssoFollowUpFile> assoFollowUpFiles);-->
     <insert id="addAssoIds" useGeneratedKeys="true" keyProperty="id">
-        insert into asso_follow_up_file(follow_up_id, file_id, file_type)
-        values
-            (#{followUpId}, #{fileId}, #{fileType})
+        insert into rms_test.asso_follow_up_file(follow_up_id, file_id, file_type)
+        values (#{followUpId}, #{fileId}, #{fileType})
     </insert>
 
 </mapper>