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

Merge remote-tracking branch 'origin/master'

master
fanzongzhe0036 2 months ago
parent
5ccb5baaac 1482a93b74
commit
a903cc5b07
35 changed files with 1231 additions and 53 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. 28
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  2. 14
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java
  3. 28
      yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApply.java
  4. 5
      yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java
  5. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java
  6. 1
      yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java
  7. 105
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseApplyRest.java
  8. 36
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseDetailRest.java
  9. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java
  10. 8
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java
  11. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyVo.java
  12. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyService.java
  13. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyService.java
  14. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java
  15. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspaceapply/AdOffspaceApplyService.java
  16. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyService.java
  17. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java
  18. 92
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApply.java
  19. 81
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDetailsVo.java
  20. 96
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDto.java
  21. 35
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.java
  22. 26
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.xml
  23. 302
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyService.java
  24. 105
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyVo.java
  25. 50
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetail.java
  26. 46
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailDto.java
  27. 40
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.java
  28. 15
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.xml
  29. 64
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailService.java
  30. 48
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailVo.java
  31. 43
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseListDetailVo.java
  32. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyService.java
  33. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyService.java
  34. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamapply/AdTeamApplyService.java
  35. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java

28
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
View File

@ -472,7 +472,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
formVariables.put("isAdj", i);
}
if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
bv.setOrgSidPath(baseAccadjApply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -828,11 +827,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
nextNodeUserSids.append(sid).append(",");
}
}
if (StringUtils.isBlank(nextNodeUserSids)) {
return rb.setMsg("下一环节暂无操作人员");
if (StringUtils.isBlank(nextNodeUserSids)){
bv.setNextNodeUserSids("");
}else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}
if (baseAccadjApply.getAccadjTypeValue().equals("调出")) {
String callInOrgSid = baseAccadjApply.getCallInOrgSid();
@ -852,12 +852,15 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
nextNodeUserSids.append(sid).append(",");
}
}
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
if (StringUtils.isBlank(nextNodeUserSids)){
bv.setNextNodeUserSids("");
}else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}
}
}
if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
bv.setOrgSidPath(baseAccadjApply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -920,11 +923,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
nextNodeUserSids.append(sid).append(",");
}
}
if (StringUtils.isBlank(nextNodeUserSids)) {
return rb.setMsg("下一环节暂无操作人员");
if (StringUtils.isBlank(nextNodeUserSids)){
bv.setNextNodeUserSids("");
}else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.handleProsess(bv);
if (!resultBean1.getSuccess()) {

14
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java
View File

@ -39,22 +39,8 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
import java.util.List;
/**
* Project: anrui-scm(单车返利核对) <br/>
* File: ScmVehrebateCheckapplydetailMapper.java <br/>
* Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailMapper <br/>
* Description: 单车返利核对申请表_返利列表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface ScmVehrebateCheckapplydetailMapper extends BaseMapper<ScmVehrebateCheckapplydetail> {

28
yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApply.java
View File

@ -28,7 +28,9 @@ package com.yxt.anrui.as.api.astechtitleapply;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -52,30 +54,30 @@ import lombok.Data;
public class AsTechTitleApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("单据编号")
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("申请人")
@ApiModelProperty("申请人")
private String createByName; // 申请人
@ApiModelProperty("申请部门sid")
@ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称")
@ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称
@ApiModelProperty("分公司sid")
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime; // 办结日期
@ApiModelProperty("实例id")
@ApiModelProperty("实例id")
private String procInstId; // 实例id
@ApiModelProperty("流程定义id")
@ApiModelProperty("流程定义id")
private String procDefId; // 流程定义id
@ApiModelProperty("任务id")
@ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty("环节id")
@ApiModelProperty("环节id")
private String nodeId; // 环节id
@ApiModelProperty("流程状态")
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
}

5
yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java
View File

@ -76,7 +76,10 @@ public interface AsTechTitleMapper extends BaseMapper<AsTechTitle> {
void updateTech(@Param("sid") String sid, @Param("techSid") String techSid, @Param("techName") String techName);
@Update("update as_tech_title set isBa = #{isBa} where sid = #{sid}")
void updateIsBa(@Param("sid")String sid,@Param("isBa") Integer isBa);
void updateIsBa(@Param("sid") String sid, @Param("isBa") Integer isBa);
AsTechTitle selLikeTechSid(String techSid);
@Update("update as_tech_title set weight = #{weight} where sid = #{sid}")
void updateWeight(@Param("sid") String sid, @Param("weight") String weight);
}

4
yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java
View File

@ -241,4 +241,8 @@ public class AsTechTitleService extends MybatisBaseService<AsTechTitleMapper, As
public AsTechTitle selLikeTechSid(String techSid) {
return baseMapper.selLikeTechSid(techSid);
}
public void updateWeight(String sid, String weight) {
baseMapper.updateWeight(sid, weight);
}
}

1
yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java
View File

@ -503,6 +503,7 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
asTechTitleService.updateTech(asTechTitleDetailDetailsVo.getTitleSid(), StringUtils.join(glTechSids, ","), StringUtils.join(glTechNames, ","));
asTechTitleService.updateState(asTechTitleDetailDetailsVo.getTitleSid(), "0");
asTechTitleService.updateIsBa(asTechTitleDetailDetailsVo.getTitleSid(), 1);
asTechTitleService.updateWeight(asTechTitleDetailDetailsVo.getTitleSid(),asTechTitleDetailDetailsVo.getWeight());
}
} else {
//极光推送

105
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseApplyRest.java
View File

@ -0,0 +1,105 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.api;
import com.yxt.anrui.oa.biz.adsealuseapply.*;
import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto;
import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery;
import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@Api(tags = "印章及资质证件使用申请")
@RestController
@RequestMapping("v1/adsealuseapply")
public class AdSealuseApplyRest {
@Autowired
private AdSealuseApplyService adSealuseApplyService;
@ApiOperation("初始化（新增或修改）")
@GetMapping({"/getInit", "/getInit/{sid}"})
public ResultBean<AdSealuseApplyVo> getInit(
@PathVariable(value = "sid", required = false) String sid,
@RequestParam(value = "userSid", required = false) String userSid,
@RequestParam(value = "orgPath", required = false) String orgPath) {
ResultBean<AdSealuseApplyVo> rb = ResultBean.fireFail();
if (sid == null || sid.isEmpty()) {
// 执行新增初始化
if (userSid == null || orgPath == null) {
return rb.setMsg("userSid和orgPath不能为空");
}
return adSealuseApplyService.getSaveInit(userSid, orgPath);
} else {
// 执行修改初始化
return adSealuseApplyService.getUpdateInit(sid);
}
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody AdSealuseApplyDto dto) {
return adSealuseApplyService.saveOrUpdateDto(dto);
}
@ApiOperation("详情")
@GetMapping("/details/{sid}")
ResultBean<AdSealuseApplyDetailsVo> details(@PathVariable("sid") String sid
, @RequestParam(value = "application", required = false) String application) {
return adSealuseApplyService.details(sid, application);
}
@ApiOperation("提交审批流程")
@PostMapping("/submit")
public ResultBean submit(@RequestBody AdSealuseApplyDto dto) {
return adSealuseApplyService.submit(dto);
}
@ApiOperation(value = "办理（同意）")
@PutMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
return adSealuseApplyService.complete(dto);
}
@ApiOperation(value = "驳回任务")
@PutMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody TaskDto dto) {
return adSealuseApplyService.reject(dto);
}
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
return adSealuseApplyService.getFlowOperateTitle(query);
}
}

36
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseDetailRest.java
View File

@ -0,0 +1,36 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.api;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*;
@Api(tags = "印章及资质证件使用列表")
@RestController
@RequestMapping("v1/adsealusedetail")
public class AdSealuseDetailRest {
}

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java
View File

@ -74,7 +74,6 @@ public class AdExpatriatesApplyService extends MybatisBaseService<AdExpatriatesA
if (adExpatriatesApply == null) {
return rb.setMsg("该申请不存在");
}
// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adExpatriatesApplyVo.setTaskId(oaForm.getTaskId());
adExpatriatesApplyVo.setProcInsId(oaForm.getProcInstId());

8
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java
View File

@ -71,7 +71,7 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService<AdExpatria
adExpatriatesHomeApplyVo.setCreateBySid(userSid);
adExpatriatesHomeApplyVo.setCreateByName(sysUserVo.getName());
List<SysStaffPostVos> staffPostVos = sysStaffPostFeign.selPostByStaffSid(sysUserVo.getStaffSid()).getData();
if (staffPostVos.size() > 0){
if (staffPostVos.size() > 0) {
adExpatriatesHomeApplyVo.setJobKey(staffPostVos.get(0).getSid());
adExpatriatesHomeApplyVo.setJobValue(staffPostVos.get(0).getName());
}
@ -99,6 +99,8 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService<AdExpatria
BeanUtil.copyProperties(adExpatriatesHomeApply, adExpatriatesHomeApplyVo);
adExpatriatesHomeApplyVo.setJobKey(adExpatriatesHomeApply.getPostSid());
adExpatriatesHomeApplyVo.setJobValue(adExpatriatesHomeApply.getPostName());
FormCommon jobObj = FormCommon.of(adExpatriatesHomeApply.getPostSid(), adExpatriatesHomeApply.getPostName());
adExpatriatesHomeApplyVo.setJobObj(jobObj);
FormCommon relationObj = FormCommon.of(adExpatriatesHomeApplyVo.getRelationKey(), adExpatriatesHomeApplyVo.getRelationValue());
adExpatriatesHomeApplyVo.setRelationObj(relationObj);
FormCommon homeTypeObj = FormCommon.of(adExpatriatesHomeApplyVo.getHomeTypeKey(), adExpatriatesHomeApplyVo.getHomeTypeValue());
@ -122,9 +124,9 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService<AdExpatria
AdExpatriatesHomeApply entity = new AdExpatriatesHomeApply();
BeanUtil.copyProperties(dto, entity, "sid");
if ("0".equals(homeTypeKey)){
if ("0".equals(homeTypeKey)) {
dto.setBillNo("ZWRYTQXJSQ");
}else if ("1".equals(homeTypeKey)){
} else if ("1".equals(homeTypeKey)) {
dto.setBillNo("ZWRYJSTQSQ");
}
dto.setSid(entity.getSid());

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyVo.java
View File

@ -48,6 +48,7 @@ public class AdExpatriatesHomeApplyVo implements Vo {
private String createByName;
@ApiModelProperty("申请人岗位")
private FormCommon jobObj;
private String jobKey;
private String jobValue;
@ApiModelProperty("上次探亲休假探亲地")

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyService.java
View File

@ -73,7 +73,6 @@ public class AdFeteApplyService extends MybatisBaseService<AdFeteApplyMapper, Ad
if (adFeteApplyVo == null) {
return rb.setMsg("该申请不存在");
}
// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adFeteApplyVo.setTaskId(oaForm.getTaskId());
adFeteApplyVo.setProcInsId(oaForm.getProcInstId());

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyService.java
View File

@ -75,7 +75,6 @@ public class AdFrockallotApplyService extends MybatisBaseService<AdFrockallotApp
if (adFrockallotApply == null) {
return rb.setMsg("该申请不存在");
}
// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adFrockallotApplyVo.setTaskId(oaForm.getTaskId());
adFrockallotApplyVo.setProcInsId(oaForm.getProcInstId());

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java
View File

@ -73,7 +73,6 @@ public class AdLeasehostApplyService extends MybatisBaseService<AdLeasehostApply
if (adLeasehostApply == null) {
return rb.setMsg("该申请不存在");
}
// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adLeasehostApplyVo.setTaskId(oaForm.getTaskId());
adLeasehostApplyVo.setProcInsId(oaForm.getProcInstId());

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspaceapply/AdOffspaceApplyService.java
View File

@ -76,7 +76,6 @@ public class AdOffspaceApplyService extends MybatisBaseService<AdOffspaceApplyMa
if (adOffspaceApply == null) {
return rb.setMsg("该申请不存在");
}
// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adOffspaceApplyVo.setTaskId(oaForm.getTaskId());
adOffspaceApplyVo.setProcInsId(oaForm.getProcInstId());

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyService.java
View File

@ -73,7 +73,6 @@ public class AdPircarpulApplyService extends MybatisBaseService<AdPircarpulApply
if (adPircarpulApply == null) {
return rb.setMsg("该申请不存在");
}
// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adPircarpulApplyVo.setTaskId(oaForm.getTaskId());
adPircarpulApplyVo.setProcInsId(oaForm.getProcInstId());

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java
View File

@ -74,7 +74,6 @@ public class AdSalecarpulApplyService extends MybatisBaseService<AdSalecarpulApp
if (adSalecarpulApply == null) {
return rb.setMsg("该申请不存在");
}
// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adSalecarpulApplyVo.setTaskId(oaForm.getTaskId());
adSalecarpulApplyVo.setProcInsId(oaForm.getProcInstId());

92
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApply.java
View File

@ -0,0 +1,92 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adsealuseapply;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "印章及资质证件使用申请", description = "印章及资质证件使用申请")
@TableName("ad_sealuse_apply")
public class AdSealuseApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("部门sid")
private String deptSid; // 部门sid
@ApiModelProperty("部门名称")
private String deptName; // 部门名称
@ApiModelProperty("经办人sid")
private String userSid; // 经办人sid
@ApiModelProperty("经办人姓名")
private String userName; // 经办人姓名
@ApiModelProperty("使用类型key")
private String useTypeKey; // 使用类型key
@ApiModelProperty("使用类型value")
private String useTypeValue; // 使用类型value
@ApiModelProperty("使用方式key")
private String useWayKey; // 使用方式key
@ApiModelProperty("使用方式value")
private String useWayValue; // 使用方式value
@ApiModelProperty("使用情况分类key")
private String useSitKey; // 使用情况分类key
@ApiModelProperty("使用情况分类value")
private String useSitValue; // 使用情况分类value
@ApiModelProperty("资质证件类别key")
private String certTypeKey; // 资质证件类别key
@ApiModelProperty("资质证件类别value")
private String certTypeValue; // 资质证件类别value
@ApiModelProperty("印章类别key")
private String sealTypeKey; // 印章类别key
@ApiModelProperty("印章类别value")
private String sealTypeValue; // 印章类别value
@ApiModelProperty("财务数据类别key")
private String dataTypeKey; // 财务数据类别key
@ApiModelProperty("财务数据类别value")
private String dataTypeValue; // 财务数据类别value
@ApiModelProperty("外出目的地")
private String destination; // 外出目的地
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("预计归还时间")
private Date returnDate; // 预计归还时间
@ApiModelProperty("是否需要签字")
private String isSign; // 是否需要签字
@ApiModelProperty("需要签字人员")
private String signUserName; // 需要签字人员
@ApiModelProperty("盖章或签字文件份数")
private String signNum; // 盖章或签字文件份数
@ApiModelProperty("具体用途")
private String purpose; // 具体用途
@ApiModelProperty("基础表单sid")
private String formSid; // 基础表单sid
@ApiModelProperty("关联审批sid列表,英文逗号分隔")
private String linkFormSids; // 关联审批sid列表,英文逗号分隔
}

81
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDetailsVo.java
View File

@ -0,0 +1,81 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adsealuseapply;
import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulListDetailVo;
import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "印章及资质证件使用申请 视图数据详情", description = "印章及资质证件使用申请 视图数据详情")
public class AdSealuseApplyDetailsVo extends OaFormCommonVo {
@ApiModelProperty("部门")
private String deptValue;
@ApiModelProperty("经办人")
private String userValue;
@ApiModelProperty("使用类型")
private String useTypeValue;
@ApiModelProperty("使用方式")
private String useWayValue;
@ApiModelProperty("使用情况分类")
private String useSitValue;
@ApiModelProperty("资质证件类别")
private String certTypeValue;
@ApiModelProperty("印章类别")
private String sealTypeValue;
@ApiModelProperty("财务数据类别")
private String dataTypeValue;
@ApiModelProperty("外出目的地")
private String destination;
@ApiModelProperty("预计归还时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date returnDate;
@ApiModelProperty("是否需要签字")
private String isSign;
@ApiModelProperty("需要签字人员")
private String signUserName;
@ApiModelProperty("盖章或签字文件份数")
private String signNum;
@ApiModelProperty("具体用途")
private String purpose;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
@ApiModelProperty("附件")
private List<String> appes = new ArrayList<>();
private List<AdSalecarpulListDetailVo> list = new ArrayList<>();
}

96
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDto.java
View File

@ -0,0 +1,96 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adsealuseapply;
import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailDto;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.anrui.oa.biz.oaform.OaFormDto;
import java.util.ArrayList;
import java.util.List;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "印章及资质证件使用申请 数据传输对象", description = "印章及资质证件使用申请 数据传输对象")
public class AdSealuseApplyDto extends OaFormDto {
@ApiModelProperty("部门")
private FormCommon deptObj;
private String deptKey;
private String deptValue;
@ApiModelProperty("经办人")
private FormCommon userObj;
private String userKey;
private String userValue;
@ApiModelProperty("使用类型")
private FormCommon useTypeObj;
private String useTypeKey;
private String useTypeValue;
@ApiModelProperty("使用方式")
private FormCommon useWayObj;
private String useWayKey;
private String useWayValue;
@ApiModelProperty("使用情况分类")
private FormCommon useSitObj;
private String useSitKey;
private String useSitValue;
@ApiModelProperty("资质证件类别")
private FormCommon certTypeObj;
private String certTypeKey;
private String certTypeValue;
@ApiModelProperty("印章类别")
private FormCommon sealTypObj;
private String sealTypKey;
private String sealTypeValue;
@ApiModelProperty("财务数据类别")
private FormCommon dataTypeObj;
private String dataTypeKey;
private String dataTypeValue;
@ApiModelProperty("外出目的地")
private String destination;
@ApiModelProperty("预计归还时间")
private String returnDate;
@ApiModelProperty("是否需要签字")
private String isSign;
@ApiModelProperty("需要签字人员")
private String signUserName;
@ApiModelProperty("盖章或签字文件份数")
private String signNum;
@ApiModelProperty("具体用途")
private String purpose;
@ApiModelProperty("基础表单sid")
private String formSid;
@ApiModelProperty("关联审批单")
private String linkFormSids;
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
@ApiModelProperty("文件")
private List<String> appes = new ArrayList<>();
private List<AdSealuseDetailDto> list = new ArrayList<>();
}

35
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.java
View File

@ -0,0 +1,35 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adsealuseapply;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface AdSealuseApplyMapper extends BaseMapper<AdSealuseApply> {
AdSealuseApplyDetailsVo details(String sid);
}

26
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.xml
View File

@ -0,0 +1,26 @@
<?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.adsealuseapply.AdSealuseApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="details" resultMap="detailMap">
select remarks, sid
from ad_sealuse_apply
where sid = #{sid}
</select>
<resultMap id="detailMap" type="com.yxt.anrui.oa.biz.adsealuseapply.AdSealuseApplyDetailsVo">
<result column="remarks" property="remarks"/>
<collection property="list" ofType="com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseListDetailVo"
select="selectList" column="sid">
</collection>
</resultMap>
<select id="selectList" resultType="com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseListDetailVo">
select sid,
manageCompanyName as manageCompanyValue,
beCompanyName as beCompanyValue
from ad_sealuse_detail
where mainSid = #{sid}
</select>
</mapper>

302
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyService.java
View File

@ -0,0 +1,302 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adsealuseapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailDto;
import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailService;
import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailVo;
import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
import com.yxt.anrui.oa.biz.oaform.OaForm;
import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum;
import com.yxt.anrui.oa.biz.oaform.OaFormService;
import com.yxt.anrui.oa.biz.oaform.OaFormUrlEnum;
import com.yxt.anrui.oa.biz.oaform.flowable.*;
import com.yxt.anrui.oa.feign.file.OaFileEnum;
import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum;
import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class AdSealuseApplyService extends MybatisBaseService<AdSealuseApplyMapper, AdSealuseApply> {
@Autowired
private OaAppendixService oaAppendixService;
@Autowired
private OaFormService oaFormService;
@Autowired
private AdSealuseDetailService adSealuseDetailService;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
public ResultBean<AdSealuseApplyVo> getSaveInit(String userSid, String orgPath) {
ResultBean<AdSealuseApplyVo> rb = ResultBean.fireFail();
AdSealuseApplyVo adSealuseApplyVo = new AdSealuseApplyVo();
adSealuseApplyVo.setCreateBySid(userSid);
adSealuseApplyVo.setOrgSidPath(orgPath);
return rb.success().setData(adSealuseApplyVo);
}
public ResultBean<AdSealuseApplyVo> getUpdateInit(String sid) {
ResultBean<AdSealuseApplyVo> rb = ResultBean.fireFail();
AdSealuseApplyVo adSealuseApplyVo = new AdSealuseApplyVo();
AdSealuseApply adSealuseApply = fetchBySid(sid);
if (adSealuseApply == null) {
return rb.setMsg("该申请不存在");
}
OaForm oaForm = oaFormService.fetchBySid(sid);
adSealuseApplyVo.setTaskId(oaForm.getTaskId());
adSealuseApplyVo.setProcInsId(oaForm.getProcInstId());
//根据部门sid获取orgPath并赋值
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
String orgSidPath = organizationVo.getOrgSidPath();
adSealuseApplyVo.setOrgSidPath(orgSidPath);
adSealuseApplyVo.setCreateBySid(oaForm.getCreateBySid());
BeanUtil.copyProperties(adSealuseApply, adSealuseApplyVo);
List<AdSealuseDetailVo> list = adSealuseDetailService.getUpdateInit(sid);
List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
adSealuseApplyVo.setFiles(files);
List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
adSealuseApplyVo.setAppes(appes);
adSealuseApplyVo.setList(list);
adSealuseApplyVo.setSid(sid);
return rb.success().setData(adSealuseApplyVo);
}
public ResultBean<String> saveOrUpdateDto(AdSealuseApplyDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
List<String> files = dto.getFiles();
List<String> appes = dto.getAppes();
List<AdSealuseDetailDto> list = dto.getList();
if (StringUtils.isBlank(sid)) {
// 新建操作
AdSealuseApply entity = new AdSealuseApply();
BeanUtil.copyProperties(dto, entity, "sid");
dto.setBillNo("YZJZZZJSYSQ");
dto.setSid(entity.getSid());
ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
if (!resultBean.getSuccess()) {
return rb;
}
entity.setFormSid(resultBean.getData());
baseMapper.insert(entity);
sid = entity.getSid();
} else {
// 更新操作
AdSealuseApply entity = fetchBySid(sid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
adSealuseDetailService.saveDetails(list, sid);
// 处理附件
saveFiles(sid, files, OaFileEnum.ADSEALUSEAPPLY.getAttachType(), "图片");
saveFiles(sid, appes, OaFileEnum.ADSEALUSEAPPLY.getAttachType(), "文件");
return rb.success().setData(sid);
}
// 保存文件
private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
files.removeAll(Collections.singleton(null));
oaAppendixService.saveFile(sid, files, attachType, fileType);
}
public ResultBean<AdSealuseApplyDetailsVo> details(String sid, String application) {
ResultBean rb = ResultBean.fireFail();
AdSealuseApplyDetailsVo adSealuseApplyDetailsVo = baseMapper.details(sid);
if (adSealuseApplyDetailsVo == null) {
return rb.setMsg("该申请不存在");
}
List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
adSealuseApplyDetailsVo.setFiles(files);
adSealuseApplyDetailsVo.setAppes(appes);
//基础字段赋值
BeanUtil.copyProperties(oaFormService.getDetails(sid), adSealuseApplyDetailsVo);
return rb.success().setData(adSealuseApplyDetailsVo);
}
/**
* 提交
*
* @param dto
* @return
*/
public ResultBean submit(AdSealuseApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
if (!stringResultBean.getSuccess()) {
return rb.setMsg(stringResultBean.getData());
}
String businessSid = stringResultBean.getData();
SubmitDto submitDto = new SubmitDto();
submitDto.setUserSid(dto.getCreateBySid());
submitDto.setBusinessSid(businessSid);
Map<String, Object> formVariables = new HashMap<>();
formVariables = getMap(formVariables, businessSid);
submitDto.setFormVariables(formVariables);
submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId());
submitDto.setNextTaskId(dto.getTaskId());
submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule());
return oaFormService.submit(submitDto);
}
/**
* 办理（同意）
*
* @param dto
* @return
*/
public ResultBean complete(CompleteDto dto) {
Map<String, Object> formVariables = dto.getFormVariables();
formVariables = getMap(formVariables, dto.getBusinessSid());
dto.setFormVariables(formVariables);
BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto();
BeanUtil.copyProperties(dto, businessVariablesDto);
return oaFormService.complete(businessVariablesDto);
}
/**
* 驳回
*
* @param dto
* @return
*/
public ResultBean reject(TaskDto dto) {
Map<String, Object> formVariables = dto.getFormVariables();
formVariables = getMap(formVariables, dto.getBusinessSid());
dto.setFormVariables(formVariables);
return oaFormService.reject(dto);
}
public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
// 默认失败返回
ResultBean<String> rb = ResultBean.fireFail();
// 获取next值和formVariables
int next = query.getNext();
// 获取并更新formVariables
Map<String, Object> formVariables = getMap(query.getFormVariables(), query.getBusinessSid());
query.setFormVariables(formVariables);
// 校验next参数是否有效（只允许0或1）
if (next != 0 && next != 1) {
return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息
}
// 获取节点名称
String data = getNodeName(query, next);
// 如果data为null，表示未获取到有效的节点信息
if (data == null) {
return rb.setMsg("没有获取到节点信息"); // 返回错误消息
}
// 返回成功的结果和获取到的节点名称
return rb.success().setData(data);
}
/**
* 网关参数组成
*
* @param formVariables
* @param sid
* @return
*/
public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", sid);
/*appMap.put("editUrl", "approval/#/pages/EditOnboradingApplyActivity?sid=" + sid);
appMap.put("detailUrl", "approval/#/pages/DetailOnboradingApplyActivity?sid=" + sid);
appMap.put("flowOperateUrl", "oa/v1/HrHireApply/getFlowOperateTitle");
appMap.put("agreeUrl", "oa/v1/HrHireApply/complete");
appMap.put("stopUrl", "oa/v1/oaform/breakProcess");
appMap.put("rejectUrl", "oa/v1/HrHireApply/reject");
appMap.put("recallUrl", "oa/v1/oaform/revokeProcess");
appMap.put("signUrl", "oa/v1/oaform/delegate");
appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/
appMap.put(OaFormUrlEnum.HRHIREAPPLY_EDIT.getType(), OaFormUrlEnum.HRHIREAPPLY_EDIT.getUrl() + "?sid=" + sid);
appMap.put(OaFormUrlEnum.HRHIREAPPLY_DETAIL.getType(), OaFormUrlEnum.HRHIREAPPLY_DETAIL.getUrl() + "?sid=" + sid);
appMap.put(OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getUrl());
appMap.put(OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getUrl());
appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl());
appMap.put(OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getType(), OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getUrl());
appMap.put(OaFormUrlEnum.RECALLURL.getType(), OaFormUrlEnum.RECALLURL.getUrl());
appMap.put(OaFormUrlEnum.SIGNURL.getType(), OaFormUrlEnum.SIGNURL.getUrl());
appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl());
formVariables.put("app", appMap);
//根据组织查询是否是分公司
OaForm oaForm = oaFormService.fetchBySid(sid);
AdSealuseApply adSealuseApply = fetchBySid(sid);
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData();
//是否是分公司
formVariables.put("isTrue", sysOrganization.getIsDept() == 0);
return formVariables;
}
/**
* 根据next的值获取前一个节点或下一个节点的名称。
*
* @param query 包含查询所需参数的NodeQuery对象
* @param next 参数，0表示上一环节，1表示下一环节
* @return 节点名称，如果失败则返回null
*/
private String getNodeName(NodeQuery query, int next) {
// 根据next值选择相应的服务方法获取节点信息
ResultBean<List<NodeVo>> resultBean = (next == 0)
? oaFormService.getPreviousNodesForReject(query) // 获取上一环节的节点
: oaFormService.getNextNodesForSubmit(query); // 获取下一环节的节点
// 如果服务调用成功
if (resultBean.getSuccess()) {
// 清除结果列表中的null值，避免空节点
resultBean.getData().removeAll(Collections.singleton(null));
// 如果结果列表非空，返回第一个节点的名称
if (!resultBean.getData().isEmpty()) {
return resultBean.getData().get(0).getName();
}
} else {
// 如果服务调用失败，返回null
return null;
}
// 如果结果为空，返回null
return null;
}
}

