yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

oaMendApply申请新增修改为与oaform表单关联的方法，重构新增修改方法

master
dimengzhe 4 months ago
parent
f90d3d2667
commit
71c48a2143
11 changed files with 187 additions and 191 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java
  2. 10
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml
  3. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java
  4. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java
  5. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
  6. 20
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.java
  7. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.xml
  8. 90
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsService.java
  9. 7
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java
  10. 42
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java
  11. 194
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java

2
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java
View File

@ -36,4 +36,6 @@ public interface OaAppendixMapper extends BaseMapper<OaAppendix> {
@Select("select * from oa_appendix where linkSid = #{linkSid}")
List<OaAppendix> fetchByLinkSid(String linkSid);
int deleteByLinkSid(String sid);
}

10
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml
View File

@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.oa.biz.oaappendix.OaAppendixMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<delete id="deleteByLinkSid">
delete
from oa_appendix
where linkSid = #{sid}
</delete>
</mapper>

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java
View File

@ -36,4 +36,8 @@ public class OaAppendixService extends MybatisBaseService<OaAppendixMapper, OaAp
public List<OaAppendix> fetchByLinkSid(String linkSid) {
return baseMapper.fetchByLinkSid(linkSid);
}
public int deleteByLinkSid(String sid) {
return baseMapper.deleteByLinkSid(sid);
}
}

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java
View File

@ -44,10 +44,6 @@ public class OaForm extends BaseEntity {
private String createOrgSid;
@ApiModelProperty("创建组织")
private String createOrgName;
@ApiModelProperty("图片，冗余字段")
private String imgs;
@ApiModelProperty("附件，冗余字段")
private String appendixs;
@ApiModelProperty("关联审批单")
private String linkFormSids;

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
View File

@ -18,6 +18,7 @@ public class OaFormDto {
private String createBySid;
@ApiModelProperty("创建人")
private String createByName;
private String billNo;
@ApiModelProperty("公司sid")
private String useOrgSid;
@ApiModelProperty("公司名称")

20
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.java
View File

@ -32,8 +32,6 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetails;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsVo;
import java.util.List;
@ -53,13 +51,13 @@ import java.util.List;
@Mapper
public interface OaHireDetailsMapper extends BaseMapper<OaHireDetails> {
//@Update("update oa_hire_details set name=#{msg} where id=#{id}")
//IPage<OaHireDetailsVo> voPage(IPage<OaHireDetails> page, @Param(Constants.WRAPPER) QueryWrapper<OaHireDetails> qw);
IPage<OaHireDetailsVo> selectPageVo(IPage<OaHireDetails> page, @Param(Constants.WRAPPER) Wrapper<OaHireDetails> qw);
List<OaHireDetailsVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<OaHireDetails> qw);
@Select("select * from oa_hire_details")
List<OaHireDetailsVo> selectListVo();
//@Update("update oa_hire_details set name=#{msg} where id=#{id}")
//IPage<OaHireDetailsVo> voPage(IPage<OaHireDetails> page, @Param(Constants.WRAPPER) QueryWrapper<OaHireDetails> qw);
IPage<OaHireDetailsVo> selectPageVo(IPage<OaHireDetails> page, @Param(Constants.WRAPPER) Wrapper<OaHireDetails> qw);
List<OaHireDetailsVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<OaHireDetails> qw);
@Select("select * from oa_hire_details")
List<OaHireDetailsVo> selectListVo();
}

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.xml
View File

@ -3,11 +3,11 @@
<mapper namespace="com.yxt.anrui.oa.biz.oahiredetails.OaHireDetailsMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsVo">
<select id="selectPageVo" resultType="com.yxt.anrui.oa.biz.oahiredetails.OaHireDetailsVo">
SELECT * FROM oa_hire_details <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsVo">
<select id="selectListAllVo" resultType="com.yxt.anrui.oa.biz.oahiredetails.OaHireDetailsVo">
SELECT * FROM oa_hire_details <where> ${ew.sqlSegment} </where>
</select>
</mapper>

