diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/AddTaskDto.java b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/AddTaskDto.java index eedc54e..5bb39af 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/AddTaskDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/AddTaskDto.java @@ -63,6 +63,17 @@ public class AddTaskDto { @ApiModelProperty(value = "任务内容",required = true) private String subject; + @TableField("file") + @ApiModelProperty("文件地址") + private String file; + + public String getFile() { + return file; + } + + public void setFile(String file) { + this.file = file; + } public String getOataskid() { return oataskid; diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/DeliverDto.java b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/DeliverDto.java index d7ac665..b24917c 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/dto/DeliverDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/dto/DeliverDto.java @@ -15,7 +15,7 @@ public class DeliverDto { @ApiModelProperty(value = "任务id",required = true) private String OATaskId; - @ApiModelProperty(value = "发送人id",required = true) + @ApiModelProperty(value = "发送人id",required = false) private String send_id; public String getOATaskId() { diff --git a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ReceiveTaskVo.java b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ReceiveTaskVo.java index 1b50656..29e1c32 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ReceiveTaskVo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/task/vo/ReceiveTaskVo.java @@ -43,6 +43,8 @@ public class ReceiveTaskVo { @ApiModelProperty("任务要求") private String content; + @ApiModelProperty("1、未执行 2、执行中 3、执行完成") + private String taskState; @ApiModelProperty("任务接收人完成情况") private OADistributionVo oaDistributionVo; @@ -52,6 +54,14 @@ public class ReceiveTaskVo { return oaDistributionVo; } + public String getTaskState() { + return taskState; + } + + public void setTaskState(String taskState) { + this.taskState = taskState; + } + public void setOaDistributionVo(OADistributionVo oaDistributionVo) { this.oaDistributionVo = oaDistributionVo; } diff --git a/inventory-dao/src/main/java/com/rzyc/model/OADistribution.java b/inventory-dao/src/main/java/com/rzyc/model/OADistribution.java index 2c54a07..139431e 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/OADistribution.java +++ b/inventory-dao/src/main/java/com/rzyc/model/OADistribution.java @@ -75,6 +75,10 @@ public class OADistribution implements Serializable { @TableField("AppStatus") private String appstatus; + @TableField("file") + @ApiModelProperty("文件地址") + private String file; + @ApiModelProperty("创建时间") @TableField("CreatedOn") private Date createdon; @@ -94,6 +98,14 @@ public class OADistribution implements Serializable { private static final long serialVersionUID = 1L; + public String getFile() { + return file; + } + + public void setFile(String file) { + this.file = file; + } + public Date getFlowTime() { return flowTime; } diff --git a/inventory-dao/src/main/java/com/rzyc/model/OATask.java b/inventory-dao/src/main/java/com/rzyc/model/OATask.java index 4c7e177..1e6ad71 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/OATask.java +++ b/inventory-dao/src/main/java/com/rzyc/model/OATask.java @@ -96,6 +96,9 @@ public class OATask implements Serializable { @ApiModelProperty("任务完成状态") private String isfinish; + @TableField("file") + @ApiModelProperty("文件地址") + private String file; @TableField("CreatedOn") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @@ -159,6 +162,15 @@ public class OATask implements Serializable { @ApiModelProperty("任务接收人") private List distributions = new ArrayList<>(); + + public String getFile() { + return file; + } + + public void setFile(String file) { + this.file = file; + } + public String getUserId() { return userId; } diff --git a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml index 4966daa..4904c31 100644 --- a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml @@ -167,7 +167,7 @@ insert into OADistribution (OADistributionId, OATaskId, SysUserId, - SysChinaName, SysTelephone, title,subject,flow_time,flow_state,start_time,end_time,AppStatus, + SysChinaName, SysTelephone, title,subject,flow_time,flow_state,start_time,end_time,AppStatus,file CreatedOn, CreatedBy, ModifiedOn, ModifiedBy) values @@ -175,7 +175,7 @@ (#{record.oadistributionid,jdbcType=VARCHAR}, #{record.oataskid,jdbcType=VARCHAR}, #{record.sysuserid,jdbcType=VARCHAR}, #{record.syschinaname,jdbcType=VARCHAR}, #{record.systelephone,jdbcType=VARCHAR}, #{record.title},#{record,subject}, - #{record.flowTime},#{record.flowState},#{record.startTime},#{record.endTime},#{record.appstatus,jdbcType=VARCHAR}, + #{record.flowTime},#{record.flowState},#{record.startTime},#{record.endTime},#{record.appstatus,jdbcType=VARCHAR},#{record.file}, #{record.createdon,jdbcType=TIMESTAMP}, #{record.createdby,jdbcType=VARCHAR}, #{record.modifiedon,jdbcType=TIMESTAMP}, #{record.modifiedby,jdbcType=VARCHAR}) @@ -322,7 +322,7 @@ from OADistribution od join sysuser su on od.SysUserId = su.SysUserId - where od.sned_id = #{deliverDto.send_id} and od.OATaskId = #{deliverDto.OATaskId} + where od.OATaskId = #{deliverDto.OATaskId} diff --git a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml index ff9ba36..ccfbe77 100644 --- a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml @@ -418,7 +418,7 @@ SysPercent, StartDate, EndDate, PlanEndDate, AppStatus,title, Subject, Frequency, - IsFinish, del_state, + IsFinish, del_state,file, CreatedOn, CreatedBy, ModifiedOn, ModifiedBy ) @@ -433,7 +433,7 @@ #{oaTask.title,jdbcType=VARCHAR}, #{oaTask.subject,jdbcType=VARCHAR}, #{oaTask.frequency,jdbcType=BIGINT}, - #{oaTask.isfinish,jdbcType=VARCHAR}, + #{oaTask.isfinish,jdbcType=VARCHAR},#{oaTask.file}, #{oaTask.delState,jdbcType=VARCHAR},#{oaTask.createdon,jdbcType=TIMESTAMP}, #{oaTask.createdby,jdbcType=VARCHAR}, #{oaTask.modifiedon,jdbcType=TIMESTAMP}, #{oaTask.modifiedby,jdbcType=VARCHAR} ) @@ -447,7 +447,8 @@ on od.OATaskId = ot.OATaskId join sysuser u on ot.send_id = u.SysUserId join oa_task_type ty on ot.TaskType = ty.type_id - where ot.subject like #{condition} and od.sned_id = #{sendId} + where ot.subject like #{condition} and ot.send_id = #{sendId} + GROUP BY ot.OATaskId order by ot.EndDate asc @@ -513,6 +514,7 @@ + @@ -531,7 +533,7 @@