105
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyVo.java
View File

@ -0,0 +1,105 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adsealuseapply;
import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailVo;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.common.core.vo.Vo;
import java.util.ArrayList;
import java.util.List;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "印章及资质证件使用申请 视图数据对象", description = "印章及资质证件使用申请 视图数据对象")
public class AdSealuseApplyVo implements Vo {
private String sid;
/* private String userSid;
private String orgPath;*/
private String orgSidPath;
private String createBySid;
@ApiModelProperty("部门")
private FormCommon deptObj;
private String deptKey;
private String deptValue;
@ApiModelProperty("经办人")
private FormCommon userObj;
private String userKey;
private String userValue;
@ApiModelProperty("使用类型")
private FormCommon useTypeObj;
private String useTypeKey;
private String useTypeValue;
@ApiModelProperty("使用方式")
private FormCommon useWayObj;
private String useWayKey;
private String useWayValue;
@ApiModelProperty("使用情况分类")
private FormCommon useSitObj;
private String useSitKey;
private String useSitValue;
@ApiModelProperty("资质证件类别")
private FormCommon certTypeObj;
private String certTypeKey;
private String certTypeValue;
@ApiModelProperty("印章类别")
private FormCommon sealTypObj;
private String sealTypKey;
private String sealTypeValue;
@ApiModelProperty("财务数据类别")
private FormCommon dataTypeObj;
private String dataTypeKey;
private String dataTypeValue;
@ApiModelProperty("外出目的地")
private String destination;
@ApiModelProperty("预计归还时间")
private String returnDate;
@ApiModelProperty("是否需要签字")
private String isSign;
@ApiModelProperty("需要签字人员")
private String signUserName;
@ApiModelProperty("盖章或签字文件份数")
private String signNum;
@ApiModelProperty("具体用途")
private String purpose;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
@ApiModelProperty("附件")
private List<String> appes = new ArrayList<>();
private List<AdSealuseDetailVo> list = new ArrayList<>();
private String taskId;
@ApiModelProperty("流程实例id")
private String procInsId;
// private String testPage;
}