90
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsService.java
View File

@ -34,12 +34,6 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetails;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsQuery;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsVo;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsDetailsVo;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsDto;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsFeign;
import org.springframework.stereotype.Service;
@ -60,51 +54,51 @@ import java.util.List;
*/
@Service
public class OaHireDetailsService extends MybatisBaseService<OaHireDetailsMapper, OaHireDetails> {
private QueryWrapper<OaHireDetails> createQueryWrapper(OaHireDetailsQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<OaHireDetails> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<OaHireDetailsVo> listPageVo(PagerQuery<OaHireDetailsQuery> pq) {
OaHireDetailsQuery query = pq.getParams();
QueryWrapper<OaHireDetails> qw = createQueryWrapper(query);
IPage<OaHireDetails> page = PagerUtil.queryToPage(pq);
IPage<OaHireDetailsVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<OaHireDetailsVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(OaHireDetailsDto dto){
private QueryWrapper<OaHireDetails> createQueryWrapper(OaHireDetailsQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<OaHireDetails> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<OaHireDetailsVo> listPageVo(PagerQuery<OaHireDetailsQuery> pq) {
OaHireDetailsQuery query = pq.getParams();
QueryWrapper<OaHireDetails> qw = createQueryWrapper(query);
IPage<OaHireDetails> page = PagerUtil.queryToPage(pq);
IPage<OaHireDetailsVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<OaHireDetailsVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(OaHireDetailsDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(OaHireDetailsDto dto){
OaHireDetails entity = new OaHireDetails();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(OaHireDetailsDto dto){
String dtoSid = dto.getSid();
return;
}
this.updateByDto(dto);
}
public void insertByDto(OaHireDetailsDto dto) {
OaHireDetails entity = new OaHireDetails();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(OaHireDetailsDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
OaHireDetails entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public OaHireDetailsDetailsVo fetchDetailsVoBySid(String sid){
OaHireDetails entity = fetchBySid(sid);
OaHireDetailsDetailsVo vo = new OaHireDetailsDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}
OaHireDetails entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public OaHireDetailsDetailsVo fetchDetailsVoBySid(String sid) {
OaHireDetails entity = fetchBySid(sid);
OaHireDetailsDetailsVo vo = new OaHireDetailsDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

7
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java
View File

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.oa.biz.oamendapply;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.anrui.oa.biz.oaform.OaForm;
import com.yxt.common.core.domain.BaseEntity;
@ -35,6 +36,7 @@ import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.data.annotation.Transient;
/**
* Project: yxt-oa(补卡申请) <br/>
@ -52,12 +54,15 @@ import lombok.Data;
@Data
@ApiModel(value = "补卡申请", description = "补卡申请")
@TableName("oa_mend_apply")
public class OaMendApply extends OaForm {
public class OaMendApply extends BaseEntity {
private static final long serialVersionUID = 1L;
private String formSid;
@ApiModelProperty("补卡时间")
private String time;
@TableField(exist = false)
private OaForm oaForm = new OaForm();
/* @ApiModelProperty("单据编号")
private String billNo;

42
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java
View File

@ -55,39 +55,41 @@ import lombok.Data;
@ApiModel(value = "补卡申请 数据传输对象", description = "补卡申请 数据传输对象")
public class OaMendApplyDto implements Dto {
private String sid; // sid
private String userSid;
private static final long serialVersionUID = -4536006302677264298L;
private String sid;
private String createBySid;
private String orgPath;
@ApiModelProperty("补卡原因")
private String remarks;
@ApiModelProperty("单据编号")
@ApiModelProperty("补卡时间")
private String time;
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
/* @ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("申请人")
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("申请部门sid")
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("补卡时间")
private String time;
@ApiModelProperty("分公司sid")
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司名称")
@ApiModelProperty("分公司名称")
private String useOrgName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime;
@ApiModelProperty("实例id")
@ApiModelProperty("实例id")
private String procInstId;
@ApiModelProperty("流程定义id")
@ApiModelProperty("流程定义id")
private String procDefId;
@ApiModelProperty("任务id")
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("环节id")
@ApiModelProperty("环节id")
private String nodeId;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
@ApiModelProperty("流程状态")
private String nodeState;*/
}

194
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java
View File

@ -66,6 +66,7 @@ import com.yxt.common.core.vo.PagerVo;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -106,7 +107,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
return p;
}
public String saveOrUpdateDtoOld(OaMendApplyDto dto) {
/* public String saveOrUpdateDtoOld(OaMendApplyDto dto) {
String dtoSid = dto.getSid();
List<String> files = dto.getFiles();
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
@ -156,7 +157,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
}
this.updateByDto(dto);
return dtoSid;
}
}*/
@Transactional
public ResultBean<String> saveOrUpdateDto(OaMendApplyDto dto) {
@ -167,24 +168,46 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
if (StringUtils.isBlank(sid)) {
// 新建操作
OaMendApply entity = new OaMendApply();
// 获取组织和部门信息
setOrgAndDeptInfo(dto);
BeanUtil.copyProperties(dto, entity, "sid");
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
String deptName = "";
String deptSid = "";
List<String> split = Arrays.asList(dto.getOrgPath().split("/"));
if (split.size() > 1) {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
// 生成单据编号
String billNo = generateBillNo(dto);
dto.setBillNo(billNo);
String billNo = "QJSQ" + useOrgSid + DateUtil.format(DateUtil.date(), "yyyyMM");
String i = baseMapper.selectNum(billNo);
if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(billNo, 0);
}
// 复制 DTO 数据到实体
BeanUtil.copyProperties(dto, entity, "sid");
entity.setCreateBySid(dto.getUserSid());
OaForm oaForm = entity.getOaForm();
BeanUtil.copyProperties(dto, oaForm, "sid", "remarks");
oaForm.setUseOrgSid(useOrgSid);
oaForm.setUseOrgName(organizationVo.getName());
oaForm.setDeptSid(deptSid);
oaForm.setDeptName(deptName);
oaForm.setBillNo(billNo);
// 获取用户信息
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
entity.setCreateByName(sysUserVo.getName());
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getCreateBySid()).getData();
oaForm.setCreateByName(sysUserVo.getName());
// 创建 OA 表单
OaFormDto oaFormDto = createOaForm(dto, sysUserVo);
OaFormDto oaFormDto = new OaFormDto();
BeanUtil.copyProperties(oaForm, oaFormDto, "sid");
ResultBean<String> resultBean = oaFormService.saveOrUpdateForm(oaFormDto);
if (!resultBean.getSuccess()) {
@ -196,6 +219,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
// 处理附件
saveFiles(sid, files);
sid = entity.getSid();
} else {
// 更新操作
OaMendApply entity = fetchBySid(sid);
@ -206,54 +230,13 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
return rb.success().setData(sid);
}
// 获取组织和部门信息
private void setOrgAndDeptInfo(OaMendApplyDto dto) {
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
dto.setUseOrgSid(useOrgSid);
dto.setUseOrgName(organizationVo.getName());
String deptName = "";
String deptSid = "";
List<String> split = Arrays.asList(dto.getOrgPath().split("/"));
if (split.size() > 1) {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
dto.setDeptSid(deptSid);
dto.setDeptName(deptName);
}
// 生成单据编号
private String generateBillNo(OaMendApplyDto dto) {
String billNo = "QJSQ" + dto.getUseOrgSid() + DateUtil.format(DateUtil.date(), "yyyyMM");
String i = baseMapper.selectNum(billNo);
if (StringUtils.isNotBlank(i)) {
return Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
}
return Rule.getBillNo(billNo, 0);
}
// 创建 OA 表单
private OaFormDto createOaForm(OaMendApplyDto dto, SysUserVo sysUserVo) {
OaFormDto oaFormDto = new OaFormDto();
BeanUtil.copyProperties(dto, oaFormDto, "sid");
oaFormDto.setNodeState("待提交");
oaFormDto.setCreateBySid(dto.getUserSid());
oaFormDto.setCreateByName(sysUserVo.getName());
return oaFormDto;
}
// 保存文件
private void saveFiles(String sid, List<String> files) {
if (files == null || files.isEmpty()) {
return; // 如果没有文件，不做任何操作
}
oaAppendixService.deleteByLinkSid(sid);
for (String file : files) {
String filePath = file.replace(fileUploadComponent.getUrlPrefix(), "");
OaAppendix oaAppendix = new OaAppendix();
@ -264,28 +247,6 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
}
}
public String insertByDto(OaMendApplyDto dto) {
OaMendApply entity = new OaMendApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
entity.setCreateBySid(dto.getUserSid());
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
entity.setCreateByName(sysUserVo.getName());
baseMapper.insert(entity);
return entity.getSid();
}
public void updateByDto(OaMendApplyDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
OaMendApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public OaMendApplyDetailsVo fetchDetailsVoBySid(String sid) {
OaMendApply entity = fetchBySid(sid);
OaMendApplyDetailsVo vo = new OaMendApplyDetailsVo();
@ -313,12 +274,14 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
//新增修改保存
String businessSid = saveOrUpdateDto(dto).getData();
oaMendApply = fetchBySid(businessSid);
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid());
oaMendApply.setOaForm(oaForm);
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
//用户的部门全路径sid
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(oaMendApply.getDeptSid()).getData();
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(oaMendApply.getOaForm().getDeptSid()).getData();
bv.setOrgSidPath(deptVo.getOrgSidPath());
//业务sid
bv.setBusinessSid(businessSid);
@ -333,7 +296,10 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
//流程定义id
bv.setModelId(ProcDefEnum.OAMENDAPPLY.getProDefId());
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaMendApply.getDeptSid()).getData();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaMendApply.getOaForm().getDeptSid()).getData();
if(StringUtils.isBlank(organizationVo.getManagerSid())){
return rb.setMsg("请先设置该部门的主管人员");
}
bv.setNextNodeUserSids(organizationVo.getManagerSid());
bv.setFormVariables(variables);
if (r == 1) {
@ -345,6 +311,8 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
oaFormService.updateFlow(BeanUtil.beanToMap(ufVo));
//极光推送
oaMendApply = fetchBySid(businessSid);
oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid());
oaMendApply.setOaForm(oaForm);
//==================================添加线程
try {
@ -354,6 +322,8 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
OaMendApply mendApply = oaMendApply;
oaForm = oaFormService.fetchBySid(mendApply.getFormSid());
mendApply.setOaForm(oaForm);
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@ -363,7 +333,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("补卡申请");
messageFlowableQuery.setMsgContent(mendApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgContent(mendApply.getOaForm().getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("补卡申请");
messageFeign.pushMessage(messageFlowableQuery);
});
@ -378,8 +348,8 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误：instanceId");
}
bv.setTaskId(oaMendApply.getTaskId());
bv.setTaskDefKey(oaMendApply.getNodeId());
bv.setTaskId(oaMendApply.getOaForm().getTaskId());
bv.setTaskDefKey(oaMendApply.getOaForm().getNodeId());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(dto.getInstanceId());
return complete(bv);
@ -393,7 +363,9 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
r = 1;
} else {
if (oaMendApply != null) {
String businessTaskId = oaMendApply.getTaskId();
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid());
oaMendApply.setOaForm(oaForm);
String businessTaskId = oaMendApply.getOaForm().getTaskId();
if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
//新提交
r = 1;
@ -417,6 +389,8 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid();
OaMendApply oaMendApply = fetchBySid(businessSid);
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid());
oaMendApply.setOaForm(oaForm);
Map<String, Object> variables = new HashMap<>();
//网关
@ -425,10 +399,10 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
variables.put("app", appMap);
//=======================================
bv.setFormVariables(variables);
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(oaMendApply.getDeptSid()).getData();
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(oaMendApply.getOaForm().getDeptSid()).getData();
bv.setOrgSidPath(deptVo.getOrgSidPath());
bv.setModelId(oaMendApply.getProcDefId());
if (bv.getTaskId().equals(oaMendApply.getTaskId())) {
bv.setModelId(oaMendApply.getOaForm().getProcDefId());
if (bv.getTaskId().equals(oaMendApply.getOaForm().getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -451,18 +425,20 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
OaMendApply mendApply = oaMendApply;
oaForm = oaFormService.fetchBySid(mendApply.getFormSid());
mendApply.setOaForm(oaForm);
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(mendApply.getProcDefId());
ufVo.setProcInsId(mendApply.getProcInstId());
ufVo.setProcDefId(mendApply.getOaForm().getProcDefId());
ufVo.setProcInsId(mendApply.getOaForm().getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("补卡申请");
messageFlowableQuery.setMsgContent(mendApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgContent(mendApply.getOaForm().getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("补卡申请");
messageFeign.pushMessage(messageFlowableQuery);
});
@ -485,9 +461,11 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
Map<String, Object> variables = new HashMap<>();
//查询业务信息
OaMendApply oaMendApply = fetchBySid(query.getBusinessSid());
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid());
oaMendApply.setOaForm(oaForm);
//网关
bv.setModelId(oaMendApply.getProcDefId());
bv.setModelId(oaMendApply.getOaForm().getProcDefId());
bv.setFormVariables(variables);
//=======================================
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
@ -504,9 +482,11 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
Map<String, Object> variables = new HashMap<>();
//查询业务信息
OaMendApply oaMendApply = fetchBySid(query.getBusinessSid());
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid());
oaMendApply.setOaForm(oaForm);
//网关
bv.setModelId(oaMendApply.getProcDefId());
bv.setModelId(oaMendApply.getOaForm().getProcDefId());
bv.setFormVariables(variables);
//=======================================
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
@ -522,7 +502,9 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
if (oaMendApply == null) {
return rb.setMsg("该申请不存在");
}
String businessTaskId = oaMendApply.getTaskId();
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid());
oaMendApply.setOaForm(oaForm);
String businessTaskId = oaMendApply.getOaForm().getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
if (StringUtils.isBlank(query.getComment())) {
@ -561,14 +543,16 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
OaMendApply mendApply = oaMendApply;
oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid());
mendApply.setOaForm(oaForm);
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = mendApply.getProcInstId();
String procId = mendApply.getOaForm().getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(mendApply.getProcDefId());
ufVo.setProcDefId(mendApply.getOaForm().getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
@ -579,7 +563,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(mendApply.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(mendApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgContent(mendApply.getOaForm().getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("补卡申请");
messageFeign.pushMessage(messageFlowableQuery);
@ -600,7 +584,9 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
return rb.setMsg("参数错误：userSid");
}
OaMendApply oaMendApply = fetchBySid(query.getBusinessSid());
String businessTaskId = oaMendApply.getTaskId();
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid());
oaMendApply.setOaForm(oaForm);
String businessTaskId = oaMendApply.getOaForm().getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
@ -631,7 +617,9 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
return rb.setMsg("请填写意见");
}
OaMendApply oaMendApply = fetchBySid(query.getBusinessSid());
String businessTaskId = oaMendApply.getTaskId();
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid());
oaMendApply.setOaForm(oaForm);
String businessTaskId = oaMendApply.getOaForm().getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (query.getUserSid().equals(oaMendApply.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();

Write Preview
Loading…
Cancel
Save