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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
79493 2022-10-20 17:30:39 +08:00
commit 925155a57e
13 changed files with 439 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
inventory-dao/src/main/java/com/rzyc/bean/task/dto/PerRecordDto.java Normal file
View File

@ -0,0 +1,102 @@
package com.rzyc.bean.task.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @Description:
* @Author: ZQW
* @CreateTime: 2022/10/20 14:37
*/
@ApiModel("新增履职记录请求参数")
public class PerRecordDto {
@ApiModelProperty(value = "主键id")
@TableId("OADistributionId")
private String oadistributionid;
@ApiModelProperty(value = "任务id",required = true)
@TableField("OATaskId")
private String oataskid;
/* @ApiModelProperty(value = "指派用户id")
@TableField("sned_id")
private String snedId;
@ApiModelProperty(value = "接收用户id")
@TableField("SysUserId")
private String sysuserid;*/
@ApiModelProperty(value = "任务摘要")
@TableField("title")
private String title;
@ApiModelProperty(value = "任务内容")
@TableField("subject")
private String subject;
@ApiModelProperty(value = "开始时间,格式 yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("start_time")
private Date startTime;
@ApiModelProperty(value = "结束时间,格式 yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("end_time")
private Date endTime;
public String getOadistributionid() {
return oadistributionid;
}
public void setOadistributionid(String oadistributionid) {
this.oadistributionid = oadistributionid;
}
public String getOataskid() {
return oataskid;
}
public void setOataskid(String oataskid) {
this.oataskid = oataskid;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getSubject() {
return subject;
}
public void setSubject(String subject) {
this.subject = subject;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
}

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

@ -0,0 +1,38 @@
package com.rzyc.bean.task.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description:
* @Author: ZQW
* @CreateTime: 2022/10/20 10:25
*/
@ApiModel("待办任务请求参数")
public class WorkDto {
@ApiModelProperty(value = "任务id",required = true)
private String taskTypeId;
@ApiModelProperty(value = "关键词")
private String condition;
public String getTaskTypeId() {
return taskTypeId;
}
public void setTaskTypeId(String taskTypeId) {
this.taskTypeId = taskTypeId;
}
public String getCondition() {
return condition;
}
public void setCondition(String condition) {
this.condition = condition;
}
}

41
inventory-dao/src/main/java/com/rzyc/bean/task/vo/PerformanceVo.java Normal file
View File

@ -0,0 +1,41 @@
package com.rzyc.bean.task.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @Description:
* @Author: ZQW
* @CreateTime: 2022/10/20 15:48
*/
@ApiModel("履职记录返回实体")
public class PerformanceVo {
@ApiModelProperty("任务摘要")
private String title;
@ApiModelProperty(value = "开始时间,格式 yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
}

2
inventory-dao/src/main/java/com/rzyc/bean/task/vo/ThingVo.java
View File

@ -43,8 +43,6 @@ public class ThingVo {
@ApiModelProperty("结束时间")
private Date enddate;
@TableField("Subject")
@ApiModelProperty("任务内容")
private String subject;

77
inventory-dao/src/main/java/com/rzyc/bean/task/vo/WorkPriorityVo.java Normal file
View File

@ -0,0 +1,77 @@
package com.rzyc.bean.task.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
/**
* @Description:
* @Author: ZQW
* @CreateTime: 2022/10/20 10:14
*/
@ApiModel("工作要务返回实体")
public class WorkPriorityVo {
@TableId("OATaskId")
@ApiModelProperty("任务id")
private String oataskid;
@ApiModelProperty("任务摘要")
@TableField("title")
private String title;
@TableField("TaskType")
@ApiModelProperty("任务类型")
private String tasktype;
@ApiModelProperty("完成次数")
@TableField("finishNum")
private Integer finishNum = 0;
@ApiModelProperty("总次数")
@TableField("totalNum")
private Integer totalNum = 4;
public String getTasktype() {
return tasktype;
}
public void setTasktype(String tasktype) {
this.tasktype = tasktype;
}
public String getOataskid() {
return oataskid;
}
public void setOataskid(String oataskid) {
this.oataskid = oataskid;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public Integer getFinishNum() {
return finishNum;
}
public void setFinishNum(Integer finishNum) {
this.finishNum = finishNum;
}
public Integer getTotalNum() {
return totalNum;
}
public void setTotalNum(Integer totalNum) {
this.totalNum = totalNum;
}
}

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

@ -2,7 +2,10 @@ package com.rzyc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.rzyc.bean.task.dto.IdDto;
import com.rzyc.bean.task.dto.WorkDto;
import com.rzyc.bean.task.vo.PerformanceVo;
import com.rzyc.bean.task.vo.ThingVo;
import com.rzyc.bean.task.vo.WorkPriorityVo;
import com.rzyc.model.OADistribution;
import com.rzyc.model.oth.ManualLable;
import org.apache.ibatis.annotations.Param;
@ -12,6 +15,8 @@ import java.util.List;
@Repository
public interface OADistributionMapper extends BaseMapper<OADistribution> {
int deleteByPrimaryKey(String oadistributionid);
int insert(OADistribution record);
@ -44,4 +49,7 @@ public interface OADistributionMapper extends BaseMapper<OADistribution> {
List<OADistribution> getTaskList(@Param("condition")String condition,
@Param("snedId")String snedId);
//履职记录详情
List<PerformanceVo> preList(@Param("id") String id);
}

10
inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java
View File

@ -2,9 +2,8 @@ package com.rzyc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.rzyc.bean.task.dto.IdDto;
import com.rzyc.bean.task.vo.TaskDetailVo;
import com.rzyc.bean.task.vo.TaskVo;
import com.rzyc.bean.task.vo.ThingVo;
import com.rzyc.bean.task.dto.WorkDto;
import com.rzyc.bean.task.vo.*;
import com.rzyc.model.OADistribution;
import com.rzyc.model.OATask;
import org.apache.ibatis.annotations.Param;
@ -122,4 +121,9 @@ public interface OATaskMapper extends BaseMapper<OATask> {
@Param("sendId")String sendId);
TaskDetailVo selectDetail(@Param("OATaskId") String OATaskId);
//查询待办事项
List<WorkPriorityVo> workList(@Param("workDto") WorkDto workDto);
}

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

@ -35,14 +35,16 @@
<insert id="insert" parameterType="com.rzyc.model.OADistribution">
insert into OADistribution (OADistributionId, OATaskId, SysUserId,
SysChinaName, SysTelephone, AppStatus,
SysChinaName, SysTelephone, AppStatus,title,subject,start_time,end_time,
CreatedOn, CreatedBy, ModifiedOn,
ModifiedBy)
values (#{oadistributionid,jdbcType=VARCHAR}, #{oataskid,jdbcType=VARCHAR}, #{sysuserid,jdbcType=VARCHAR},
#{syschinaname,jdbcType=VARCHAR}, #{systelephone,jdbcType=VARCHAR}, #{appstatus,jdbcType=VARCHAR},
#{syschinaname,jdbcType=VARCHAR}, #{systelephone,jdbcType=VARCHAR}, #{appstatus,jdbcType=VARCHAR},#{title},#{subject},#{startTime},#{endTime},
#{createdon,jdbcType=TIMESTAMP}, #{createdby,jdbcType=VARCHAR}, #{modifiedon,jdbcType=TIMESTAMP},
#{modifiedby,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.rzyc.model.OADistribution">
insert into OADistribution
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -234,5 +236,12 @@
order by ob.end_time asc
</select>-->
<select id="preList" resultType="com.rzyc.bean.task.vo.PerformanceVo">
select od.title,od.start_time
from OADistribution od
join oatask ot
on ot.OATaskId = od.OATaskId
where ot.OATaskId = #{id}
order by od.start_time asc
</select>
</mapper>

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

@ -411,19 +411,7 @@
order by ot.EndDate asc
</select>
<select id="thingsList" resultType="com.rzyc.bean.task.vo.ThingVo">
select ot.OATaskId,ot.TaskType,ot.Subject,ot.StartDate,ot.EndDate
from oatask ot
left join oa_task_type ty
on ot.TaskType = ty.type_id
where 1=1
<if test="idDto.condition != null and idDto.condition != ''">
and ot.TaskType like #{idDto.condition}
</if>
<if test="idDto.id != null and idDto.id != ''">
and ot.TaskType like #{idDto.id}
</if>
</select>
<insert id="insertTask" parameterType="com.rzyc.model.OATask">
insert into OATask (OATaskId, TaskType,OTCId,send_id,user_id,
@ -481,6 +469,7 @@
<collection property="distributions" resultMap="OADistributionVo"/>
</resultMap>
<resultMap id="OADistributionVo" type="com.rzyc.bean.task.vo.OADistributionVo">
<id column="OADistributionId" property="oadistributionid"/>
<result column="OATaskId" property="oataskid"/>
@ -494,6 +483,13 @@
<result column="AppStatus" property="appstatus"/>
</resultMap>
<resultMap id="WorkMap" type="com.rzyc.bean.task.vo.WorkPriorityVo">
<id column="OATaskId" property="oataskid"/>
<result column="title" property="title"/>
<result column="finishNum" property="finishNum"/>
<result column="totalNum" property="totalNum"/>
</resultMap>
<select id="selectDetail" resultMap="TaskDetail">
select ot.oataskid,ot.startdate,ot.enddate,ot.title,ot.subject,od.SysChinaName,od.title,od.Subject,od.start_time,od.end_time,od.AppStatus
from OATask ot
@ -502,4 +498,33 @@
where ot.oataskid = #{OATaskId}
</select>
<select id="workList" resultType="com.rzyc.bean.task.vo.WorkPriorityVo">
select ot.OATaskId,ot.title,ot.TaskType
from oatask ot
left join oa_task_type ty
on ot.TaskType = ty.type_id
where 1=1
<if test="workDto.condition != null and workDto.condition != ''">
and ot.TaskType like #{workDto.condition}
</if>
<if test="workDto.taskTypeId != null and workDto.taskTypeId != ''">
and ot.TaskType = #{workDto.taskTypeId}
</if>
</select>
<select id="thingsList" resultType="com.rzyc.bean.task.vo.ThingVo">
select ot.OATaskId,ot.TaskType,ot.Subject,ot.StartDate,ot.EndDate
from oatask ot
left join oa_task_type ty
on ot.TaskType = ty.type_id
where 1=1
<if test="idDto.condition != null and idDto.condition != ''">
and ot.TaskType like #{idDto.condition}
</if>
<if test="idDto.id != null and idDto.id != ''">
and ot.TaskType like #{idDto.id}
</if>
</select>
</mapper>

2
inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java
View File

@ -262,7 +262,7 @@ public class PcBusinessService extends BaseController {
return singleResult;
}
public SingleResult entEquipmentTypeList(String enterpriseId){
/*public SingleResult entEquipmentTypeList(String enterpriseId){
SingleResult singleResult = new SingleResult();
List<EntDeviceType> redisEntDeviceTypes =(List<EntDeviceType>) redisUtil.get(redisUtil.appendSymbol(RedisKeys.DEVICE.getKey(),enterpriseId));
if (null != redisEntDeviceTypes && redisEntDeviceTypes.size()>0){

114
inventory-gov/src/main/java/com/rzyc/controller/AppletsTaskController.java Normal file
View File

@ -0,0 +1,114 @@
package com.rzyc.controller;
import com.common.utils.RandomNumber;
import com.common.utils.StringUtils;
import com.common.utils.model.MultiResult;
import com.common.utils.model.SingleResult;
import com.rzyc.bean.task.dto.IdDto;
import com.rzyc.bean.task.dto.PerRecordDto;
import com.rzyc.bean.task.dto.WorkDto;
import com.rzyc.bean.task.vo.PerformanceVo;
import com.rzyc.bean.task.vo.WorkPriorityVo;
import com.rzyc.mapper.OADistributionMapper;
import com.rzyc.model.OADistribution;
import com.rzyc.model.OATask;
import com.rzyc.model.task.dto.TaskAddOrUpdateDto;
import com.rzyc.model.user.SysUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.converters.DateConverter;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.Date;
import java.util.List;
/**
* @Description:
* @Author: ZQW
* @CreateTime: 2022/10/20 9:37
*/
@Api(tags = "小程序待办事项")
@CrossOrigin("*")
@RequestMapping("applets")
@RestController
@Validated
public class AppletsTaskController extends BaseController{
/**
* @Description: 工作要务列表
* @Author ZQW
* @CreateTime 2022/10/20 10:19
*/
@ApiOperation(value = "工作要务列表",position = 1)
@GetMapping("workList")
public MultiResult<WorkPriorityVo> workList(@Valid WorkDto workDto){
MultiResult<WorkPriorityVo> result = new MultiResult<>();
List<WorkPriorityVo> workList = oaTaskMapper.workList(workDto);
System.out.println("查询的数据=====" + workList);
result.setData(workList);
return result;
}
/**
* @return: 新增或修改履职记录
* @Author: ZQW
* @Date: 2022/9/20
*/
@ApiOperation(value = "新增或修改履职记录",position = 2)
@PostMapping("addExecute")
public SingleResult<String> addExecute(@Valid PerRecordDto perRecordDto) throws Exception{
SingleResult<String> result = new SingleResult<>();
OADistribution oaDistribution = new OADistribution();
BeanUtils.copyProperties(oaDistribution,perRecordDto);
//日期格式转换
ConvertUtils.register(new DateConverter(null), Date.class);
OATask oaTask = oaTaskMapper.findById(perRecordDto.getOataskid());
System.out.println("任务 ========" + oaTask);
if(null == oaTask){
result.setCode(0);
result.setMessage("未知任务");
return result;
}
if(StringUtils.isBlank(perRecordDto.getOadistributionid())){
oaDistribution.setOadistributionid(RandomNumber.getUUid());
oaDistribution.setCreatedby(getChinaName());
oaDistribution.setCreatedon(new Date());
oaDistributionMapper.insert(oaDistribution);
System.out.println("插入的数据===" + oaDistribution);
}else {
oaDistribution.setModifiedby(getChinaName());
oaDistribution.setModifiedon(new Date());
oaDistributionMapper.updateById(oaDistribution);
System.out.println("修改的数据===" + oaDistribution);
}
return result;
}
/**
* @Description: 履职记录列表
* @Author ZQW
* @CreateTime 2022/10/20 15:35
*/
@ApiOperation(value = "履职记录列表",position = 3)
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id",value = "任务1id")
})
@GetMapping("preList")
public MultiResult<PerformanceVo> preList(@Valid IdDto idDto){
MultiResult<PerformanceVo> result = new MultiResult<>();
List<PerformanceVo> preList = oaDistributionMapper.preList(idDto.getId());
result.setData(preList);
return result;
}
}

1
inventory-gov/src/main/java/com/rzyc/controller/OtherController.java
View File

@ -517,7 +517,6 @@ public class OtherController extends BaseController{
}
if(sysOrgs.size() > 0){
//处理树形结构

1
inventory-gov/src/main/java/com/rzyc/controller/TaskController.java
View File

@ -91,6 +91,7 @@ public class TaskController extends BaseController{
public MultiResult<ThingVo> thingsList(@Valid IdDto idDto){
MultiResult<ThingVo> result = new MultiResult<>();
List<ThingVo> thingVos = oaTaskMapper.thingsList(idDto);
System.out.println("查询的数据=====" + thingVos);
result.setData(thingVos);
return result;
}