50
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetail.java
View File

@ -0,0 +1,50 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adsealusedetail;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "印章及资质证件使用列表", description = "印章及资质证件使用列表")
@TableName("ad_sealuse_detail")
public class AdSealuseDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("申请sid")
private String mainSid; // 申请sid
@ApiModelProperty("管理公司sid")
private String manageCompanySid; // 管理公司sid
@ApiModelProperty("管理公司名称")
private String manageCompanyName; // 管理公司名称
@ApiModelProperty("所属公司sid")
private String beCompanySid; // 所属公司sid
@ApiModelProperty("所属公司名称")
private String beCompanyName; // 所属公司名称
}

46
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailDto.java
View File

@ -0,0 +1,46 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adsealusedetail;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "印章及资质证件使用列表 数据传输对象", description = "印章及资质证件使用列表 数据传输对象")
public class AdSealuseDetailDto implements Dto {
@ApiModelProperty("管理公司名称")
private FormCommon manageCompanyObj;
private String manageCompanyKey;
private String manageCompanyValue;
@ApiModelProperty("所属公司名称")
private FormCommon beCompanyObj;
private String beCompanyKey;
private String beCompanyValue;
}

40
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.java
View File

@ -0,0 +1,40 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adsealusedetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface AdSealuseDetailMapper extends BaseMapper<AdSealuseDetail> {
List<AdSealuseDetailVo> getUpdateInit(String sid);
@Select("select * from ad_sealuse_detail where mainSid = #{mainSid}")
List<AdSealuseDetail> selectByMainSid(String mainSid);
}

