Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -876,7 +876,7 @@ //数据更改回调 updataSumbit(val){ this.DataVisible = false; val.copyfromversion = this.rowOid; val.copyFromVersion = this.rowOid; val.oid='' console.log(val) upSaveCode(val).then(res=>{ Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -231,7 +231,11 @@ <el-input style="width: 260px;margin-left: 15px" placeholder="输入值后进行模糊查询" v-model="SelectFInd"></el-input> <el-button size="small" type="primary" plain @click="SelectFindeHandler" style="margin-left: 20px">查询</el-button> </template> <avue-crud :data="masterData" :option="masterOption" @select="masterSelect"></avue-crud> <avue-crud :data="masterData" :option="masterOption" @row-click="masterSelect"> <template slot="radio" slot-scope="{row}"> <el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{''}}</el-radio> </template> </avue-crud> <div style="height: 30px"> <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >已设置的值为:[{{this.TreeAddform.coderuleoidName ==''?'未设置值':this.TreeAddform.coderuleoidName}}]</div> <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" > @@ -255,7 +259,11 @@ <el-input style="width: 260px;margin-left: 15px" placeholder="输入值后进行模糊查询" v-model="SelectFInd"></el-input> <el-button size="small" type="primary" plain @click="KeySelectFindeHandler" style="margin-left: 20px">查询</el-button> </template> <avue-crud :data="KeyData" :option="masterOption" @select="KeySelect"></avue-crud> <avue-crud :data="KeyData" :option="masterOption" @row-click="KeySelect"> <template slot="radio" slot-scope="{row}"> <el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{''}}</el-radio> </template> </avue-crud> <div style="height: 30px"> <div style="display: inline-block;float: left;border: 1px solid #eeeeee;padding: 5px;margin-top: 5px;font-size: 14px " >已设置的值为:[{{this.TreeAddform.codeKeyAttrRepeatOidName ==''?'未设置值':this.TreeAddform.codekeyattrrepeatoidName}}]</div> <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" > @@ -279,7 +287,11 @@ <el-input style="width: 260px;margin-left: 15px" placeholder="输入值后进行模糊查询" v-model="SelectFInd"></el-input> <el-button size="small" type="primary" plain @click="SimSelectFindeHandler" style="margin-left: 20px">查询</el-button> </template> <avue-crud :data="simData" :option="masterOption" @select="simSelect"></avue-crud> <avue-crud :data="simData" :option="masterOption" @row-click="simSelect"> <template slot="radio" slot-scope="{row}"> <el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{''}}</el-radio> </template> </avue-crud> <div style="height: 30px"> <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >已设置的值为:[{{this.TreeAddform.codeResembleRuleOidName ==''?'未设置值':this.TreeAddform.codeResembleRuleOidName}}]</div> <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" > @@ -772,11 +784,11 @@ }, //编码多选 masterSelect(row){ if(row.length>0){ this.masterRow=row.$index; this.masterSelectList=row; this.masterName=row[0].name; this.masterOid=row[0].oid; } this.masterName=row.name; this.masterOid=row.oid; }, //编码规则查询 SelectFindeHandler(){ @@ -859,9 +871,10 @@ }, // 关键多选 KeySelect(row){ this.masterRow=row.$index; this.KeySelectLIst=row; this.KeyName=row[0].name; this.KeyOid=row[0].oid; this.KeyName=row.name; this.KeyOid=row.oid; }, //关键失焦 simFouce(){ @@ -898,9 +911,10 @@ }, // 相似项多选 simSelect(row){ this.masterRow=row.$index; this.simSelectList=row; this.simName=row[0].name; this.simOid=row[0].oid; this.simName=row.name; this.simOid=row.oid; }, //相似项项接口 simdefaultRend(){ Source/UBCS/ubcs-ops-api/ubcs-flow-api/src/main/java/com/vci/ubcs/flow/core/entity/BladeFlow.java
@@ -185,6 +185,11 @@ private String historyActivityIdea; /** * 流程开始事件 */ private String processDefinitionStartTime; /** * 获取是否通过 */ public boolean isPass() { Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
@@ -24,6 +24,7 @@ import com.vci.ubcs.flow.engine.constant.FlowEngineConstant; import com.vci.ubcs.flow.engine.entity.FlowProcess; import com.vci.ubcs.flow.engine.utils.FlowCache; import com.vci.ubcs.starter.web.util.VciDateUtil; import com.vci.ubcs.system.user.cache.UserCache; import com.vci.ubcs.system.user.entity.User; import lombok.AllArgsConstructor; @@ -340,10 +341,11 @@ flow.setHistoryActivityIdea(commentList.get(0).getFullMessage()); } } List<HistoricProcessInstance> processInstanceList = historyService.createHistoricProcessInstanceQuery() .processInstanceId(task.getProcessInstanceId()).orderByProcessInstanceStartTime().asc().list(); flow.setProcessDefinitionStartTime(VciDateUtil.date2Str(processInstanceList.get(0).getStartTime(),VciDateUtil.DateTimeFormat)); // 获取流程发起人名称 if (FlowEngineConstant.START_EVENT.equals(historicActivityInstance.getActivityType())) { List<HistoricProcessInstance> processInstanceList = historyService.createHistoricProcessInstanceQuery() .processInstanceId(task.getProcessInstanceId()).orderByProcessInstanceStartTime().asc().list(); if (processInstanceList.size() > 0) { if (StringUtil.isNotBlank(processInstanceList.get(0).getStartUserId())) { String taskUser = processInstanceList.get(0).getStartUserId(); @@ -357,9 +359,14 @@ } if (Func.isNotEmpty(historicProcessInstance)) { String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey()); String[] businessKey = new String[2]; if(historicProcessInstance.getBusinessKey().contains(StringPool.COLON)){ businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey()); }else{ businessKey[0] = historicProcessInstance.getBusinessKey(); } flow.setBusinessTable(businessKey[0]); flow.setBusinessId(businessKey.length>1?businessKey[1]:"1"); flow.setBusinessId(businessKey.length>1 && StringUtils.isNotEmpty(businessKey[1])?businessKey[1]:"1"); } FlowProcess processDefinition = FlowCache.getProcessDefinition(task.getProcessDefinitionId()); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -2607,17 +2607,10 @@ orderDTO.getCodeClassifyOid(), "主题库分类的主键"); //需要升版 // ClientBusinessObjectOperation cboOperation = new ClientBusinessObjectOperation(); BaseModel cbo = null; // try { // //cbo = cboOperation.createBusinessObjectVersion(oldCbo,VciBaseUtil.getCurrentUserId()); cbo = reviseBusinessObject(oldCbo); // } catch (VCIError e) { // throw new VciBaseException("初始化相关的内容出现了错误", new String[0], e); // } //1. 判断必输项 //CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid()); checkRequiredAttrOnOrder(templateVO, orderDTO); checkRequiredAttrOnOrder(templateVO, orderDTO); //2.先注入，再组合，最后校验 switchClassifyLevelOnOrder(templateVO, classifyFullInfo, orderDTO); //3.处理组合规则。组合规则不能使用编码的属性，因为编码的生成可能是需要属性的 @@ -2635,20 +2628,17 @@ //企业码和集团码的不修改 cbo.setDescription(StringUtils.isBlank(orderDTO.getDescription()) ? "" : orderDTO.getDescription()); cbo.setName(orderDTO.getName()); // try { cbo.setDescription(StringUtils.isBlank(orderDTO.getDescription()) ? "" : orderDTO.getDescription()); // cbo.setAttributeValueWithNoCheck("description", StringUtils.isBlank(orderDTO.getDescription())?"":orderDTO.getDescription()); cbo.setName(orderDTO.getName()); // } catch (VCIError e) { // e.printStackTrace(); // } //数据的时候，编码是不变的 cbo.setCreateTime(cbo.getCreateTime()); cbo.setLastModifyTime(cbo.getLastModifyTime()); // List<ClientBusinessObject> cboList = new ArrayList<>(); // cboList.add(cbo); cbo.setTenantId(AuthUtil.getTenantId()); oldCbo.setLastV("0"); oldCbo.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId())); oldCbo.setLastModifyTime(new Date()); try { // cboOperation.saveRevisionBuinessObject(cbo); updateBatchByBaseModel(oldCbo.getBtmname(), Collections.singletonList(oldCbo)); insertBatchByType(cbo.getBtmname(), Collections.singletonList(cbo)); } catch (Exception vciError) { throw new VciBaseException("数据更改保存出错了", new String[0], vciError);
