From 23bf1f46eeeb0b411db12dd76742c84a3b0d77dc Mon Sep 17 00:00:00 2001 From: zt Date: Fri, 28 Feb 2025 17:15:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bgt/AppBgtProjectRecruitController.java | 11 ++ ruoyi-admin/src/main/resources/banner.txt | 44 +++++++- .../com/ruoyi/common/utils/DateUtils.java | 4 + .../java/com/ruoyi/bgt/domain/BgtMessage.java | 2 + .../ruoyi/bgt/domain/BgtWageApplication.java | 2 +- .../dto/UserRealNameAuthenticationDTO.java | 6 + .../bgt/domain/vo/BgtMessageDetailVO.java | 6 +- .../service/impl/BgtMessageServiceImpl.java | 20 ++-- .../BgtProjectRecruitApplyServiceImpl.java | 3 +- .../impl/BgtProjectRecruitServiceImpl.java | 10 +- .../BgtProjectTaskProgressServiceImpl.java | 6 +- .../bgt/service/impl/BgtUserServiceImpl.java | 3 - .../constants/WgzAndBgtMessageConstant.java | 7 ++ .../ruoyi/fbs/domain/vo/AppTaskDetailVO.java | 3 + .../fbs/domain/vo/AppTaskDetailWageVO.java | 2 + .../com/ruoyi/fbs/domain/vo/AppTaskVO.java | 3 + .../impl/FbsProjectTaskServiceImpl.java | 17 +-- .../java/com/ruoyi/wgz/domain/WgzMessage.java | 12 +- .../mapper/fbs/FbsProjectTaskMapper.xml | 104 ++++++++++-------- 19 files changed, 175 insertions(+), 90 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitController.java index fbe224c..45e4ed2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitController.java @@ -81,5 +81,16 @@ public class AppBgtProjectRecruitController extends BaseController { return AjaxResult.success(iBgtProjectRecruitService.insert(bo)); } + /** + * 修改包工头招工 + */ + @ApiOperation("编辑招工信息") + @Log(title = "编辑招工信息", businessType = BusinessType.UPDATE) + @RepeatSubmit + @PutMapping() + public AjaxResult edit(@Validated @RequestBody BgtProjectRecruit bo) { + return AjaxResult.success(iBgtProjectRecruitService.update(bo)); + } + } diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt index f592dbe..631eaad 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/ruoyi-admin/src/main/resources/banner.txt @@ -1,8 +1,40 @@ Application Version: ${ruoyi-vue-plus.version} Spring Boot Version: ${spring-boot.version} -__________ _____.___.__ ____ ____ __________.__ -\______ \__ __ ____\__ | |__| \ \ / /_ __ ____ \______ \ | __ __ ______ - | _/ | \/ _ \/ | | | ______ \ Y / | \_/ __ \ ______ | ___/ | | | \/ ___/ - | | \ | ( <_> )____ | | /_____/ \ /| | /\ ___/ /_____/ | | | |_| | /\___ \ - |____|_ /____/ \____// ______|__| \___/ |____/ \___ > |____| |____/____//____ > - \/ \/ \/ \/ + ,--"""",--.__,---[],-------._ + ," __,' \ \--""""""==;- + ," _,-" "/---.___ \ ___\ ,-''," + /,-' / ;. ,.--'-.__\ _,-"" ,| `,' / + /``""""-._/,-|:\ []\,' ```-/:;-. `. / + ` ;::: || /:,; `-.\ + =.,'__,---||-.____',.= + =(:\_ ||__ ):)= + ,"::::`----||::`--':::"._ + ,':::::::::::||::::::::::::'. + .__ ;:::.-.:::::__||___:::::.-.:::\ __, + """-;:::( O )::::>_|| _<::::( O )::::-""" + =======;:::::`-`:::::::||':::::::`-`:::::\======= + ,--"";:::_____________||______________::::""----. , , + ; ::`._( | ||| | )_,'::::\_,,,,,,,,,,____/,'_, + ,; :::`--._|____[]|_____|_.-'::::::::::::::::::::::::);_ + ;/ / :::::::::,||,:::::::::::::::::::::::::::::::::::/ + /; ``''''----------/,'/,__,,,,,____:::::::::::::::::::::," + ;/ :);/|_;| ,--.. . ```-.:::::::::::::_," + /; :::):__,'//""\\. ,--.. \:::,:::::_," + ;/ :::::/ . . . . . . //""\\. \::":__," + ;/ :::::::,' . . . . . . . . . . .:`::\ + '; :::::::__,'. ,--.. . .,--. . . . . .:`::` + '; __,..--'''-. . //""\\. .//""\\ . ,--.. :`:::` + ; / \\ .//""\\ . . . . . . . . . //""\\. :`::` + ; / . . . . . . . . . . . . . . . . .:`::` + ; ( . . . . . . . . . . . . . . . ;:::` + ,: ;, . . . . . . . . . . . . . ;':::` + ,: ;, . . . . . . . . . . . . .;`::: + ,: ;, . . . . . . . . . . . . ;`::;` + ,: ; . . . . . . . . . . . . ;':::;` + : ; . . . . . . . . . . . ,':::; + : '. . . . . . . . .. . . .,':::;` + : `. . . . . . . . . . . . ;::::;` + '. `-. . . . . . . . . . . ,-'::::; + `:_ ``--..___________..--'':::::;'` + `._::,.:,.:,:_ctr_:,:,.::,.:_;'` +________________`"\/"\/\/'""""`\/"\/""\/"___________ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java index 515a172..9c0be08 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java @@ -1,5 +1,6 @@ package com.ruoyi.common.utils; +import cn.hutool.core.util.StrUtil; import org.apache.commons.lang3.time.DateFormatUtils; import java.lang.management.ManagementFactory; @@ -163,6 +164,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils public static LocalDate str2Localdate(String time,String format){ // 定义日期格式 + if(StrUtil.isBlank(time)){ + return null; + } DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format); LocalDate localDate = null; try { diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtMessage.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtMessage.java index e16218b..8c79329 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtMessage.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtMessage.java @@ -120,4 +120,6 @@ public class BgtMessage implements Serializable { @ApiModelProperty("备注") private String remark; + @ApiModelProperty("是否需要操作（0不需要 1需要 2已操作）") + private String isOperation ; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtWageApplication.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtWageApplication.java index 03de658..8c7c159 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtWageApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtWageApplication.java @@ -40,7 +40,7 @@ public class BgtWageApplication implements Serializable { private Long projectId; @ApiModelProperty("项目名") - private Long projectName; + private String projectName; /** 标段ID */ @Excel(name = "标段ID") diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/UserRealNameAuthenticationDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/UserRealNameAuthenticationDTO.java index 1482265..3675667 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/UserRealNameAuthenticationDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/UserRealNameAuthenticationDTO.java @@ -67,6 +67,12 @@ public class UserRealNameAuthenticationDTO { @NotBlank(message = "银行卡号不能为空") private String cardNo; + @ApiModelProperty("身份证正面图路径") + private String frontPath; + + @ApiModelProperty("身份证反面图路径") + private String reverseSidePath; + @ApiModelProperty("资格证书") List annexList; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtMessageDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtMessageDetailVO.java index 28b23c1..db475ee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtMessageDetailVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtMessageDetailVO.java @@ -67,10 +67,14 @@ public class BgtMessageDetailVO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime endTime; - //请假 补卡 + //请假 补卡 共用 @ApiModelProperty("申请人") private String username; @ApiModelProperty("补卡/请假理由") private String reason; + + //任务 结算共用 + @ApiModelProperty("任务名称") + private String taskName; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java index 32af16e..1b6286c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java @@ -23,6 +23,8 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BgtMessageType; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.fbs.domain.FbsProjectTask; +import com.ruoyi.fbs.service.IFbsProjectTaskService; import com.ruoyi.wgz.domain.WgzLeave; import com.ruoyi.wgz.domain.WgzPayCalculation; import com.ruoyi.wgz.domain.WgzReissueacard; @@ -69,6 +71,9 @@ public class BgtMessageServiceImpl extends ServicePlusImplentity.getProgress()){ + throw new BaseException("当前进度不能小于上一个进度"); + } } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtUserServiceImpl.java index 89ef591..0895590 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtUserServiceImpl.java @@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; @@ -124,8 +123,6 @@ public class BgtUserServiceImpl extends ServicePlusImpl @Transactional(rollbackFor = Exception.class) public Boolean realNameAuthentication(UserRealNameAuthenticationDTO dto) { BgtUser bgtUser = BeanUtil.copyProperties(dto, BgtUser.class); - //todo: 资格证书附件类型 - annexService.deleteByTypes(Arrays.asList("1")); annexService.insertBatch(dto.getAnnexList()); return baseMapper.updateById(bgtUser)>0; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/common/constants/WgzAndBgtMessageConstant.java b/ruoyi-system/src/main/java/com/ruoyi/common/constants/WgzAndBgtMessageConstant.java index 2552f53..0607f90 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/common/constants/WgzAndBgtMessageConstant.java +++ b/ruoyi-system/src/main/java/com/ruoyi/common/constants/WgzAndBgtMessageConstant.java @@ -9,6 +9,13 @@ public class WgzAndBgtMessageConstant { public static final String USERTYPE_BGT = "2"; //包工头 public static final String USERTYPE_FBS = "3"; //分包商 + + public static final String OPERATION_NO = "0"; //不需要操作 + public static final String OPERATION_NEED = "1"; //需要操作 + public static final String OPERATION_ALREADY = "2"; //已操作 + + + public static final String LARGE_APPLY = "0"; //大类型-报名 public static final String LARGE_SALARY = "1"; //大类型-工资 public static final String LARGE_OTHER = "2"; //大类型-其它 diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailVO.java index f20fcf3..eb4dd54 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailVO.java @@ -79,6 +79,9 @@ public class AppTaskDetailVO { @ApiModelProperty("任务状态（1进行中 2已完成）") private String status; + @ApiModelProperty("创建者ID") + private Long createId; + /** 备注 */ @ApiModelProperty("备注") private String remark; diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailWageVO.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailWageVO.java index 56e19f1..0f87fdb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailWageVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailWageVO.java @@ -25,5 +25,7 @@ public class AppTaskDetailWageVO { @ApiModelProperty("最新一条收款申请") private BgtWageApplicationListVO wageApplication; + @ApiModelProperty("任务金额") + private Integer taskAmount; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskVO.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskVO.java index 805a45c..4f02e8d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskVO.java @@ -62,6 +62,9 @@ public class AppTaskVO { @ApiModelProperty("申请数量") private Integer applyNum; + @ApiModelProperty("判断标志") + private Boolean myTask; + @ApiModelProperty("任务收款金额") private Integer taskReceiveAmount = 0; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java index e158b87..0ea968e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java @@ -144,21 +144,8 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl appTaskDTOPage = new Page<>(); appTaskDTOPage.setCurrent(dto.getPageNum()); appTaskDTOPage.setSize(dto.getPageSize()); - List taskIds = new ArrayList<>(); - if(ProjectTaskStatus.APPLY.getCode().equals(dto.getStatus())){ - taskIds = taskApplyService.getTaskIdsByUserId(SecurityUtils.getAppUserId()); - dto.setTaskIds(taskIds); - } - if(dto.getMyTask() && !ProjectTaskStatus.APPLY.getCode().equals(dto.getStatus())){ - dto.setUserId(SecurityUtils.getAppUserId()); - } - + dto.setUserId(SecurityUtils.getAppUserId()); Page appTaskVOPage = baseMapper.appQueryPageList(appTaskDTOPage, dto); - if(dto.getMyTask() && ProjectTaskStatus.APPLY.getCode().equals(dto.getStatus()) - &&CollectionUtil.isEmpty(taskIds)){ - appTaskVOPage.setRecords(new ArrayList<>()); - appTaskVOPage.setTotal(0); - } return PageUtils.buildDataInfo(appTaskVOPage); } @@ -250,8 +237,10 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl - select fpt.id, - fpt.project_id, - fpt.section_id, - fpt.sub_id, - fpt.task_name, - fpt.task_staff_num, - fpt.task_amount, - fpt.task_begin_time, - fpt.task_end_time, - zp.project_name, - fpt.task_describe, - fpt.task_address, - fpt.create_time, - (select count(task_id) from fbs_project_task_apply where task_id = fpt.id) as applyNum, - (select sum(applicant_amount) from bgt_wage_application where audit_status = '2'and task_id = fpt.id) as taskReceiveAmount - from fbs_project_task fpt - left join zbf_project zp on fpt.project_id = zp.id + SELECT + fpt.id, + fpt.project_id, + fpt.section_id, + fpt.sub_id, + fpt.task_name, + fpt.task_staff_num, + fpt.task_amount, + fpt.task_begin_time, + fpt.task_end_time, + zp.project_name, + fpt.task_describe, + fpt.task_address, + fpt.create_time, + #{dto.myTask} as myTask, + COALESCE(apply.applyNum, 0) as applyNum, + COALESCE(wage.taskReceiveAmount, 0) as taskReceiveAmount + FROM fbs_project_task fpt + LEFT JOIN zbf_project zp ON fpt.project_id = zp.id + LEFT JOIN ( + SELECT task_id, COUNT(*) as applyNum + FROM fbs_project_task_apply + GROUP BY task_id + ) apply ON fpt.id = apply.task_id + LEFT JOIN ( + SELECT task_id, SUM(applicant_amount) as taskReceiveAmount + FROM bgt_wage_application + WHERE audit_status = '2' + GROUP BY task_id + ) wage ON fpt.id = wage.task_id - - - - and fpt.id IN - - #{item} - - - - - - and fpt.id not IN - - #{item} - - - - - - - and fpt.task_name like concat('%', #{dto.taskName}, '%') - - - and fpt.user_id = #{dto.userId} - - - and fpt.status = #{dto.status} - + + AND NOT EXISTS ( + SELECT 1 + FROM fbs_project_task_apply + WHERE task_id = fpt.id + AND user_id = #{dto.userId} + ) + + + AND EXISTS ( + SELECT 1 + FROM fbs_project_task_apply + WHERE task_id = fpt.id + AND user_id = #{dto.userId} + ) + + + AND fpt.task_name LIKE CONCAT('%', #{dto.taskName}, '%') + + + AND fpt.user_id = #{dto.userId} + + + AND fpt.status = #{dto.status} + - order by fpt.create_time desc + ORDER BY fpt.create_time DESC