diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java index be1251a..e045aaa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java @@ -28,6 +28,7 @@ import com.ruoyi.wgz.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import lombok.var; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -517,10 +518,15 @@ public class WgzAppController { @GetMapping("/wgzUserAttachmentAcquisition") public AjaxResult userAttachmentAcquisition(@Validated WgzAppAttachmentAcquisitionReq req) { Long appUserId = SecurityUtils.getAppUserId(); - BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId); - Long recruitId = by.getRecruitId(); - if (!appUserId.equals(recruitId)){ - throw new RuntimeException("当前用户不是该招工的申请人"); + Long recruitId; + if (req.getType()==1){ + BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId); + recruitId = by.getRecruitId(); + if (!appUserId.equals(recruitId)){ + throw new RuntimeException("当前用户不是该招工的申请人"); + } + } else { + recruitId = 0L; } //返回对象 WgzAppAttachmentAcquisitionRes wgzAppAttachmentAcquisitionRes = new WgzAppAttachmentAcquisitionRes(); @@ -528,20 +534,22 @@ public class WgzAppController { //附件类型 String annexType = "wgz_attachment"; //具体附件值 - String[] specifiedAttachment = req.getSpecifiedAttachment(); + List specifiedAttachment = req.getSpecifiedAttachment(); //String[] SpecifiedAttachment = {"0"}; - //1、获取指定实名认证的附件结构返回 List data = dictTypeService.selectDictDataByType(annexType); - data.forEach(item -> { - for (String val : specifiedAttachment) { + for (SysDictData item : data) { + for (int i = 0; i < specifiedAttachment.size(); i++) { String dictValue = item.getDictValue(); + String val = specifiedAttachment.get(i); if (dictValue.equals(val)) { //2、每个结构下有那些附件（附件可能有多个或一个）；查询附件表 AnnexQueryBo annexQueryBo = new AnnexQueryBo(); annexQueryBo.setUserId(appUserId); annexQueryBo.setUserType(WGZ); - annexQueryBo.setRecruitId(recruitId); + if (req.getType()==1){ + annexQueryBo.setRecruitId(recruitId); + } annexQueryBo.setAnnexType(val); List annexes = iAnnexService.queryList(annexQueryBo); //3、具体附件结构 @@ -552,7 +560,7 @@ public class WgzAppController { resData.add(wgzAutonymAnnex); } } - }); + } return AjaxResult.success(wgzAppAttachmentAcquisitionRes.setWgzAutonymAnnex(resData)); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java index 9745b90..28dda16 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java @@ -403,8 +403,8 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl 0) { +// bgtProjectRecruitApply.setStatus("7"); + if (baseMapper.deleteById(bgtProjectRecruitApply) > 0) { Long appUserId = SecurityUtils.getAppUserId(); // BgtProjectRecruitApply by = selectByUserIdProjectRecruitApplyId(appUserId); BgtProjectRecruitApply by = baseMapper.selectById(recruitApplyId); @@ -418,8 +418,8 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl recruitApply = iBgtProjectRecruitApplyService.list( Wrappers.lambdaQuery() .eq(BgtProjectRecruitApply::getRecruitId, recruit.getId()) + .eq(BgtProjectRecruitApply::getStatus, "5") ); for (BgtProjectRecruitApply by : recruitApply) { int count = iWgzAttendanceService.count( @@ -179,6 +180,7 @@ public class BusinessTask List recruitApply = iBgtProjectRecruitApplyService.list( Wrappers.lambdaQuery() .eq(BgtProjectRecruitApply::getRecruitId, recruit.getId()) + .eq(BgtProjectRecruitApply::getStatus, "5") ); for (BgtProjectRecruitApply by : recruitApply) { WgzAttendance one = iWgzAttendanceService.getOne( diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppAttachmentAcquisitionReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppAttachmentAcquisitionReq.java index 260272e..1c4aa2b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppAttachmentAcquisitionReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppAttachmentAcquisitionReq.java @@ -12,6 +12,7 @@ import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import java.io.Serializable; import java.time.Year; +import java.util.List; @Data @NoArgsConstructor @@ -19,8 +20,10 @@ import java.time.Year; @ApiModel("务工者APP-实名认证·附件结构请求对象") public class WgzAppAttachmentAcquisitionReq implements Serializable { + @ApiModelProperty("0用户资料 1招工+用户资料") + private int type; + @ApiModelProperty("0资格证书 1劳动合同 2保单 3入场材料 4电子税票 5工作明细报告") - @Pattern(regexp = "^[0-5]$", message = "status 只能是 0 到 5 之间的数字") - private String[] specifiedAttachment; + private List specifiedAttachment; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppRealNameAuthenticationReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppRealNameAuthenticationReq.java index 6fa04aa..8b6503c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppRealNameAuthenticationReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppRealNameAuthenticationReq.java @@ -43,7 +43,7 @@ public class WgzAppRealNameAuthenticationReq implements Serializable { private String nation; @ApiModelProperty("出生日期") - @NotBlank(message = "出生日期不能为空") + @NotNull(message = "出生日期不能为空") private LocalDate birthdate; @ApiModelProperty("身份证号码") diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java index 15ebe83..c9cd778 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java @@ -33,6 +33,8 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.stream.Collectors; +import static com.ruoyi.common.constant.Constants.WGZ; + /** * APP务工者Service业务层处理 @@ -173,11 +175,20 @@ public class WgzUserServiceImpl extends ServicePlusImpl WgzAppPersonalBasicInformationRes wgzAppPersonalBasicInformationRes = new WgzAppPersonalBasicInformationRes(); BeanUtils.copyProperties(wgzUser,wgzAppPersonalBasicInformationRes); wgzAppPersonalBasicInformationRes.setAge(DataUtil.calculateAge(wgzAppPersonalBasicInformationRes.getBirthdate())); + //3、字典类型转换 List typeOfWork = dictTypeService.selectDictDataByType("type_of_work"); - List split = Arrays.asList(wgzAppPersonalBasicInformationRes.getTypeOfWork().split(",")); - String typeOfWorkName = typeOfWork.stream().filter(dictData -> split.contains(dictData.getDictValue())).map(SysDictData::getDictLabel) - .collect(Collectors.joining(",")); - wgzAppPersonalBasicInformationRes.setTypeOfWorkName(typeOfWorkName); + System.out.println("?? "+typeOfWork.toString()); + String[] split = wgzAppPersonalBasicInformationRes.getTypeOfWork().split(","); + StringBuilder typeOfWorkName = new StringBuilder(); + for (SysDictData sysDictData : typeOfWork) { + for (String s : split) { + if (sysDictData.getDictValue().equals(s)){ + typeOfWorkName.append(sysDictData.getDictLabel()).append(","); + } + } + } + typeOfWorkName.deleteCharAt(typeOfWorkName.length() - 1); + wgzAppPersonalBasicInformationRes.setTypeOfWorkName(typeOfWorkName.toString()); return wgzAppPersonalBasicInformationRes; } @@ -192,10 +203,19 @@ public class WgzUserServiceImpl extends ServicePlusImpl if (update == 0){ throw new RuntimeException("当前用户不存在！"); } + //2、新增附件 List annex = req.getAnnex(); List annexDTOS = new ArrayList<>(); - BeanUtils.copyProperties(annex, annexDTOS); + for (Annex data : annex) { + AnnexDTO dto = new AnnexDTO(); + BeanUtils.copyProperties(data, dto); + dto.setUserId(req.getUserId()).setUserType(WGZ); +// setAnnexType(data.getAnnexType()). +// setAnnexName(data.getAnnexName()). +// setAnnexUrl(data.getAnnexUrl()); + annexDTOS.add(dto); + } iAnnexService.insertBatch(annexDTOS); return true; } diff --git a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitMapper.xml b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitMapper.xml index 86fcd2d..a6b4d0c 100644 --- a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitMapper.xml @@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bgt_project_recruit as b LEFT JOIN fbs_project_task as c ON (c.id = b.task_id) WHERE - b.id not in (SELECT recruit_id FROM bgt_project_recruit_apply WHERE user_id = #{req.userId}) and + b.id not in (SELECT recruit_id FROM bgt_project_recruit_apply WHERE user_id = #{req.userId})and b.del_flag = 0 diff --git a/ruoyi/uploadPath/upload/2025/03/02/3d931075-11c7-4fb0-962b-e6de6be9f335.jpg b/ruoyi/uploadPath/upload/2025/03/02/3d931075-11c7-4fb0-962b-e6de6be9f335.jpg new file mode 100644 index 0000000..956b9d2 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/02/3d931075-11c7-4fb0-962b-e6de6be9f335.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/02/55fd7730-afe0-41ba-812f-c06139f69f18.jpg b/ruoyi/uploadPath/upload/2025/03/02/55fd7730-afe0-41ba-812f-c06139f69f18.jpg new file mode 100644 index 0000000..80a75d4 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/02/55fd7730-afe0-41ba-812f-c06139f69f18.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/03/aec81cbf-8511-414c-918c-e292b44ef0a5.docx b/ruoyi/uploadPath/upload/2025/03/03/aec81cbf-8511-414c-918c-e292b44ef0a5.docx new file mode 100644 index 0000000..e69de29 diff --git a/ruoyi/uploadPath/upload/2025/03/04/10bd6abe-475a-40bb-b853-795d85b3f482.jpg b/ruoyi/uploadPath/upload/2025/03/04/10bd6abe-475a-40bb-b853-795d85b3f482.jpg new file mode 100644 index 0000000..5974f29 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/04/10bd6abe-475a-40bb-b853-795d85b3f482.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/04/22ff4cb2-7f51-4634-b42b-6b5667931117.jpg b/ruoyi/uploadPath/upload/2025/03/04/22ff4cb2-7f51-4634-b42b-6b5667931117.jpg new file mode 100644 index 0000000..5974f29 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/04/22ff4cb2-7f51-4634-b42b-6b5667931117.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/04/380f3afb-d38b-4931-9a35-fb4caa9f8b56.jpg b/ruoyi/uploadPath/upload/2025/03/04/380f3afb-d38b-4931-9a35-fb4caa9f8b56.jpg new file mode 100644 index 0000000..5974f29 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/04/380f3afb-d38b-4931-9a35-fb4caa9f8b56.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/04/3cdffef3-7962-41bc-87d5-618aee7dd662.jpg b/ruoyi/uploadPath/upload/2025/03/04/3cdffef3-7962-41bc-87d5-618aee7dd662.jpg new file mode 100644 index 0000000..5974f29 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/04/3cdffef3-7962-41bc-87d5-618aee7dd662.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/04/4336991e-69f1-46a2-9230-4904818aa87f.jpg b/ruoyi/uploadPath/upload/2025/03/04/4336991e-69f1-46a2-9230-4904818aa87f.jpg new file mode 100644 index 0000000..5974f29 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/04/4336991e-69f1-46a2-9230-4904818aa87f.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/04/55b750af-59b0-4ea4-befe-7cb174def370.jpg b/ruoyi/uploadPath/upload/2025/03/04/55b750af-59b0-4ea4-befe-7cb174def370.jpg new file mode 100644 index 0000000..5974f29 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/04/55b750af-59b0-4ea4-befe-7cb174def370.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/04/6f1d7ff6-4ca5-4fec-92e7-e35b138be789.jpg b/ruoyi/uploadPath/upload/2025/03/04/6f1d7ff6-4ca5-4fec-92e7-e35b138be789.jpg new file mode 100644 index 0000000..5974f29 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/04/6f1d7ff6-4ca5-4fec-92e7-e35b138be789.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/04/9c293f7c-f953-4a68-be26-adea01ab85bb.jpg b/ruoyi/uploadPath/upload/2025/03/04/9c293f7c-f953-4a68-be26-adea01ab85bb.jpg new file mode 100644 index 0000000..a3bd602 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/04/9c293f7c-f953-4a68-be26-adea01ab85bb.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/04/c7d0c96a-f288-479a-a352-1ea38b008389.jpg b/ruoyi/uploadPath/upload/2025/03/04/c7d0c96a-f288-479a-a352-1ea38b008389.jpg new file mode 100644 index 0000000..5974f29 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/04/c7d0c96a-f288-479a-a352-1ea38b008389.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/04/e7910265-291b-4522-82e6-bf297cb87334.jpg b/ruoyi/uploadPath/upload/2025/03/04/e7910265-291b-4522-82e6-bf297cb87334.jpg new file mode 100644 index 0000000..5974f29 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/04/e7910265-291b-4522-82e6-bf297cb87334.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/04/fe5d5b6a-f1d1-4f31-b18b-01ab49ae1d4c.jpg b/ruoyi/uploadPath/upload/2025/03/04/fe5d5b6a-f1d1-4f31-b18b-01ab49ae1d4c.jpg new file mode 100644 index 0000000..5974f29 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/04/fe5d5b6a-f1d1-4f31-b18b-01ab49ae1d4c.jpg differ