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

参与任务人员姓名显示1

Browse Source
This commit is contained in:
zhengqiaowen 2022-11-17 09:35:20 +08:00
parent 3db6f52825
commit 72d3215c49
10 changed files with 110 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inventory-dao/src/main/java/com/rzyc/bean/task/dto/DeliverDto.java
View File

@ -15,9 +15,6 @@ public class DeliverDto {
@ApiModelProperty(value = "任务id",required = true)
private String OATaskId;
/*@ApiModelProperty(value = "任务分配id")
private String OADistributionId;*/
@ApiModelProperty(value = "发送人id",required = true)
private String send_id;

27
inventory-dao/src/main/java/com/rzyc/bean/task/vo/ImplementationVo.java
View File

@ -16,8 +16,8 @@ import java.util.Date;
@ApiModel("查看发布人任务执行情况")
public class ImplementationVo {
@ApiModelProperty("用户id")
private String OADistributionId;
@ApiModelProperty("任务分配id")
private String oADistributionId;
@ApiModelProperty("任务id")
private String oataskid;
@ -45,15 +45,23 @@ public class ImplementationVo {
@ApiModelProperty("任务内容")
private String subject;
@ApiModelProperty("任务内容")
private Integer AppStatus;
@ApiModelProperty("1、未执行 2、执行中 3、执行完成")
private Integer appStatus;
public String getoADistributionId() {
return oADistributionId;
}
public void setoADistributionId(String oADistributionId) {
this.oADistributionId = oADistributionId;
}
public Integer getAppStatus() {
return AppStatus;
return appStatus;
}
public void setAppStatus(Integer appStatus) {
AppStatus = appStatus;
this.appStatus = appStatus;
}
public String getOataskid() {
@ -64,13 +72,6 @@ public class ImplementationVo {
this.oataskid = oataskid;
}
public String getOADistributionId() {
return OADistributionId;
}
public void setOADistributionId(String OADistributionId) {
this.OADistributionId = OADistributionId;
}
public String getSysuserId() {
return sysuserId;

13
inventory-dao/src/main/java/com/rzyc/bean/task/vo/NameVo.java
View File

@ -13,9 +13,12 @@ import io.swagger.annotations.ApiModelProperty;
@ApiModel("参与人员姓名返回实体类")
public class NameVo {
@ApiModelProperty("姓名")
@ApiModelProperty("姓名（中文名）")
private String name;
@ApiModelProperty("职务")
private String sysDeptName;
public String getName() {
return name;
}
@ -23,4 +26,12 @@ public class NameVo {
public void setName(String name) {
this.name = name;
}
public String getSysDeptName() {
return sysDeptName;
}
public void setSysDeptName(String sysDeptName) {
this.sysDeptName = sysDeptName;
}
}

20
inventory-dao/src/main/java/com/rzyc/bean/task/vo/TaskDetailVo.java
View File

@ -24,6 +24,8 @@ public class TaskDetailVo {
@ApiModelProperty("任务id")
private String oataskid;
@ApiModelProperty("任务id")
private String taskType;
@TableField("StartDate")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd ")
@ -35,6 +37,8 @@ public class TaskDetailVo {
@ApiModelProperty("结束时间")
private Date enddate;
@ApiModelProperty("任务发布人id")
private String sendId;
@ApiModelProperty("任务名称")
private String remark;
@ -48,6 +52,22 @@ public class TaskDetailVo {
@ApiModelProperty("任务接收人完成情况")
private List<OADistributionVo> distributions = new ArrayList<>();
public String getTaskType() {
return taskType;
}
public String getSendId() {
return sendId;
}
public void setSendId(String sendId) {
this.sendId = sendId;
}
public void setTaskType(String taskType) {
this.taskType = taskType;
}
public String getWorkState() {
return workState;
}

5
inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java
View File

@ -6,6 +6,7 @@ import com.rzyc.bean.task.vo.*;
import com.rzyc.model.OADistribution;
import com.rzyc.model.oth.ManualLable;
import com.rzyc.model.task.dto.TaskAddOrUpdateDto;
import com.rzyc.model.user.SysUser;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@ -69,5 +70,7 @@ public interface OADistributionMapper extends BaseMapper<OADistribution> {
OADistribution selectDistribution(@Param("oaDistributionId") String oaDistributionId);
//查看接收任务状态
List<ImplementationVo> selectImplementation(@Param("deliverDto") DeliverDto deliverDto,@Param("status") Integer status);
List<ImplementationVo> selectImplementation(@Param("deliverDto") DeliverDto deliverDto);
List<NameVo> selectJoinUser(@Param("addWorkDto") AddWorkDto addWorkDto);
}

2
inventory-dao/src/main/java/com/rzyc/mapper/OaTaskTypeMapper.java
View File

@ -17,4 +17,6 @@ public interface OaTaskTypeMapper {
List<OaTaskType> findBySortId();
OaTaskType selectById(@Param("typeId") String typeId);
List<OaTaskType> selectFull();
}

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

@ -322,6 +322,15 @@
from OADistribution od
join sysuser su
on od.SysUserId = su.SysUserId
where od.sned_id = #{deliverDto.send_id} and od.OATaskId = #{deliverDto.OATaskId} and od.AppStatus = #{status}
where od.sned_id = #{deliverDto.send_id} and od.OATaskId = #{deliverDto.OATaskId}
</select>
<!--查询任务参与人姓名-->
<select id="selectJoinUser" resultType="com.rzyc.bean.task.vo.NameVo">
select su.SysDeptName,su.ChinaName as name
from OADistribution od
join sysuser su
on od.SysUserId = su.SysUserId
where od.OATaskId = #{addWorkDto.oaTaskId}
</select>
</mapper>

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

@ -472,6 +472,8 @@
<!--定义resultMap-->
<resultMap id="TaskDetail" type="com.rzyc.bean.task.vo.TaskDetailVo">
<id column="OATaskId" property="oataskid"/>
<result column="TaskType" property="taskType"/>
<result column="SendId" property="sendId"/>
<result column="StartDate" property="startdate"/>
<result column="EndDate" property="enddate"/>
<result column="remark" property="remark"/>
@ -496,7 +498,7 @@
<!--发布任务详情-->
<select id="selectDetail" resultMap="TaskDetail">
select ot.oataskid,ot.title as remark,ot.subject as content,ot.startdate,ot.enddate,ot.AppStatus as workState,od.*
select ot.oataskid,ot.taskType,ot.send_id as sendId,ot.title as remark,ot.subject as content,ot.startdate,ot.enddate,ot.AppStatus as workState,od.*
from OATask ot
left join OADistribution od
on ot.oataskid = od.oataskid

4
inventory-dao/src/main/resources/mapper/OaTaskTypeMapper.xml
View File

@ -113,4 +113,8 @@
<select id="selectById" resultMap="BaseResultMap">
select tt.* from oa_task_type tt where tt.type_id = #{typeId}
</select>
<select id="selectFull" resultType="com.rzyc.model.OaTaskType">
select tt.* from oa_task_type tt
</select>
</mapper>

42
inventory-gov/src/main/java/com/rzyc/controller/WorkController.java
View File

@ -10,6 +10,7 @@ import com.rzyc.config.MethodAnnotation;
import com.rzyc.mapper.OATaskMapper;
import com.rzyc.model.OADistribution;
import com.rzyc.model.OATask;
import com.rzyc.model.OaTaskType;
import com.rzyc.model.OaTaskUser;
import com.rzyc.model.task.dto.TaskAddOrUpdateDto;
import com.rzyc.model.user.SysUser;
@ -21,6 +22,7 @@ import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.converters.DateConverter;
import org.apache.commons.beanutils.converters.SqlDateConverter;
import org.apache.poi.ss.formula.functions.Na;
import org.springframework.beans.propertyeditors.CustomDateEditor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@ -446,7 +448,45 @@ public class WorkController extends BaseController{
@MethodAnnotation(authorizations = {"selectImplementation","selectImplementation:update"},name = "查看发布人任务执行情况")
public MultiResult<ImplementationVo> selectImplementation(@Valid DeliverDto deliverDto){
MultiResult<ImplementationVo> result = new MultiResult();
List<ImplementationVo> list = oaDistributionMapper.selectImplementation(deliverDto,2);
List<ImplementationVo> list = oaDistributionMapper.selectImplementation(deliverDto);
result.setData(list);
return result;
}
/**
* @Description: 查询任务类型id
* @Author ZQW
* @CreateTime 2022/11/16 10:07
*/
@ApiOperation(value = "查询任务类型id",position = 20)
@GetMapping ("selectTypeId")
@PreAuthorize("hasAnyAuthority('selectTypeId','selectTypeId:update')")
@MethodAnnotation(authorizations = {"selectTypeId","selectTypeId:update"},name = "查询任务类型id")
public MultiResult<OaTaskType> selectTypeId(){
MultiResult<OaTaskType> result = new MultiResult();
List<OaTaskType> list = oaTaskTypeMapper.selectFull();
result.setData(list);
return result;
}
/**
* @Description: 查询参与人员姓名
* @Author ZQW
* @CreateTime 2022/11/16 11:19
*/
@ApiOperation(value = "查询参与人员姓名",position = 21)
@GetMapping ("selectName")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "userId",value = "任务发送人id",required = true)
})
@PreAuthorize("hasAnyAuthority('selectName','selectName:update')")
@MethodAnnotation(authorizations = {"selectName","selectName:update"},name = "查询参与人员姓名")
public MultiResult<NameVo> selectName(@Valid AddWorkDto addWorkDto){
MultiResult<NameVo> result = new MultiResult();
List<NameVo> nameVos = new ArrayList<>();
List<NameVo> list = oaDistributionMapper.selectJoinUser(addWorkDto);
result.setData(list);
return result;
}