commit

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeUnionPushController.java

@@ -270,7 +270,6 @@ public class ExecutiveCommitteeUnionPushController {
             // 自动完成第一个申请任务
             List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
             for (ProcessTask task : doingTaskList) {
-                args.put(FlowConst.NEXT_NODE_OPERATOR, ExecutiveCommitteeUnionPushInfo.getUserId());
                 flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args);
             }
         });

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeTwoPush.java

@@ -66,4 +66,15 @@ public class ExecutiveCommitteeTwoPush extends BaseModel implements Serializable
     @Comment("推选时间")
     @ColDefine(type = ColType.DATETIME)
     private DateTime pushDate;
+
+    @Column
+    @Comment("录入类型1.执委会委员/2.工会委员会委员/3.经审委员会委员")
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    private String roleCode;
+
+    @Column
+    @Comment("是否正式委员")
+    @Default("0")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isFormal;
 }

src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js

@@ -71,9 +71,9 @@ const merge = {
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="审核意见" prop="approvalOpinion"
+                    <el-form-item label="审核意见" prop="tf_opinion"
                                   :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                        <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
+                        <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                     </el-form-item>
                 </el-form>
                 <el-row type="flex" justify="end">