diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupTaskTestingAlcoholPeople.java b/src/main/java/com/biutag/supervision/pojo/entity/SupTaskTestingAlcoholPeople.java index e6e37ee..0a6e650 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupTaskTestingAlcoholPeople.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/SupTaskTestingAlcoholPeople.java @@ -64,6 +64,11 @@ public class SupTaskTestingAlcoholPeople { // 检测照片 private String testingFiles; + + private String createUsername; + + private String createName; + //下发状态 // @TableField("issue_state") // private String issueState; diff --git a/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholPeopleService.java b/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholPeopleService.java index 988517e..221140f 100644 --- a/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholPeopleService.java +++ b/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholPeopleService.java @@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.biutag.supervision.common.UserContextHolder; import com.biutag.supervision.constants.enums.TaskStatusEnum; import com.biutag.supervision.mapper.SupTaskTestingAlcoholPeopleMapper; import com.biutag.supervision.pojo.dto.TaskTestingAlcoholPeopleDto; import com.biutag.supervision.pojo.entity.SupTaskTestingAlcoholPeople; +import com.biutag.supervision.pojo.model.UserAuth; import com.biutag.supervision.pojo.param.TaskTestingAlcoholPeopleQueryParam; import com.biutag.supervision.pojo.vo.FileVo; import com.biutag.supervision.pojo.vo.TaskTestingAlcoholPeopleVo; @@ -47,11 +49,14 @@ public class SupTaskTestingAlcoholPeopleService extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + UserAuth user = UserContextHolder.getCurrentUser(); updateWrapper.eq(SupTaskTestingAlcoholPeople::getTaskId, dto.getTaskId()) .eq(SupTaskTestingAlcoholPeople::getEmpNo, dto.getEmpNo()) .set(SupTaskTestingAlcoholPeople::getStatus, TaskStatusEnum.done.name()) .set(SupTaskTestingAlcoholPeople::getTestingTime, dto.getTestingTime()) - .set(SupTaskTestingAlcoholPeople::getTestingResult, dto.getTestingResult()); + .set(SupTaskTestingAlcoholPeople::getTestingResult, dto.getTestingResult()) + .set(SupTaskTestingAlcoholPeople::getCreateName, user.getNickName()) + .set(SupTaskTestingAlcoholPeople::getCreateUsername, user.getUserName()); if ("已检测".equals(dto.getTestingResult())) { updateWrapper.set(SupTaskTestingAlcoholPeople::getDrinkResult, dto.getDrinkResult()) .set(SupTaskTestingAlcoholPeople::getIsIllegalBanquet, dto.getIsIllegalBanquet()); diff --git a/src/main/resources/static/templates/审计监督问题批量导入模板.xlsx b/src/main/resources/static/templates/审计监督问题批量导入模板.xlsx index 3b943b2..81d1177 100644 Binary files a/src/main/resources/static/templates/审计监督问题批量导入模板.xlsx and b/src/main/resources/static/templates/审计监督问题批量导入模板.xlsx differ diff --git a/src/main/resources/static/templates/问题批量导入标准模板.xlsx b/src/main/resources/static/templates/问题批量导入标准模板.xlsx index ba3a456..1bef002 100644 Binary files a/src/main/resources/static/templates/问题批量导入标准模板.xlsx and b/src/main/resources/static/templates/问题批量导入标准模板.xlsx differ