diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerDepartmentPathCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerDepartmentPathCondition.java new file mode 100644 index 0000000000000000000000000000000000000000..64ede34ec9a67da0545facaf9c7877d84575c15d --- /dev/null +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerDepartmentPathCondition.java @@ -0,0 +1,142 @@ +/*Copyright (C) $today.year 深圳极向量科技有限公司 All Rights Reserved. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see .*/ + +package neatlogic.module.process.condition.handler; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.common.constvalue.FormHandlerType; +import neatlogic.framework.common.constvalue.ParamType; +import neatlogic.framework.common.constvalue.TeamLevel; +import neatlogic.framework.dao.mapper.TeamMapper; +import neatlogic.framework.dto.TeamVo; +import neatlogic.framework.form.constvalue.FormConditionModel; +import neatlogic.framework.process.condition.core.IProcessTaskCondition; +import neatlogic.framework.process.condition.core.ProcessTaskConditionBase; +import neatlogic.framework.process.constvalue.ConditionConfigType; +import neatlogic.framework.process.constvalue.ProcessFieldType; +import neatlogic.framework.process.dto.ProcessTaskStepVo; +import neatlogic.framework.process.dto.ProcessTaskVo; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.*; + +@Component +public class ProcessTaskOwnerDepartmentPathCondition extends ProcessTaskConditionBase implements IProcessTaskCondition { + + @Resource + private ProcessTaskMapper processTaskMapper; + + @Resource + private TeamMapper teamMapper; + + @Override + public String getName() { + return "ownerdepartmentpath"; + } + + @Override + public String getDisplayName() { + return "上报人部门(完整)"; + } + + @Override + public String getHandler(FormConditionModel processWorkcenterConditionType) { + return FormHandlerType.SELECT.toString(); + } + + @Override + public String getType() { + return ProcessFieldType.COMMON.getValue(); + } + + @Override + public JSONObject getConfig(ConditionConfigType type) { + JSONObject config = new JSONObject(); + config.put("type", FormHandlerType.SELECT.toString()); + config.put("search", true); + config.put("dynamicUrl", "/api/rest/team/list/forselect?level=department"); + config.put("rootName", "tbodyList"); + config.put("valueName", "uuid"); + config.put("textName", "name"); + config.put("multiple", true); + config.put("value", ""); + config.put("defaultValue", ""); + /** 以下代码是为了兼容旧数据结构，前端有些地方还在用 **/ + config.put("isMultiple", true); + JSONObject mappingObj = new JSONObject(); + mappingObj.put("value", "uuid"); + mappingObj.put("text", "name"); + config.put("mapping", mappingObj); + return config; + } + + @Override + public Integer getSort() { + return 11; + } + + @Override + public ParamType getParamType() { + return ParamType.ARRAY; + } + + @Override + public Object valueConversionText(Object value, JSONObject config) { + if (value != null) { + if (value instanceof List) { + List valueList = JSON.parseArray(JSON.toJSONString(value), String.class); + return String.join("、", valueList); + } + } + return value; + } + + @Override + public Object getConditionParamData(ProcessTaskStepVo processTaskStepVo) { + ProcessTaskVo processTaskVo = processTaskMapper.getProcessTaskById(processTaskStepVo.getProcessTaskId()); + if (processTaskVo == null) { + return null; + } + List teamUuidList = teamMapper.getTeamUuidListByUserUuid(processTaskVo.getOwner()); + if (CollectionUtils.isNotEmpty(teamUuidList)) { + Set upwardUuidSet = new HashSet<>(); + List teamList = teamMapper.getTeamByUuidList(teamUuidList); + for (TeamVo teamVo : teamList) { + String upwardUuidPath = teamVo.getUpwardUuidPath(); + if (StringUtils.isNotBlank(upwardUuidPath)) { + String[] upwardUuidArray = upwardUuidPath.split(","); + Collections.addAll(upwardUuidSet, upwardUuidArray); + } + } + if (CollectionUtils.isNotEmpty(upwardUuidSet)) { + JSONArray departmentPathList = new JSONArray(); + List upwardTeamList = teamMapper.getTeamByUuidList(new ArrayList<>(upwardUuidSet)); + for (TeamVo teamVo : upwardTeamList) { + if (TeamLevel.DEPARTMENT.getValue().equals(teamVo.getLevel())) { + departmentPathList.add(teamVo.getUpwardNamePath()); + } + } + return departmentPathList; + } + } + return null; + } +} diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskStepNameCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskStepNameCondition.java index 64588bf633d4239c87903e7a2f07057eeafe2e3e..e8aff5c4f3d43175c1afbe4fa22a9fa39dee40d7 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskStepNameCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskStepNameCondition.java @@ -10,19 +10,25 @@ import neatlogic.framework.process.condition.core.ProcessTaskConditionBase; import neatlogic.framework.process.constvalue.ConditionConfigType; import neatlogic.framework.process.constvalue.ProcessFieldType; import neatlogic.framework.process.constvalue.ProcessTaskConditionType; +import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.SqlDecoratorVo; import neatlogic.framework.process.workcenter.dto.JoinOnVo; import neatlogic.framework.process.workcenter.dto.JoinTableColumnVo; import neatlogic.framework.process.workcenter.table.ProcessTaskSqlTable; import neatlogic.framework.process.workcenter.table.ProcessTaskStepSqlTable; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Objects; @Component public class ProcessTaskStepNameCondition extends ProcessTaskConditionBase implements IProcessTaskCondition { + @Resource + private ProcessTaskMapper processTaskMapper; @Override public String getName() { @@ -81,7 +87,7 @@ public class ProcessTaskStepNameCondition extends ProcessTaskConditionBase imple @Override public Object valueConversionText(Object value, JSONObject config) { - return null; + return value; } @Override @@ -104,4 +110,17 @@ public class ProcessTaskStepNameCondition extends ProcessTaskConditionBase imple public boolean isShow(JSONObject object, String type) { return !Objects.equals(type, ProcessTaskConditionType.WORKCENTER.getValue()); } + + @Override + public Object getConditionParamData(ProcessTaskStepVo processTaskStepVo) { + String stepName = processTaskStepVo.getName(); + if (StringUtils.isBlank(stepName) && processTaskStepVo.getId() != null) { + ProcessTaskStepVo stepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepVo.getId()); + if (stepVo != null) { + stepName = stepVo.getName(); + processTaskStepVo.setName(stepName); + } + } + return stepName; + } }