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

优化

master
dimengzhe 2 years ago
parent
5e0ffe095e
commit
d8812156aa
5 changed files with 78 additions and 19 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. 26
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
  3. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowableQuery.java
  4. 6
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
  5. 61
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

26
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -4620,6 +4620,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//如果创建人与部门主管一样，则自动到下一环节。
if(busSalesOrder.get().getCreateBySid().equals(nextNodeUserSids_)){
busSalesOrderOne = fetchBySid(businessSid);
bv = new BusinessVariables();
bv.setModelId(busSalesOrderOne.getProcDefId());
bv.setInstanceId(busSalesOrderOne.getProcInstId());
bv.setTaskId(busSalesOrderOne.getTaskId());
bv.setUserSid(busSalesOrderOne.getCreateBySid());
bv.setBusinessSid(busSalesOrderOne.getSid());
bv.setTaskDefKey(busSalesOrderOne.getNodeId());
Map<String, Object> variabless = getOrderMap(busSalesOrderOne);
bv.setFormVariables(variabless);
bv.setOrgSidPath(busSalesOrderOne.getOrgSidPath());
bv.setComment("因与申请人相同，系统自动处理，需以下一级审批人审批意见为准！");
return complete(bv);
}
//极光推送
busSalesOrder.set(fetchBySid(businessSid));
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@ -5326,6 +5343,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
String orderNames = orgName + "<" + customerName + ">" + xilie + "-" + typeValue;
variables.put("orderNames", orderNames);
//增加抄送内部引荐人
BusSalesOrderSubmit salesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(busSalesOrder.getSid());
if(salesOrderSubmit != null){
if(StringUtils.isNotBlank(salesOrderSubmit.getUserSid())){
//抄送中增加抄送内部引荐人
variables.put("sendRecommendSid",salesOrderSubmit.getUserSid());
}
}
return variables;
}
@ -6570,6 +6595,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
FlowableQuery flowableQuery = new FlowableQuery();
flowableQuery.setModelId(modelId);
flowableQuery.setMap(variables);
flowableQuery.setTaskDefKey(busSalesOrder.getNodeId());
ResultBean<List<Map<String,Object>>> yuyanTest = flowTaskFeign.yuyanTest(flowableQuery);
List<Map<String,Object>> S = yuyanTest.getData();

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
View File

@ -37,7 +37,7 @@
<select id="selectInvoingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.InvoicingVo">
select name dictValue, sid, sid as dictKey
from fin_company_invoicing
where useOrgSid = #{useOrgSid}
where useOrgSid = #{useOrgSid} and length(purchaseSystemSid)>0
</select>
<select id="qyFetchListByName" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo">

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowableQuery.java
View File

@ -16,4 +16,6 @@ public class FlowableQuery {
private String modelId;
private Map<String,Object> map = new HashMap<>();
private String taskDefKey;
}

6
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
View File

@ -150,7 +150,7 @@ public class FlowableRest implements FlowableFeign {
userName.append(f.getName()).append(",");
userSids.append(f.getSid()).append(",");
});
userSids.deleteCharAt(userSids.length() - 1);
//抄送的业务逻辑
MessageFlowableQuery mfq = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
@ -191,6 +191,10 @@ public class FlowableRest implements FlowableFeign {
}else{
mfq.setMsgTitle(process.get("NAME_"));
}
if(processVariables.containsKey("sendRecommendSid")){//增加的其他的抄送人
userSids.append(processVariables.get("sendRecommendSid").toString()).append(",");
}
userSids.deleteCharAt(userSids.length() - 1);
mfq.setUserSids(userSids.toString());
ResultBean<String> resultBean = messageFeign.pushMessageCC(mfq);
log.info("抄送成功:{}", userName.toString());

61
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
View File

@ -2080,29 +2080,56 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
List<Map<String,Object>> list = new ArrayList<>();
String modelId = flowableQuery.getModelId();
Map<String,Object> map = flowableQuery.getMap();
boolean taskKeyTrue = false;
List<FlowElement> flowElements = processService.calApprovePath("", modelId,map);
List<FlowElement> collect = flowElements.stream().filter(item -> item.getId().length() > 0).collect(Collectors.toList());
for (int i = 0; i < collect.size(); i++) {
Map<String,Object> itemMap = new HashMap<>();
FlowElement item = collect.get(i);
log.info("flowElement:{}", item);
log.info("nodeName:{}", item.getName());
itemMap.put("nodeName",item.getName());
log.info("nodeId:{}", item.getId());
itemMap.put("nodeId",item.getId());
String s = JSON.toJSONString(item);
JSONObject jsonObject = JSONObject.parseObject(s);
log.info("item:{}", jsonObject);
Object candidateGroups = jsonObject.get("candidateGroups");
JSONArray candidateGroups_arr = new JSONArray();
if (candidateGroups != null) {
candidateGroups_arr = JSONArray.parseArray(candidateGroups.toString());
}
if (candidateGroups_arr.size() > 0) {
log.info("candidateGroups_sid:{}", candidateGroups_arr.get(0));
if(StringUtils.isBlank(flowableQuery.getTaskDefKey())){
log.info("flowElement:{}", item);
log.info("nodeName:{}", item.getName());
itemMap.put("nodeName",item.getName());
log.info("nodeId:{}", item.getId());
itemMap.put("nodeId",item.getId());
String s = JSON.toJSONString(item);
JSONObject jsonObject = JSONObject.parseObject(s);
log.info("item:{}", jsonObject);
Object candidateGroups = jsonObject.get("candidateGroups");
JSONArray candidateGroups_arr = new JSONArray();
if (candidateGroups != null) {
candidateGroups_arr = JSONArray.parseArray(candidateGroups.toString());
}
if (candidateGroups_arr.size() > 0) {
log.info("candidateGroups_sid:{}", candidateGroups_arr.get(0));
}
log.info("candidateGroups:{}", candidateGroups_arr);
list.add(itemMap);
}else{
if(flowableQuery.getTaskDefKey().equals(item.getId())){
taskKeyTrue = true;
}
if(taskKeyTrue){
log.info("flowElement:{}", item);
log.info("nodeName:{}", item.getName());
itemMap.put("nodeName",item.getName());
log.info("nodeId:{}", item.getId());
itemMap.put("nodeId",item.getId());
String s = JSON.toJSONString(item);
JSONObject jsonObject = JSONObject.parseObject(s);
log.info("item:{}", jsonObject);
Object candidateGroups = jsonObject.get("candidateGroups");
JSONArray candidateGroups_arr = new JSONArray();
if (candidateGroups != null) {
candidateGroups_arr = JSONArray.parseArray(candidateGroups.toString());
}
if (candidateGroups_arr.size() > 0) {
log.info("candidateGroups_sid:{}", candidateGroups_arr.get(0));
}
log.info("candidateGroups:{}", candidateGroups_arr);
list.add(itemMap);
}
}
log.info("candidateGroups:{}", candidateGroups_arr);
list.add(itemMap);
}
return rb.success().setData(list);
}

Write Preview
Loading…
Cancel
Save