解决映射错误
This commit is contained in:
parent
b57ba7a564
commit
2ec4d52a3a
|
|
@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
|
||||||
@ApiModel("专项工作请求参数")
|
@ApiModel("专项工作请求参数")
|
||||||
public class SpeWorkDto {
|
public class SpeWorkDto {
|
||||||
|
|
||||||
@ApiModelProperty(value = "任务类型id",required = true)
|
@ApiModelProperty(value = "专项工作id",required = true)
|
||||||
private String taskTypeId;
|
private String taskTypeId;
|
||||||
|
|
||||||
@ApiModelProperty(value = "任务接收人id",required = true)
|
@ApiModelProperty(value = "任务接收人id",required = true)
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
|
||||||
@ApiModel("待办任务请求参数")
|
@ApiModel("待办任务请求参数")
|
||||||
public class WorkDto {
|
public class WorkDto {
|
||||||
|
|
||||||
@ApiModelProperty(value = "任务类型id",required = true)
|
@ApiModelProperty(value = "工作要务id",required = true)
|
||||||
private String taskTypeId;
|
private String taskTypeId;
|
||||||
|
|
||||||
@ApiModelProperty(value = "用户id")
|
@ApiModelProperty(value = "用户id")
|
||||||
|
|
|
||||||
|
|
@ -255,6 +255,14 @@
|
||||||
where OADistributionId = #{oaDistribution.oadistributionid}
|
where OADistributionId = #{oaDistribution.oadistributionid}
|
||||||
</update>
|
</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 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
|
select ot.OATaskId,ot.send_id,ot.StartDate,ot.EndDate,ot.Subject,ot.send_id,ot.AppStatus,ot.title,ot.CreatedOn
|
||||||
|
|
|
||||||
|
|
@ -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
|
select ot.OATaskId,od.OADistributionId,ot.title,ot.TaskType
|
||||||
from oatask ot
|
from oatask ot
|
||||||
join OADistribution od on ot.OATaskId = od.OATaskId
|
join OADistribution od on ot.OATaskId = od.OATaskId
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,7 @@ public class AppletsTaskController extends BaseController{
|
||||||
*/
|
*/
|
||||||
@ApiOperation(value = "履职记录列表",position = 3)
|
@ApiOperation(value = "履职记录列表",position = 3)
|
||||||
@ApiImplicitParams(value = {
|
@ApiImplicitParams(value = {
|
||||||
@ApiImplicitParam(name = "id",value = "任务接收id")
|
@ApiImplicitParam(name = "id",value = "任务接收id(OADistributionId)")
|
||||||
})
|
})
|
||||||
@GetMapping("preList")
|
@GetMapping("preList")
|
||||||
@PreAuthorize("hasAnyAuthority('preList','preList:update')")
|
@PreAuthorize("hasAnyAuthority('preList','preList:update')")
|
||||||
|
|
@ -151,13 +151,13 @@ public class AppletsTaskController extends BaseController{
|
||||||
@ApiOperation(value = "专项工作任务详情",position = 12)
|
@ApiOperation(value = "专项工作任务详情",position = 12)
|
||||||
@GetMapping("singleWorkDetail")
|
@GetMapping("singleWorkDetail")
|
||||||
@ApiImplicitParams(value = {
|
@ApiImplicitParams(value = {
|
||||||
@ApiImplicitParam(name = "id",value = "任务接收id")
|
@ApiImplicitParam(name = "id",value = "任务接收id(OADistributionId)")
|
||||||
})
|
})
|
||||||
@PreAuthorize("hasAnyAuthority('singleWorkDetail','singleWorkDetail:update')")
|
@PreAuthorize("hasAnyAuthority('singleWorkDetail','singleWorkDetail:update')")
|
||||||
@MethodAnnotation(authorizations = {"singleWorkDetail","singleWorkDetail:update"},name = "工作要务列表")
|
@MethodAnnotation(authorizations = {"singleWorkDetail","singleWorkDetail:update"},name = "工作要务列表")
|
||||||
public SingleResult<SingleWorkVo> singleWorkDetail(@Valid IdDto idDto){
|
public SingleResult<SingleWorkVo> singleWorkDetail(@Valid IdDto idDto){
|
||||||
SingleResult<SingleWorkVo> result = new SingleResult();
|
SingleResult<SingleWorkVo> result = new SingleResult();
|
||||||
OADistribution oaDistribution = oaDistributionMapper.selectByPrimaryKey(idDto.getId());
|
OADistribution oaDistribution = oaDistributionMapper.selectDistribution(idDto.getId());
|
||||||
String sendUser = oaDistribution.getSysuserid();
|
String sendUser = oaDistribution.getSysuserid();
|
||||||
SysUser user = sysUserMapper.selectUser(sendUser);
|
SysUser user = sysUserMapper.selectUser(sendUser);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -318,6 +318,12 @@
|
||||||
<version>5.1.4</version>
|
<version>5.1.4</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
|
<artifactId>jackson-databind</artifactId>
|
||||||
|
<version>2.13.3</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
<!--分页 end-->
|
<!--分页 end-->
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user