From 846aa55546220d05bd2d1e8d181d8a778be79b64 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Sun, 28 Apr 2024 21:02:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../worker/entity/WorkerInfoAuditRecord.java | 8 +++- .../mapper/WorkerInfoAuditRecordMapper.java | 2 + .../worker/mapper/WorkerInfoMapper.java | 1 + .../WorkerInfoAuditRecordServiceImpl.java | 43 ++++++++++++++++--- 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfoAuditRecord.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfoAuditRecord.java index f17f9c752..36dcf5d36 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfoAuditRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfoAuditRecord.java @@ -228,5 +228,11 @@ public class WorkerInfoAuditRecord implements Serializable { private Date educationTime; @ApiModelProperty(value="资格证书信息") - private String specialCertificateImage; + private String specialCertificateInfo; + + @ApiModelProperty(value="合同信息") + private String contractInfo; + + @ApiModelProperty(value="保险信息") + private String insuranceInfo; } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java index c793667d5..bb4dc81f0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java @@ -24,5 +24,7 @@ public interface WorkerInfoAuditRecordMapper extends BaseMapper selectWorkerInfoAuditList(Page page, @Param("param")Map map); + + @DataScope(includeTable = "worker_info_audit_record") EntityMap viewWorkerInfoDetail(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java index 293058187..34f7ba883 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java @@ -93,6 +93,7 @@ public interface WorkerInfoMapper extends BaseMapper { List> selectAttendanceWorkerTeamTotal(Map map); + @DataScope(includeTable = "worker_info") EntityMap viewWorkerInfoDetail(Map map); List selectWorkExperienceList(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java index 708f67afe..e00fac7b8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java @@ -1,17 +1,18 @@ package com.zhgd.xmgl.modules.worker.service.impl; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; -import com.zhgd.xmgl.modules.worker.entity.WorkerInfoAuditRecord; +import com.zhgd.xmgl.modules.worker.entity.*; +import com.zhgd.xmgl.modules.worker.mapper.WorkerCertificateMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoAuditRecordMapper; -import com.zhgd.xmgl.modules.worker.service.IWorkerInfoAuditRecordService; -import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; +import com.zhgd.xmgl.modules.worker.service.*; import com.zhgd.xmgl.util.MessageUtil; import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -38,6 +39,16 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl selectWorkerInfoAuditList(Map map) { int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); @@ -99,8 +110,30 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl workerContracts = JSONArray.parseArray(workerInfoAuditRecord.getContractInfo(), WorkerContract.class); + for (WorkerContract workerContract : workerContracts) { + workerContract.setWorkerId(workerInfo1.getId()); + } + workerContractService.saveBatch(workerContracts); + } + if (StringUtils.isNotBlank(workerInfoAuditRecord.getSpecialCertificateInfo())) { + List workerCertificates = JSONArray.parseArray(workerInfoAuditRecord.getSpecialCertificateInfo(), WorkerCertificate.class); + for (WorkerCertificate workerCertificate : workerCertificates) { + workerCertificate.setWorkerId(workerInfo1.getId()); + } + workerCertificateService.saveBatch(workerCertificates); + } + if (StringUtils.isNotBlank(workerInfoAuditRecord.getInsuranceInfo())) { + List workerInsurances = JSONArray.parseArray(workerInfoAuditRecord.getInsuranceInfo(), WorkerInsurance.class); + for (WorkerInsurance workerInsurance : workerInsurances) { + workerInsurance.setWorkerId(workerInfo1.getId()); + } + workerInsuranceService.saveBatch(workerInsurances); + } //删除审核表记录 workerInfoAuditRecordMapper.deleteById(MapUtils.getString(map,"id")); } From 3806d2b5a2cee1f4338b0d7a193b86ccc41ef240 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Sun, 28 Apr 2024 21:05:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java index 7c4ff7722..042f51a6f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java @@ -341,8 +341,6 @@ public class WorkerInfo implements Serializable { private Double safeScore; @ApiModelProperty(value = "下发状态：1成功2失败3部分成功") private Integer sendSuccessStatus; - @ApiModelProperty(value="资格证书信息") - private String specialCertificateImage; @TableField(exist = false) @ApiModelProperty(value = "人脸分数") private java.lang.Integer faceScore;