ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决映射错误

Browse Source
This commit is contained in:
郑乔文 2022-11-10 17:34:05 +08:00
parent b57ba7a564
commit 2ec4d52a3a
6 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inventory-dao/src/main/java/com/rzyc/bean/task/dto/SpeWorkDto.java
View File

@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
@ApiModel("专项工作请求参数")
public class SpeWorkDto {
@ApiModelProperty(value = "任务类型id",required = true)
@ApiModelProperty(value = "专项工作id",required = true)
private String taskTypeId;
@ApiModelProperty(value = "任务接收人id",required = true)

2
inventory-dao/src/main/java/com/rzyc/bean/task/dto/WorkDto.java
View File

@ -14,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
@ApiModel("待办任务请求参数")
public class WorkDto {
@ApiModelProperty(value = "任务类型id",required = true)
@ApiModelProperty(value = "工作要务id",required = true)
private String taskTypeId;
@ApiModelProperty(value = "用户id")

8
inventory-dao/src/main/resources/mapper/OADistributionMapper.xml
View File

@ -255,6 +255,14 @@
where OADistributionId = #{oaDistribution.oadistributionid}
</update>
<!--专项工作详情-->
<!--<select id="singleWorkDetail" resultType="com.rzyc.bean.task.vo.SingleWorkVo">
select ot.OATaskId,ot.send_id,ot.StartDate,ot.EndDate,ot.Subject,ot.send_id,ot.AppStatus,ot.title,ot.CreatedOn
from oatask ot
join OADistribution od on ot.OATaskId = od.OATaskId
where od.OADistributionId = #{idDto.id}
</select>-->
<!--专项工作详情-->
<select id="singleWorkDetail" resultType="com.rzyc.bean.task.vo.SingleWorkVo">
select ot.OATaskId,ot.send_id,ot.StartDate,ot.EndDate,ot.Subject,ot.send_id,ot.AppStatus,ot.title,ot.CreatedOn

2
inventory-dao/src/main/resources/mapper/OATaskMapper.xml
View File

@ -536,7 +536,7 @@
<!--查询待办事项-->
<select id="workList" resultMap="ReceiveTail">
<select id="workList" resultType="com.rzyc.bean.task.vo.WorkPriorityVo">
select ot.OATaskId,od.OADistributionId,ot.title,ot.TaskType
from oatask ot
join OADistribution od on ot.OATaskId = od.OATaskId

6
inventory-gov/src/main/java/com/rzyc/controller/AppletsTaskController.java
View File

@ -115,7 +115,7 @@ public class AppletsTaskController extends BaseController{
*/
@ApiOperation(value = "履职记录列表",position = 3)
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id",value = "任务接收id")
@ApiImplicitParam(name = "id",value = "任务接收id(OADistributionId)")
})
@GetMapping("preList")
@PreAuthorize("hasAnyAuthority('preList','preList:update')")
@ -151,13 +151,13 @@ public class AppletsTaskController extends BaseController{
@ApiOperation(value = "专项工作任务详情",position = 12)
@GetMapping("singleWorkDetail")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id",value = "任务接收id")
@ApiImplicitParam(name = "id",value = "任务接收id(OADistributionId)")
})
@PreAuthorize("hasAnyAuthority('singleWorkDetail','singleWorkDetail:update')")
@MethodAnnotation(authorizations = {"singleWorkDetail","singleWorkDetail:update"},name = "工作要务列表")
public SingleResult<SingleWorkVo> singleWorkDetail(@Valid IdDto idDto){
SingleResult<SingleWorkVo> result = new SingleResult();
OADistribution oaDistribution = oaDistributionMapper.selectByPrimaryKey(idDto.getId());
OADistribution oaDistribution = oaDistributionMapper.selectDistribution(idDto.getId());
String sendUser = oaDistribution.getSysuserid();
SysUser user = sysUserMapper.selectUser(sendUser);

6
utils/pom.xml
View File

@ -318,6 +318,12 @@
<version>5.1.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.3</version>
<scope>compile</scope>
</dependency>
<!--分页 end-->
</dependencies>