Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/mapper/HealthPersonMedicalReportMapper.java

@@ -6,6 +6,7 @@ import com.bonus.canteen.core.health.domain.HealthMedicalReportDetail;
 import com.bonus.canteen.core.health.domain.HealthMedicalReportDetails;
 import com.bonus.canteen.core.health.domain.HealthPersonMedicalReport;
 import com.bonus.canteen.core.health.domain.HealthPersonMedicalReportDetails;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 人员体检报告Mapper接口
@@ -43,6 +44,9 @@ public interface HealthPersonMedicalReportMapper {
     int delHealthPersonMedicalReportList(HealthPersonMedicalReport healthPersonMedicalReport);
     int insertPersonReportProject(HealthMedicalReportDetails vo);
     int insertPersonReportDetail(HealthMedicalReportDetail vo);
+
+    int insertPersonReportProjects(@Param("entities") List<HealthMedicalReportDetails> vo);
+    int insertPersonReportDetails(@Param("entities") List<HealthMedicalReportDetail> vo);
     /**
      * 修改人员体检报告
      *

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonMedicalReportServiceImpl.java

@@ -70,20 +70,28 @@ public class HealthPersonMedicalReportServiceImpl implements IHealthPersonMedica
             healthPersonMedicalReportMapper.insertPersonReport(healthPersonMedicalReport);
             healthPersonMedicalReportMapper.updatePersonReport(healthPersonMedicalReport);
             List<HealthMedicalReportDetails> reportDatas=healthPersonMedicalReport.getReportDatas();
+            List<HealthMedicalReportDetails> vos=new ArrayList<>();
+            List<HealthMedicalReportDetail> vo1s=new ArrayList<>();
             if(reportDatas!=null&&reportDatas.size()>0){
                 for(HealthMedicalReportDetails vo:reportDatas){
                     List<HealthMedicalReportDetail> details=vo.getHealthMedicalReportDetails();
                     vo.setMedicalId(healthPersonMedicalReport.getMedicalId());
-                    healthPersonMedicalReportMapper.insertPersonReportProject(vo);
+                    vos.add(vo);
                     if(details!=null&&details.size()>0){
                         for(HealthMedicalReportDetail vo1:details){
                             vo1.setMedicalId(healthPersonMedicalReport.getMedicalId());
                             vo1.setMedicalProjectDetailId(vo1.getMedicalProjectId());
                             vo1.setMedicalProjectId(vo.getMedicalProjectId());
-                            healthPersonMedicalReportMapper.insertPersonReportDetail(vo1);
+                            vo1s.add(vo1);
                         }
                     }
                 }
+                if(vos!=null&&vos.size()>0){
+                    healthPersonMedicalReportMapper.insertPersonReportProjects(vos);
+                }
+                if(vo1s!=null&&vo1s.size()>0){
+                    healthPersonMedicalReportMapper.insertPersonReportDetails(vo1s);
+                }
             }
             return 1;
         } catch (Exception e) {

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonMedicalReportMapper.xml

@@ -117,6 +117,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
+    <insert id="insertPersonReportProjects" parameterType="com.bonus.canteen.core.health.domain.HealthMedicalReportDetails" useGeneratedKeys="true" keyProperty="id">
+        insert into health_person_medical_report_project(
+                medical_id,medical_project_id,medical_project_name
+        )values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.medicalId}, #{entity.medicalProjectId},#{entity.medicalProjectName})
+        </foreach>
+    </insert>
+    <insert id="insertPersonReportDetails" parameterType="com.bonus.canteen.core.health.domain.HealthMedicalReportDetail" useGeneratedKeys="true" keyProperty="id">
+        insert into health_person_medical_report_detail(
+        medical_id,medical_project_id,medical_project_detail_id,medical_project_detail_name,result
+        )values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.medicalId}, #{entity.medicalProjectId},#{entity.medicalProjectDetailId}
+            ,#{entity.medicalProjectDetailName},#{entity.result})
+        </foreach>
+    </insert>
+
     <update id="updatePersonReport" parameterType="com.bonus.canteen.core.health.domain.HealthPersonMedicalReportDetails">
         update health_person_medical_report
         <trim prefix="SET" suffixOverrides=",">