diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/InspectionController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/InspectionController.java index 160632d..a6b74f3 100644 --- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/InspectionController.java +++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/InspectionController.java @@ -21,10 +21,7 @@ import com.biutag.supervision.pojo.entity.SupTask; import com.biutag.supervision.pojo.entity.SupTaskInspection; import com.biutag.supervision.pojo.entity.SupTaskProblem; import com.biutag.supervision.pojo.param.TaskInspectionQueryParam; -import com.biutag.supervision.pojo.vo.FileVo; -import com.biutag.supervision.pojo.vo.TaskInspectionProblemVo; -import com.biutag.supervision.pojo.vo.TaskInspectionVo; -import com.biutag.supervision.pojo.vo.TemperancePoliceVo; +import com.biutag.supervision.pojo.vo.*; import com.biutag.supervision.service.SupTaskProblemService; import com.biutag.supervision.service.SupTaskInspectionService; import jakarta.servlet.http.HttpServletResponse; @@ -89,7 +86,7 @@ public class InspectionController { TaskInspectionProblemVo vo = new TaskInspectionProblemVo(); BeanUtils.copyProperties(item, vo); if (StrUtil.isNotBlank(item.getPeoples())) { - vo.setPeoples(JSON.parseArray(item.getPeoples(), TaskProblemDto.People.class)); + vo.setPeoples(JSON.parseArray(item.getPeoples(), People.class)); } if (StrUtil.isNotBlank(item.getFiles())) { vo.setFileData(JSON.parseArray(item.getFiles(), FileVo.class)); diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/SelfexaminationController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/SelfexaminationController.java index cbdaa82..8762adc 100644 --- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/SelfexaminationController.java +++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/SelfexaminationController.java @@ -70,7 +70,7 @@ public class SelfexaminationController { TaskSelfexaminationProblemVo vo = new TaskSelfexaminationProblemVo(); BeanUtils.copyProperties(item, vo); if (StrUtil.isNotBlank(item.getPeoples())) { - vo.setPeoples(JSON.parseArray(item.getPeoples(), TaskProblemDto.People.class)); + vo.setPeoples(JSON.parseArray(item.getPeoples(), People.class)); } if (StrUtil.isNotBlank(item.getFiles())) { vo.setFiles(JSON.parseArray(item.getFiles(), FileVo.class)); diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java index b002b7a..38114dc 100644 --- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java +++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java @@ -1,20 +1,34 @@ package com.biutag.supervision.controller.mobileSupervision; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.common.UserContextHolder; import com.biutag.supervision.constants.AppConstants; import com.biutag.supervision.constants.enums.TaskTypeEnum; +import com.biutag.supervision.mapper.SupPoliceMapper; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.dto.TaskProblemDto; +import com.biutag.supervision.pojo.dto.TaskProblemUpDto; +import com.biutag.supervision.pojo.entity.SupPolice; import com.biutag.supervision.pojo.entity.SupTaskPerson; import com.biutag.supervision.pojo.entity.SupTaskProblem; import com.biutag.supervision.pojo.model.UserAuth; import com.biutag.supervision.pojo.param.TaskProblemQueryParam; +import com.biutag.supervision.pojo.vo.People; +import com.biutag.supervision.pojo.vo.PeoplesData; +import com.biutag.supervision.pojo.vo.SupTaskProblemVo; import com.biutag.supervision.service.SupDepartService; +import com.biutag.supervision.service.SupDictProblemTypeService; +import com.biutag.supervision.service.SupPoliceService; import com.biutag.supervision.service.SupTaskProblemService; +import com.biutag.supervision.util.CommonUtil; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -35,6 +49,10 @@ public class TaskProblemController { private final SupTaskProblemService taskProblemService; private final SupDepartService departService; + + private final SupPoliceMapper policeMapper; + + private final SupDictProblemTypeService problemTypeService; @GetMapping public Result> page(TaskProblemQueryParam queryParam) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -88,6 +106,33 @@ public class TaskProblemController { return Result.success(taskProblemService.save(dto)); } + @PostMapping("/upData") + public Result upData(@RequestBody TaskProblemUpDto dto){ + SupTaskProblem problem = new SupTaskProblem(); + String files = JSON.toJSONString(dto.getFiles()); + String peoples =null; + if(CollectionUtil.isNotEmpty(dto.getPeopleIds())){ + List list = policeMapper.getPeopleList(dto.getPeopleIds()); + peoples=JSON.toJSONString(list); + } + taskProblemService.update( + new LambdaUpdateWrapper().set(SupTaskProblem::getCreateTime,dto.getCreateTime()) + .set(StrUtil.isNotBlank(dto.getThingDesc()),SupTaskProblem::getThingDesc,dto.getThingDesc()) + .set(StrUtil.isNotBlank(dto.getTaskType()),SupTaskProblem::getTaskType,dto.getTaskType()) + .set(StrUtil.isNotBlank(dto.getProblemTypeCode()),SupTaskProblem::getProblemTypeCode,dto.getProblemTypeCode()) + .set(StrUtil.isNotBlank(dto.getProblemTypeCode()),SupTaskProblem::getProblemType,problemTypeService.getFullName(dto.getProblemTypeCode())) + .set(StrUtil.isNotBlank(dto.getDepartId()),SupTaskProblem::getDepartId,dto.getDepartId()) + .set(StrUtil.isNotBlank(dto.getDepartId()),SupTaskProblem::getDepartName,departService.getById(dto.getDepartId()).getShortName()) + .set(StrUtil.isNotBlank(files),SupTaskProblem::getFiles,files) + .set(StrUtil.isNotBlank(peoples),SupTaskProblem::getPeoples,peoples) + .eq(SupTaskProblem::getId,dto.getId()) + ); + return Result.success(); + + + } + + @DeleteMapping("{id}") public Result del(@PathVariable Integer id){ return Result.success(taskProblemService.removeById(id)); diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TestingAlcoholController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TestingAlcoholController.java index 33e4eb6..25c2c49 100644 --- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TestingAlcoholController.java +++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TestingAlcoholController.java @@ -12,13 +12,12 @@ import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.biutag.supervision.common.UserContextHolder; import com.biutag.supervision.constants.enums.*; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.dto.*; -import com.biutag.supervision.pojo.entity.SupDepart; -import com.biutag.supervision.pojo.entity.SupPolice; -import com.biutag.supervision.pojo.entity.SupTaskProblem; -import com.biutag.supervision.pojo.entity.SupTaskTestingAlcoholPeople; +import com.biutag.supervision.pojo.entity.*; +import com.biutag.supervision.pojo.model.UserAuth; import com.biutag.supervision.pojo.param.TaskTestingAlcoholPeopleQueryParam; import com.biutag.supervision.pojo.param.TaskTestingAlcoholQueryParam; import com.biutag.supervision.pojo.param.TaskTestingTaskDistribute; @@ -58,6 +57,8 @@ public class TestingAlcoholController { private final SupTaskProblemService supTaskProblemService; + private final SupTaskService supTaskService; + @GetMapping public Result> page(TaskTestingAlcoholQueryParam queryParam) { return Result.success(taskTestingAlcoholService.page(queryParam)); @@ -166,7 +167,7 @@ public class TestingAlcoholController { vo.setFileData(JSON.parseArray(distribute.getProblemVo().getFiles(), FileVo.class)); } if(StrUtil.isNotBlank(distribute.getProblemVo().getPeoples())){ - vo.setPeopleData(JSON.parseArray(distribute.getProblemVo().getPeoples(), TaskProblemDto.People.class)); + vo.setPeopleData(JSON.parseArray(distribute.getProblemVo().getPeoples(), People.class)); } break; case "inspection": @@ -175,7 +176,7 @@ public class TestingAlcoholController { vo.setFileData(JSON.parseArray(distribute.getProblemVo().getFiles(), FileVo.class)); } if(StrUtil.isNotBlank(distribute.getProblemVo().getPeoples())){ - vo.setPeopleData(JSON.parseArray(distribute.getProblemVo().getPeoples(), TaskProblemDto.People.class)); + vo.setPeopleData(JSON.parseArray(distribute.getProblemVo().getPeoples(), People.class)); } break; case "testing_alcohol": @@ -190,7 +191,7 @@ public class TestingAlcoholController { SupTaskProblem supTaskProblem =list.get(0); BeanUtils.copyProperties(supTaskProblem, vo); if (StrUtil.isNotBlank(supTaskProblem.getPeoples())) { - vo.setPeopleData(JSON.parseArray(supTaskProblem.getPeoples(), TaskProblemDto.People.class)); + vo.setPeopleData(JSON.parseArray(supTaskProblem.getPeoples(), People.class)); } if (StrUtil.isNotBlank(supTaskProblem.getFiles())) { vo.setFileData(JSON.parseArray(supTaskProblem.getFiles(), FileVo.class)); @@ -209,7 +210,7 @@ public class TestingAlcoholController { SupTaskProblem problem = taskProblems.get(0); BeanUtils.copyProperties(problem, vo); if (StrUtil.isNotBlank(problem.getPeoples())) { - vo.setPeopleData(JSON.parseArray(problem.getPeoples(), TaskProblemDto.People.class)); + vo.setPeopleData(JSON.parseArray(problem.getPeoples(), People.class)); } if (StrUtil.isNotBlank(problem.getFiles())) { vo.setFileData(JSON.parseArray(problem.getFiles(), FileVo.class)); @@ -228,7 +229,7 @@ public class TestingAlcoholController { } } if(StrUtil.isNotBlank(distribute.getProblemVo().getPeoples())){ - vo.setPeopleData(JSON.parseArray(distribute.getProblemVo().getPeoples(), TaskProblemDto.People.class)); + vo.setPeopleData(JSON.parseArray(distribute.getProblemVo().getPeoples(), People.class)); } break; } @@ -308,10 +309,13 @@ public class TestingAlcoholController { // 审批流程 dto.setApprovalFlow(distribute.getApprovalFlow()); negativeService.save(dto); + UserAuth user = UserContextHolder.getCurrentUser(); //修改状态 LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.set(SupTaskProblem::getDistributionState,"1") + .set(StrUtil.isNotBlank(user.getUserId()),SupTaskProblem::getIssueUserId,user.getUserId()) + .set(StrUtil.isNotBlank(user.getUserId()),SupTaskProblem::getIssueUserName,user.getNickName()) .eq(SupTaskProblem::getId,vo.getId()); supTaskProblemService.update(updateWrapper); return Result.success(); diff --git a/src/main/java/com/biutag/supervision/controller/system/PoliceController.java b/src/main/java/com/biutag/supervision/controller/system/PoliceController.java index 481d410..29fc147 100644 --- a/src/main/java/com/biutag/supervision/controller/system/PoliceController.java +++ b/src/main/java/com/biutag/supervision/controller/system/PoliceController.java @@ -60,6 +60,12 @@ public class PoliceController { return Result.success(policeService.page(param)); } + @PostMapping("/postList") + public Result> postList(@RequestBody PoliceQueryParam param){ + return Result.success(policeService.page(param)); + } + + // 异常人员 @GetMapping("abnormal") public Result> abnormalList(PoliceQueryParam param) { @@ -282,4 +288,4 @@ public class PoliceController { }).toList(); negSourceAuthorityService.saveBatch(list); } -} \ No newline at end of file +} diff --git a/src/main/java/com/biutag/supervision/mapper/SupPoliceMapper.java b/src/main/java/com/biutag/supervision/mapper/SupPoliceMapper.java index 3225453..bbd98fb 100644 --- a/src/main/java/com/biutag/supervision/mapper/SupPoliceMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/SupPoliceMapper.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.biutag.supervision.pojo.dto.TaskProblemDto; import com.biutag.supervision.pojo.entity.SupPolice; import com.biutag.supervision.pojo.model.PoliceModel; +import com.biutag.supervision.pojo.vo.People; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -19,4 +21,6 @@ public interface SupPoliceMapper extends BaseMapper { @Select("select id_code from sup_police_avatar where img = #{img}") String getIdCodeByPoliceAvatar(String img); -} \ No newline at end of file + List getPeopleList(@Param("ids") List ids); + +} diff --git a/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java b/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java index cf86947..f1412f2 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java @@ -1,6 +1,7 @@ package com.biutag.supervision.pojo.dto; import com.biutag.supervision.pojo.vo.FileVo; +import com.biutag.supervision.pojo.vo.People; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; import lombok.Setter; @@ -44,11 +45,11 @@ public class TaskProblemDto { private String supRecordId; - @Setter - @Getter - public static class People { - private String name; - private String empNo; - private String idCode; - } + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime createTime; + + private String taskType; + + + } diff --git a/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemUpDto.java b/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemUpDto.java new file mode 100644 index 0000000..c67f0e5 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemUpDto.java @@ -0,0 +1,55 @@ +package com.biutag.supervision.pojo.dto; + +import com.biutag.supervision.pojo.vo.FileVo; +import com.biutag.supervision.pojo.vo.People; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Getter; +import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +public class TaskProblemUpDto { + private String id; + + private String taskId; + + // 是否存在督察问题 + private Boolean hasProblem; + + private String departId; + + private String problemType; + + private String problemTypeCode; + + private List peoples; + + private List peopleIds; + + + + // 具体情况 + private String thingDesc; + + // 附件 + private List files; + + private String contentId; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm") + private LocalDateTime supTime; + + private String empNo; + + private String supRecordId; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime createTime; + + private String taskType; +} diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java b/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java index 3908669..444fe4a 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java @@ -77,4 +77,10 @@ public class SupTaskProblem { @TableField("problem_state") private String problemState; + + @TableField("issue_user_name") + private String issueUserName; + + @TableField("issue_user_id") + private String issueUserId; } diff --git a/src/main/java/com/biutag/supervision/pojo/param/PoliceQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/PoliceQueryParam.java index 489ede4..06471de 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/PoliceQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/PoliceQueryParam.java @@ -3,6 +3,8 @@ package com.biutag.supervision.pojo.param; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Setter @Getter public class PoliceQueryParam extends BasePage { @@ -19,4 +21,6 @@ public class PoliceQueryParam extends BasePage { private String sortField; // 排序顺序（ASC 或 DESC） private String sortOrder; + + private List idCodes; } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/People.java b/src/main/java/com/biutag/supervision/pojo/vo/People.java new file mode 100644 index 0000000..0c6b962 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/vo/People.java @@ -0,0 +1,12 @@ +package com.biutag.supervision.pojo.vo; + +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +public class People { + private String name; + private String empNo; + private String idCode; +} diff --git a/src/main/java/com/biutag/supervision/pojo/vo/PeoplesData.java b/src/main/java/com/biutag/supervision/pojo/vo/PeoplesData.java new file mode 100644 index 0000000..cf33272 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/vo/PeoplesData.java @@ -0,0 +1,9 @@ +package com.biutag.supervision.pojo.vo; + +public class PeoplesData { + private String name; + + private String empNo; + + private String idCode; +} diff --git a/src/main/java/com/biutag/supervision/pojo/vo/SupTaskProblemVo.java b/src/main/java/com/biutag/supervision/pojo/vo/SupTaskProblemVo.java new file mode 100644 index 0000000..b72dfc2 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/vo/SupTaskProblemVo.java @@ -0,0 +1,35 @@ +package com.biutag.supervision.pojo.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class SupTaskProblemVo { + + private Integer id; + private String taskId; + + private String departId; + + private String departName; + + private String problemType; + + private String problemTypeCode; + + private List peoplesData; + + private String thingDesc; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime createTime; + + @TableField("files") + private String files; + + private String taskType; +} + diff --git a/src/main/java/com/biutag/supervision/pojo/vo/TaskDataProblemVo.java b/src/main/java/com/biutag/supervision/pojo/vo/TaskDataProblemVo.java index e366205..dba9465 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/TaskDataProblemVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/TaskDataProblemVo.java @@ -47,6 +47,6 @@ public class TaskDataProblemVo { // 附件 private List fileData = new ArrayList<>(); - private List peopleData = new ArrayList<>(); + private List peopleData = new ArrayList<>(); } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/TaskInspectionProblemVo.java b/src/main/java/com/biutag/supervision/pojo/vo/TaskInspectionProblemVo.java index c32449d..1e58521 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/TaskInspectionProblemVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/TaskInspectionProblemVo.java @@ -49,6 +49,6 @@ public class TaskInspectionProblemVo { // 附件 private List fileData = new ArrayList<>(); - private List peoples = new ArrayList<>(); + private List peoples = new ArrayList<>(); } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/TaskSelfexaminationProblemVo.java b/src/main/java/com/biutag/supervision/pojo/vo/TaskSelfexaminationProblemVo.java index 2fff22d..511efee 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/TaskSelfexaminationProblemVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/TaskSelfexaminationProblemVo.java @@ -39,5 +39,5 @@ public class TaskSelfexaminationProblemVo { // 附件 private List files = new ArrayList<>(); - private List peoples = new ArrayList<>(); + private List peoples = new ArrayList<>(); } diff --git a/src/main/java/com/biutag/supervision/service/SupPoliceService.java b/src/main/java/com/biutag/supervision/service/SupPoliceService.java index df2aca1..1d98d5a 100644 --- a/src/main/java/com/biutag/supervision/service/SupPoliceService.java +++ b/src/main/java/com/biutag/supervision/service/SupPoliceService.java @@ -1,5 +1,6 @@ package com.biutag.supervision.service; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Objects; @@ -46,6 +48,9 @@ public class SupPoliceService extends ServiceImpl { queryWrapper.like(StrUtil.isNotBlank(param.getIdCode()), "p.id_code", StrUtil.trim(param.getIdCode())); queryWrapper.like(StrUtil.isNotBlank(param.getEmpNo()), "p.emp_no", StrUtil.trim(param.getEmpNo())); queryWrapper.like(StrUtil.isNotBlank(param.getPhone()), "p.mobile", StrUtil.trim(param.getPhone())); + if(CollectionUtil.isNotEmpty(param.getIdCodes())){ + queryWrapper.in("p.id_code",param.getIdCodes()); + } if (StrUtil.isNotBlank(param.getDepartId())) { if (Objects.nonNull(param.getDepartBranch()) && param.getDepartBranch()) { List orgIds = departService.getAllNodeIds(param.getDepartId()); diff --git a/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholPeopleAsyncService.java b/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholPeopleAsyncService.java index a14ebda..144a7f8 100644 --- a/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholPeopleAsyncService.java +++ b/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholPeopleAsyncService.java @@ -9,6 +9,7 @@ import com.biutag.supervision.pojo.dto.TaskProblemDto; import com.biutag.supervision.pojo.dto.TaskTestingAlcoholPeopleDto; import com.biutag.supervision.pojo.entity.*; import com.biutag.supervision.pojo.vo.FileVo; +import com.biutag.supervision.pojo.vo.People; import com.biutag.supervision.util.JSON; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Async; @@ -66,7 +67,7 @@ public class SupTaskTestingAlcoholPeopleAsyncService { SupPolice police = policeService.getByEmpNo(dto.getEmpNo()); SupDepart depart = departService.getById(police.getOrgId()); TaskProblemDto problemDto = new TaskProblemDto(); - TaskProblemDto.People people = new TaskProblemDto.People(); + People people = new People(); people.setName(police.getName()); people.setEmpNo(police.getEmpNo()); people.setIdCode(police.getIdCode()); @@ -100,7 +101,7 @@ public class SupTaskTestingAlcoholPeopleAsyncService { SupPolice police = policeService.getByEmpNo(dto.getEmpNo()); SupDepart depart = departService.getById(police.getOrgId()); TaskProblemDto problemDto = new TaskProblemDto(); - TaskProblemDto.People people = new TaskProblemDto.People(); + People people = new People(); people.setName(police.getName()); people.setEmpNo(police.getEmpNo()); people.setIdCode(police.getIdCode()); diff --git a/src/main/resources/mapper/SupPoliceMapper.xml b/src/main/resources/mapper/SupPoliceMapper.xml index 9e0ff6d..a663c28 100644 --- a/src/main/resources/mapper/SupPoliceMapper.xml +++ b/src/main/resources/mapper/SupPoliceMapper.xml @@ -50,5 +50,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${ew.getCustomSqlSegment} - - \ No newline at end of file + +