diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java index e7fc40441..7ecc5f91f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java @@ -317,10 +317,11 @@ public class DownloadController { @ApiOperation(value = "按模版导出人员安全教育信息", notes = "按模版导出人员安全教育信息", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "workerId", value = "劳务人员ID", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "projectSn", value = "劳务人员SN", paramType = "query", required = true, dataType = "String") }) @GetMapping(value = "/exporExcelWorkerEducation") - public void exporExcelWorkerEducation(HttpServletResponse response, String workerId, String workerEduId) { - workerInfoService.exporExcelWorkerEducation(response, workerId, workerEduId); + public void exporExcelWorkerEducation(HttpServletResponse response, String workerId, String projectSn) { + workerInfoService.exporExcelWorkerEducation(response, workerId, projectSn); } @ApiOperation(value = "题库导入模板下载", notes = "题库导入模板下载", httpMethod = "GET") diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java index 2d1b30505..e98becdb7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java @@ -150,7 +150,7 @@ public class CarInfoServiceImpl extends ServiceImpl impl private void validTime(CarInfo c) { if (isReservationType(c) && DateUtil.compare(c.getReserveEndTime(), new Date()) < 0) { - throw new OpenAlertException("预约时间已过期"); + throw new OpenAlertException("预约时间已失效，车辆无法下发，请重新提交"); } } 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 36dcf5d36..060b67f45 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 @@ -235,4 +235,7 @@ public class WorkerInfoAuditRecord implements Serializable { @ApiModelProperty(value="保险信息") private String insuranceInfo; + + @ApiModelProperty(value="下发同步状态(0:待同步;1:下发失败;)") + private Integer asyncState; } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java index 23aaec529..b76008156 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java @@ -25,7 +25,7 @@ public interface IWorkerInfoAuditRecordService extends IService map); + Long adoptWorkerInfo(Map map); void rejectWorkerInfo(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java index 7fc56b4e9..6657a92b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java @@ -97,7 +97,7 @@ public interface IWorkerInfoService extends IService { void exporExcelWorkerTemplate(HttpServletResponse response, String projectSn); - void exporExcelWorkerEducation(HttpServletResponse response, String workerId, String workerEduId); + void exporExcelWorkerEducation(HttpServletResponse response, String workerId, String projectSn); Result uploadExcelWorkerInfo(MultipartFile excelFile, String projectSn); 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 0d097e9e3..77af2961e 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 @@ -106,7 +106,7 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl map) { + public Long adoptWorkerInfo(Map map) { WorkerInfoAuditRecord workerInfoAuditRecord=workerInfoAuditRecordMapper.selectById(MapUtils.getString(map,"id")); if(workerInfoAuditRecord==null){ throw new OpenAlertException(MessageUtil.get("notFindErr")); @@ -125,7 +125,7 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl workerContracts = JSONArray.parseArray(workerInfoAuditRecord.getContractInfo(), WorkerContract.class); @@ -152,6 +152,7 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl requestMap = new HashMap<>(); requestMap.put("workerId", workerId); EntityMap entityMap = workerInfoMapper.viewWorkerInfoDetail(requestMap); + if (entityMap == null) { + throw new CustomException("该人员信息不存在!", HttpStatus.INTERNAL_SERVER_ERROR); + } WorkerType workerType = workerTypeMapper.selectById(entityMap.get("workerTypeId")); + List workerSafeEducations = workerSafeEducationMapper.selectList(Wrappers.lambdaQuery() + .eq(WorkerSafeEducation::getProjectSn, projectSn) + .orderByDesc(WorkerSafeEducation::getAddTime)); + if (workerSafeEducations == null || workerSafeEducations.size() == 0) { + throw new CustomException("该人员未参加过入场安全教育培训!", HttpStatus.INTERNAL_SERVER_ERROR); + } WorkerSafeEducationWorker workerSafeEducationWorker = workerSafeEducationWorkerMapper.selectOne(Wrappers.lambdaQuery() - .eq(WorkerSafeEducationWorker::getId, workerEduId)); - ExcelUtils.exporExcelWorkerEducation(response, entityMap, workerSafeEducationWorker, workerType); + .eq(WorkerSafeEducationWorker::getId, workerSafeEducations.get(0).getId())); + ExcelUtils.exporExcelWorkerEducation(response, entityMap, workerSafeEducationWorker, workerType, basePath); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java index 26739a46e..ccb5b7c76 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.xz.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.sun.corba.se.pept.transport.ContactInfo; @@ -329,7 +330,13 @@ public class XzWorkerInfoAuditRecordController { paramMap.put("ufaceDevId", ufaceDevIds); paramMap.put("accountType", 2); paramMap.put("registerType", 2); - workerInfoAuditRecordService.adoptWorkerInfo(paramMap); + Long workerId = workerInfoAuditRecordService.adoptWorkerInfo(paramMap); + if (workerId != null) { + LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(); + wrapper.set(WorkerInfoAuditRecord::getAsyncState, 1); + wrapper.eq(WorkerInfoAuditRecord::getId, workerId); + workerInfoAuditRecordService.update(wrapper); + } } } return Result.ok(); diff --git a/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java b/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java index a365cd163..066cc9deb 100644 --- a/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java @@ -252,7 +252,7 @@ public class ExcelUtils { } } - public static void exporExcelWorkerEducation(HttpServletResponse response, Map map, WorkerSafeEducationWorker workerSafeEducationWorker, WorkerType workerType) { + public static void exporExcelWorkerEducation(HttpServletResponse response, Map map, WorkerSafeEducationWorker workerSafeEducationWorker, WorkerType workerType, String basePath) { try { ClassPathResource classPathResource = new ClassPathResource("excel/工人教育档案.xlsx"); InputStream inputStream = classPathResource.getInputStream(); @@ -280,9 +280,18 @@ public class ExcelUtils { } } } - picture("C:\\jxj\\prod\\backEnd\\itbgpImage\\6661637a99ad0e050669d016.jpg", sheet, 9, 15, 13, 15); - picture("C:\\jxj\\prod\\backEnd\\itbgpImage\\6661637a99ad0e050669d016.jpg", sheet, 20, 28, 1, 7); - picture("C:\\jxj\\prod\\backEnd\\itbgpImage\\6661637a99ad0e050669d016.jpg", sheet, 20, 28, 9, 15); + String idCardBigPhotoUrl = MapUtils.getString(map, "idCardBigPhotoUrl"); + if (StringUtils.isNotBlank(idCardBigPhotoUrl)) { + picture(basePath + idCardBigPhotoUrl, sheet, 9, 15, 13, 15); + } + String idCardUpPhotoUrl = MapUtils.getString(map, "idCardUpPhotoUrl"); + if (StringUtils.isNotBlank(idCardBigPhotoUrl)) { + picture(basePath + idCardUpPhotoUrl, sheet, 20, 28, 1, 7); + } + String idCardDownPhotoUrl = MapUtils.getString(map, "idCardDownPhotoUrl"); + if (StringUtils.isNotBlank(idCardDownPhotoUrl)) { + picture(basePath + idCardDownPhotoUrl, sheet, 20, 28, 9, 15); + } downLoadExcel("工人教育档案.xlsx", response, workbook); } catch (IOException e) { log.error("error：", e); diff --git a/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar b/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar index 1d105ff55..1f27b3bcd 100644 Binary files a/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar and b/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar differ