guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改任务审批及任务包详情添加审查日志

Browse Source
pull/1/head
sunchenliang 1 year ago
parent c58a6123ac
commit 4bde6ffd72
8 changed files with 64 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
Unescape View File

@ -543,7 +543,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
//保存当前审批用户与业务表的关系
userapproveService.save(userToken.getUserid(),taskVO,task);
userapproveService.save(userToken,taskVO,task);
return true;

9
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataobject/Userapprove.java
Unescape View File

@ -66,6 +66,15 @@ public class Userapprove implements BaseDto,java.io.Serializable {
@Schema(description = "节点编号")
@TableField(value="TASKNO")
private String taskno;
@Schema(description = "用户名称")
@TableField(value="USERNAME")
private String username;
@Schema(description = "创建时间")
@TableField(value="CREATEDATE")
private Long createdate;
@Schema(description = "审批意见")
@TableField(value="TASKCOMMENT")
private String taskcomment;
//保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false)

3
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/UserapproveService.java
Unescape View File

@ -1,6 +1,7 @@
package cn.jyjz.xiaoyao.oa.from.service;
import cn.jyjz.flowable.domain.vo.FlowTaskVO;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove;
import org.flowable.task.api.Task;
@ -16,7 +17,7 @@ public interface UserapproveService extends BaseService<Userapprove> {
* @param formid 业务表单主键
* @return 成功返回true，否则返回false
*/
public boolean save(String userid, FlowTaskVO taskVO, Task task );
public boolean save(UserToken userToken, FlowTaskVO taskVO, Task task );
/**
* 删除审批人员于业务表单的关联

66
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java
Unescape View File

@ -1,6 +1,7 @@
package cn.jyjz.xiaoyao.oa.from.service.impl;
import cn.jyjz.flowable.domain.vo.FlowTaskVO;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
import cn.jyjz.xiaoyao.oa.from.dataDao.UserapproveMybatisDao;
import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove;
@ -12,37 +13,40 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 业务层实现
*/
* 业务层实现
*/
@Service
@Slf4j
public class UserapproveServiceImpl extends BaseServiceImpl<UserapproveMybatisDao, Userapprove> implements UserapproveService {
@Autowired
private UserapproveMybatisDao userapprovemybatisdao;
@Override
public boolean save(String userid, FlowTaskVO taskVO, Task taskd) {
Userapprove userapprove = new Userapprove();
userapprove.setUserid(Long.parseLong(userid));
userapprove.setFormid(Long.parseLong(taskVO.getFormid()));
userapprove.setTaskname(taskd.getName());
if(taskVO.getApprovd()){
userapprove.setStatshis(2);
}else{
userapprove.setStatshis(3);
}
return this.save(userapprove);
}
@Override
public boolean delete(String formid) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("FORMID",formid);
return this.remove(queryWrapper);
}
public class UserapproveServiceImpl extends BaseServiceImpl<UserapproveMybatisDao, Userapprove> implements UserapproveService {
@Autowired
private UserapproveMybatisDao userapprovemybatisdao;
@Override
public boolean save(UserToken userToken, FlowTaskVO taskVO, Task taskd) {
Userapprove userapprove = new Userapprove();
userapprove.setUserid(Long.parseLong(userToken.getUserid()));
userapprove.setFormid(Long.parseLong(taskVO.getFormid()));
userapprove.setTaskname(taskd.getName());
userapprove.setTaskcomment(taskVO.getTaskComment());
userapprove.setCreatedate(System.currentTimeMillis());
userapprove.setUsername(userToken.getUsername());
if (taskVO.getApprovd()) {
userapprove.setStatshis(2);
} else {
userapprove.setStatshis(3);
}
return this.save(userapprove);
}
@Override
public boolean delete(String formid) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("FORMID", formid);
return this.remove(queryWrapper);
}
}

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java
Unescape View File

@ -1,6 +1,5 @@
package cn.jyjz.xiaoyao.ocr.dataDao;
import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -41,4 +40,5 @@ public interface OcrTaskchildPictureMybatisDao extends BaseMapper<OcrTaskchildPi
* @return
*/
Long listmytaskCount(Map<String, Object> query);
}

5
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java
Unescape View File

@ -8,6 +8,7 @@ import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@ -219,6 +220,10 @@ public class OcrTaskchildPicture implements BaseDto,java.io.Serializable {
@ApiModelProperty(value ="图片对象")
@TableField(exist = false)
private OcrPicture ocrPicture;
@ApiModelProperty(value ="审查日志")
@TableField(exist = false)
private List<Userapprove> userapproveList;
//保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false)

10
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
Unescape View File

@ -7,6 +7,8 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat;
import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove;
import cn.jyjz.xiaoyao.oa.from.service.UserapproveService;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskchildPictureMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
@ -44,6 +46,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
@Resource
IFlowTaskService iFlowTaskService;
@Resource
private UserapproveService userapproveService;
/**
* 图片真假设置
*
@ -292,6 +297,11 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
*/
public OcrTaskchildPicture listPicturePackageId(String fromid, Long packageid) {
OcrTaskchildPicture ocrTaskchildPicture = this.getById(fromid);
if (ocrTaskchildPicture == null) {
return new OcrTaskchildPicture();
}
List<Userapprove> list = userapproveService.list(new LambdaQueryWrapper<Userapprove>().eq(Userapprove::getFormid, fromid));
ocrTaskchildPicture.setUserapproveList(list);
//查询图片对象
OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid());

1
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
Unescape View File

@ -248,4 +248,5 @@ select tcp.* from (
) as tcp
<include refid="Base_Where_union"></include>
</select>
</mapper>

Write Preview
Loading…
Cancel
Save