15
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.xml
View File

@ -0,0 +1,15 @@
<?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.adsealusedetail.AdSealuseDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailVo">
select sid,
manageCompanySid as manageCompanyKey,
manageCompanyName as manageCompanyValue,
beCompanySid as beCompanyKey,
beCompanyName as beCompanyValue
from ad_sealuse_detail
where mainSid = #{sid}
</select>
</mapper>

64
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailService.java
View File

@ -0,0 +1,64 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adsealusedetail;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
@Service
public class AdSealuseDetailService extends MybatisBaseService<AdSealuseDetailMapper, AdSealuseDetail> {
public void saveDetails(List<AdSealuseDetailDto> list, String sid) {
//根据sid查询明细并删除
List<AdSealuseDetail> list2 = baseMapper.selectByMainSid(sid);
list2.removeAll(Collections.singleton(null));
if (!list2.isEmpty()) {
list2.stream().forEach(v -> {
deleteBySid(v.getSid());
});
}
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
list.stream().forEach(details -> {
AdSealuseDetail adSealuseDetail = new AdSealuseDetail();
BeanUtil.copyProperties(details, adSealuseDetail);
adSealuseDetail.setManageCompanySid(details.getManageCompanyKey());
adSealuseDetail.setManageCompanyName(details.getManageCompanyValue());
adSealuseDetail.setBeCompanySid(details.getBeCompanyKey());
adSealuseDetail.setBeCompanyName(details.getBeCompanyValue());
adSealuseDetail.setMainSid(sid);
baseMapper.insert(adSealuseDetail);
});
}
}
public List<AdSealuseDetailVo> getUpdateInit(String sid) {
return baseMapper.getUpdateInit(sid);
}
}

