bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:902c5d2a7567febddb31354bfc5a763911139f82
Branches Tags
bonus:master
bonus:test0606
bonus:testjob
bonus:removedishbase
bonus:order
bonus:test0530
bonus:rs0527
bonus:liuxin0527
bonus:liuxin0528
..
compare: bonus:0399970e769f1301430a161f66b01eb0e2685e9e
Branches Tags
bonus:master
bonus:test0606
bonus:testjob
bonus:removedishbase
bonus:order
bonus:test0530
bonus:rs0527
bonus:liuxin0527
bonus:liuxin0528

No commits in common. "902c5d2a7567febddb31354bfc5a763911139f82" and "0399970e769f1301430a161f66b01eb0e2685e9e" have entirely different histories.
902c5d2a75 ... 0399970e76

3 changed files with 2 additions and 32 deletions
Show Stats Expand all files Collapse all files

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

@ -6,7 +6,6 @@ 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接口
@ -44,9 +43,6 @@ 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);
/**
* 修改人员体检报告
*

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

@ -70,28 +70,20 @@ 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());
vos.add(vo);
healthPersonMedicalReportMapper.insertPersonReportProject(vo);
if(details!=null&&details.size()>0){
for(HealthMedicalReportDetail vo1:details){
vo1.setMedicalId(healthPersonMedicalReport.getMedicalId());
vo1.setMedicalProjectDetailId(vo1.getMedicalProjectId());
vo1.setMedicalProjectId(vo.getMedicalProjectId());
vo1s.add(vo1);
healthPersonMedicalReportMapper.insertPersonReportDetail(vo1);
}
}
}
if(vos!=null&&vos.size()>0){
healthPersonMedicalReportMapper.insertPersonReportProjects(vos);
}
if(vo1s!=null&&vo1s.size()>0){
healthPersonMedicalReportMapper.insertPersonReportDetails(vo1s);
}
}
return 1;
} catch (Exception e) {

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

@ -117,24 +117,6 @@ 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=",">