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

Compare commits

base: yxt_develop:c97ec57a4e17a89aec8bd4fd9ebd4278da09722f
Branches Tags
yxt_develop:master
yxt_develop:zhanglei
...
compare: yxt_develop:d0d69bfe147d37a81cc25a503ae50639c3a0dc1c
Branches Tags
yxt_develop:master
yxt_develop:zhanglei

2 Commits
c97ec57a4e ... d0d69bfe14

Author SHA1 Message Date
wangpengfei d0d69bfe14 Merge remote-tracking branch 'origin/master'
3 months ago
wangpengfei 298803c3e8 修改
3 months ago
4 changed files with 89 additions and 97 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 48
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupdocumentsapply/AdGroupDocumentsApplyService.java
  2. 42
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java
  3. 48
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyService.java
  4. 48
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyService.java

48
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupdocumentsapply/AdGroupDocumentsApplyService.java
View File

@ -82,8 +82,8 @@ public class AdGroupDocumentsApplyService extends MybatisBaseService<AdGroupDocu
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity); baseMapper.updateById(entity);
} }
saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片"); saveFiles(sid, files, "", "图片");
saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件"); saveFiles(sid, appes, "", "文件");
return rb.success().setData(sid); return rb.success().setData(sid);
} }
public ResultBean<AdGroupDocumentsApplyVo> getSaveInit(String userSid, String orgPath) { public ResultBean<AdGroupDocumentsApplyVo> getSaveInit(String userSid, String orgPath) {
@ -169,7 +169,7 @@ public class AdGroupDocumentsApplyService extends MybatisBaseService<AdGroupDocu
// appMap.put("sid", businessSid); // appMap.put("sid", businessSid);
formVariables = getMap(formVariables, businessSid); formVariables = getMap(formVariables, businessSid);
submitDto.setFormVariables(formVariables); submitDto.setFormVariables(formVariables);
submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId()); submitDto.setProcDefId("");
submitDto.setNextTaskId(dto.getTaskId()); submitDto.setNextTaskId(dto.getTaskId());
submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule()); submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule());
return oaFormService.submit(submitDto); return oaFormService.submit(submitDto);
@ -204,32 +204,30 @@ public class AdGroupDocumentsApplyService extends MybatisBaseService<AdGroupDocu
} }
public ResultBean<String> getFlowOperateTitle(NodeQuery query) { public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
// 默认失败返回
ResultBean<String> rb = ResultBean.fireFail(); ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
// 获取next值和formVariables
int next = query.getNext(); int next = query.getNext();
Map<String, Object> formVariables = query.getFormVariables();
formVariables = getMap(formVariables, query.getBusinessSid()); // 获取并更新formVariables
Map<String, Object> formVariables = getMap(query.getFormVariables(), query.getBusinessSid());
query.setFormVariables(formVariables); query.setFormVariables(formVariables);
String data = "";
if (next == 0) { // 校验next参数是否有效（只允许0或1）
ResultBean<List<NodeVo>> resultBean = oaFormService.getPreviousNodesForReject(query); if (next != 0 && next != 1) {
if (resultBean.getSuccess()) { return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else if (next == 1) {
ResultBean<List<NodeVo>> resultBean = oaFormService.getNextNodesForSubmit(query);
if (resultBean.getSuccess()) {
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else {
return rb.setMsg("参数错误：next");
} }
// 获取节点名称
String data = oaFormService.getNodeName(query, next);
// 如果data为null，表示未获取到有效的节点信息
if (data == null) {
return rb.setMsg("没有获取到节点信息"); // 返回错误消息
}
// 返回成功的结果和获取到的节点名称
return rb.success().setData(data); return rb.success().setData(data);
} }
public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) { public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {

42
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java
View File

@ -202,32 +202,30 @@ public class AdGroupSystemApplyService extends MybatisBaseService<AdGroupSystem
} }
public ResultBean<String> getFlowOperateTitle(NodeQuery query) { public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
// 默认失败返回
ResultBean<String> rb = ResultBean.fireFail(); ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
// 获取next值和formVariables
int next = query.getNext(); int next = query.getNext();
Map<String, Object> formVariables = query.getFormVariables();
formVariables = getMap(formVariables, query.getBusinessSid()); // 获取并更新formVariables
Map<String, Object> formVariables = getMap(query.getFormVariables(), query.getBusinessSid());
query.setFormVariables(formVariables); query.setFormVariables(formVariables);
String data = "";
if (next == 0) { // 校验next参数是否有效（只允许0或1）
ResultBean<List<NodeVo>> resultBean = oaFormService.getPreviousNodesForReject(query); if (next != 0 && next != 1) {
if (resultBean.getSuccess()) { return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else if (next == 1) {
ResultBean<List<NodeVo>> resultBean = oaFormService.getNextNodesForSubmit(query);
if (resultBean.getSuccess()) {
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else {
return rb.setMsg("参数错误：next");
} }
// 获取节点名称
String data = oaFormService.getNodeName(query, next);
// 如果data为null，表示未获取到有效的节点信息
if (data == null) {
return rb.setMsg("没有获取到节点信息"); // 返回错误消息
}
// 返回成功的结果和获取到的节点名称
return rb.success().setData(data); return rb.success().setData(data);
} }
public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) { public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {

48
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyService.java
View File

@ -64,8 +64,8 @@ public class AdJdPermissionApplyService extends MybatisBaseService<AdJdPermissio
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity); baseMapper.updateById(entity);
} }
saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片"); saveFiles(sid, files, "", "图片");
saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件"); saveFiles(sid, appes, "", "文件");
return rb.success().setData(sid); return rb.success().setData(sid);
} }
public ResultBean<AdJdPermissionApplyVo> getSaveInit(String userSid, String orgPath) { public ResultBean<AdJdPermissionApplyVo> getSaveInit(String userSid, String orgPath) {
@ -138,7 +138,7 @@ public class AdJdPermissionApplyService extends MybatisBaseService<AdJdPermissio
// appMap.put("sid", businessSid); // appMap.put("sid", businessSid);
formVariables = getMap(formVariables, businessSid); formVariables = getMap(formVariables, businessSid);
submitDto.setFormVariables(formVariables); submitDto.setFormVariables(formVariables);
submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId()); submitDto.setProcDefId("");
submitDto.setNextTaskId(dto.getTaskId()); submitDto.setNextTaskId(dto.getTaskId());
submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule()); submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule());
return oaFormService.submit(submitDto); return oaFormService.submit(submitDto);
@ -173,32 +173,30 @@ public class AdJdPermissionApplyService extends MybatisBaseService<AdJdPermissio
} }
public ResultBean<String> getFlowOperateTitle(NodeQuery query) { public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
// 默认失败返回
ResultBean<String> rb = ResultBean.fireFail(); ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
// 获取next值和formVariables
int next = query.getNext(); int next = query.getNext();
Map<String, Object> formVariables = query.getFormVariables();
formVariables = getMap(formVariables, query.getBusinessSid()); // 获取并更新formVariables
Map<String, Object> formVariables = getMap(query.getFormVariables(), query.getBusinessSid());
query.setFormVariables(formVariables); query.setFormVariables(formVariables);
String data = "";
if (next == 0) { // 校验next参数是否有效（只允许0或1）
ResultBean<List<NodeVo>> resultBean = oaFormService.getPreviousNodesForReject(query); if (next != 0 && next != 1) {
if (resultBean.getSuccess()) { return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else if (next == 1) {
ResultBean<List<NodeVo>> resultBean = oaFormService.getNextNodesForSubmit(query);
if (resultBean.getSuccess()) {
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else {
return rb.setMsg("参数错误：next");
} }
// 获取节点名称
String data = oaFormService.getNodeName(query, next);
// 如果data为null，表示未获取到有效的节点信息
if (data == null) {
return rb.setMsg("没有获取到节点信息"); // 返回错误消息
}
// 返回成功的结果和获取到的节点名称
return rb.success().setData(data); return rb.success().setData(data);
} }
public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) { public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {

48
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyService.java
View File

@ -61,8 +61,8 @@ public class AdPlatformPermissionApplyService extends MybatisBaseService<AdPlatf
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity); baseMapper.updateById(entity);
} }
saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片"); saveFiles(sid, files, "", "图片");
saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件"); saveFiles(sid, appes, "", "文件");
return rb.success().setData(sid); return rb.success().setData(sid);
} }
// 保存文件 // 保存文件
@ -135,7 +135,7 @@ public class AdPlatformPermissionApplyService extends MybatisBaseService<AdPlatf
// appMap.put("sid", businessSid); // appMap.put("sid", businessSid);
formVariables = getMap(formVariables, businessSid); formVariables = getMap(formVariables, businessSid);
submitDto.setFormVariables(formVariables); submitDto.setFormVariables(formVariables);
submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId()); submitDto.setProcDefId("");
submitDto.setNextTaskId(dto.getTaskId()); submitDto.setNextTaskId(dto.getTaskId());
submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule()); submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule());
return oaFormService.submit(submitDto); return oaFormService.submit(submitDto);
@ -170,32 +170,30 @@ public class AdPlatformPermissionApplyService extends MybatisBaseService<AdPlatf
} }
public ResultBean<String> getFlowOperateTitle(NodeQuery query) { public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
// 默认失败返回
ResultBean<String> rb = ResultBean.fireFail(); ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
// 获取next值和formVariables
int next = query.getNext(); int next = query.getNext();
Map<String, Object> formVariables = query.getFormVariables();
formVariables = getMap(formVariables, query.getBusinessSid()); // 获取并更新formVariables
Map<String, Object> formVariables = getMap(query.getFormVariables(), query.getBusinessSid());
query.setFormVariables(formVariables); query.setFormVariables(formVariables);
String data = "";
if (next == 0) { // 校验next参数是否有效（只允许0或1）
ResultBean<List<NodeVo>> resultBean = oaFormService.getPreviousNodesForReject(query); if (next != 0 && next != 1) {
if (resultBean.getSuccess()) { return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else if (next == 1) {
ResultBean<List<NodeVo>> resultBean = oaFormService.getNextNodesForSubmit(query);
if (resultBean.getSuccess()) {
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else {
return rb.setMsg("参数错误：next");
} }
// 获取节点名称
String data = oaFormService.getNodeName(query, next);
// 如果data为null，表示未获取到有效的节点信息
if (data == null) {
return rb.setMsg("没有获取到节点信息"); // 返回错误消息
}
// 返回成功的结果和获取到的节点名称
return rb.success().setData(data); return rb.success().setData(data);
} }
public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) { public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {

Write Preview
Loading…
Cancel
Save