Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/entity/runbpm/BpmRunNodeFormFilterConditionsVo.java

@@ -45,7 +45,7 @@ public class BpmRunNodeFormFilterConditionsVo {
     /**
      * 是否以表名为键
      */
-    private boolean  isTableNameKey;
+    private boolean  isTableNameKey = true;
 
 
     public BpmRunNodeFormFilterConditionsVo() {

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionEditTheFinishTimeAgain.java

@@ -29,7 +29,7 @@ public class ExceptionEditTheFinishTimeAgain implements IRunBPMService {
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
         Map<String, Object> map = new HashMap<>();
         map.put("id",Long.valueOf(bpmRunNodeFromVo.getTaskPlanKey()));
-        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("master_task", map, true));
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("master_task", map, false,false));
         return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
     }
 

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionQualityControlCardEdit.java

@@ -30,8 +30,8 @@ public class ExceptionQualityControlCardEdit implements IRunBPMService {
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
         //质控卡
         Map<String,Object> map = new HashMap<>();
-//        map.put("task_process_key",bpmRunNodeFromVo.getTaskProcessKey());
-        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("record_quality_control_card", map, true));
+        map.put("task_process_key",bpmRunNodeFromVo.getTaskProcessKey());
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("record_quality_control_card", map, false,false));
         return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
     }