48
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailVo.java
View File

@ -0,0 +1,48 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adsealusedetail;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "印章及资质证件使用列表 视图数据对象", description = "印章及资质证件使用列表 视图数据对象")
public class AdSealuseDetailVo implements Vo {
private String sid; // sid
@ApiModelProperty("管理公司名称")
private FormCommon manageCompanyObj;
private String manageCompanyKey;
private String manageCompanyName;
@ApiModelProperty("所属公司名称")
private FormCommon beCompanyObj;
private String beCompanyKey;
private String beCompanyValue;
}

43
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseListDetailVo.java
View File

@ -0,0 +1,43 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adsealusedetail;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "印章及资质证件使用列表 视图数据对象", description = "印章及资质证件使用列表 视图数据对象")
public class AdSealuseListDetailVo implements Vo {
private String sid;
@ApiModelProperty("管理公司名称")
private String manageCompanyName;
@ApiModelProperty("所属公司名称")
private String beCompanyValue;
}

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyService.java
View File

@ -77,7 +77,6 @@ public class AdSeatApplyService extends MybatisBaseService<AdSeatApplyMapper, Ad
if (adSeatApply == null) {
return rb.setMsg("该申请不存在");
}
// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adSeatApplyVo.setTaskId(oaForm.getTaskId());
adSeatApplyVo.setProcInsId(oaForm.getProcInstId());

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyService.java
View File

@ -75,7 +75,6 @@ public class AdSenpircarpulApplyService extends MybatisBaseService<AdSenpircarpu
if (adSenpircarpulApply == null) {
return rb.setMsg("该申请不存在");
}
// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adSenpircarpulApplyVo.setTaskId(oaForm.getTaskId());
adSenpircarpulApplyVo.setProcInsId(oaForm.getProcInstId());

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamapply/AdTeamApplyService.java
View File

@ -72,7 +72,6 @@ public class AdTeamApplyService extends MybatisBaseService<AdTeamApplyMapper, Ad
if (adTeamApplyVo == null) {
return rb.setMsg("该申请不存在");
}
// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adTeamApplyVo.setTaskId(oaForm.getTaskId());
adTeamApplyVo.setProcInsId(oaForm.getProcInstId());

1
yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java
View File

@ -27,6 +27,7 @@ public enum OaFileEnum {
ADTEAMAPPLY("018", "团建附件"),
ADSEATAPPLY("019", "乘坐交通工具特殊坐席附件"),
ADFEESREIMBURSABLEAPPLY("020", "行政类费用报销附件"),
ADSEALUSEAPPLY("021", "印章及资质证件使用附件"),
;

Write Preview
Loading…
Cancel
Save