Merge remote-tracking branch 'origin/master'

# Conflicts:
#	bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkClueController.java
#	bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkProviderController.java
#	bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkClueDTO.java
#	bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/qry/BlinkClueQry.java
#	bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkClueServiceImpl.java
#	bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkClueRepository.java
#	bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkClueTeamRepository.java
#	bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkClueService.java
#	bound-link-api/blink-backend/src/main/resources/mapper/BlinkClueRepositoryMapper.xml
#	bound-link-api/blink-backend/src/main/resources/mapper/BlinkClueTeamRepositoryMapper.xml

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkActivityAttachmentController.java

@@ -26,8 +26,8 @@ public class BlinkActivityAttachmentController {
     }
 
     @Operation(summary = "分页查询活动附件列表")
-    @GetMapping("/supports/activity/attachment/queryPage")
-    public ResponseDTO<PageResult<BlinkActivityAttachmentDTO>> supportsActivityAttachmentQueryPage(BlinkActivityAttachmentQry qry) {
+    @PostMapping("/supports/activity/attachment/queryPage")
+    public ResponseDTO<PageResult<BlinkActivityAttachmentDTO>> supportsActivityAttachmentQueryPage(@RequestBody @Valid BlinkActivityAttachmentQry qry) {
         return attachmentService.supportsActivityAttachmentQueryPage(qry);
     }
 

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkActivityMemberController.java

@@ -26,8 +26,8 @@ public class BlinkActivityMemberController {
     }
 
     @Operation(summary = "分页查询服务成员列表")
-    @GetMapping("/supports/activity/member/queryPage")
-    public ResponseDTO<PageResult<BlinkActivityMemberDTO>> supportsActivityMemberQueryPage(BlinkActivityMemberQry qry) {
+    @PostMapping("/supports/activity/member/queryPage")
+    public ResponseDTO<PageResult<BlinkActivityMemberDTO>> supportsActivityMemberQueryPage(@RequestBody @Valid BlinkActivityMemberQry qry) {
         return memberService.supportsActivityMemberQueryPage(qry);
     }
 

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkMarketActivityController.java

@@ -7,10 +7,7 @@ import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -30,11 +27,16 @@ public class BlinkMarketActivityController {
     }
 
     @Operation(summary = "分页查询活动列表")
-    @GetMapping("/supports/activity/queryPage")
-    public ResponseDTO<PageResult<BlinkMarketActivityDTO>> supportsActivityQueryPage(BlinkMarketActivityQry qry) {
+    @PostMapping("/supports/activity/queryPage")
+    public ResponseDTO<PageResult<BlinkMarketActivityDTO>> supportsActivityQueryPage(@RequestBody @Valid BlinkMarketActivityQry qry) {
         return activityService.supportsActivityQueryPage(qry);
     }
 
+    @Operation(summary = "获取活动详情")
+    @GetMapping("/supports/activity/query/{id}")
+    public ResponseDTO<BlinkMarketActivityDTO> supportsActivityQuery(@PathVariable("id") Long id) {
+        return activityService.supportsActivityQuery(id);
+    }
 
 
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkProviderController.java

@@ -6,7 +6,6 @@ import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.backend.domain.qry.BlinkProviderQry;
 import com.wx.blink.backend.service.IBlinkProviderService;
 import com.wx.blink.common.dto.BlinkProviderDTO;
-import com.wx.blink.common.vo.BlinkProviderCreateVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 
 @RestController
 @Tag(name = "服务商管理")
@@ -27,13 +27,13 @@ public class BlinkProviderController {
     @NoNeedLogin
     @Operation(summary = "服务商创建")
     @PostMapping("/supports/provider/create")
-    public ResponseDTO<String> providerCreate(@RequestBody BlinkProviderCreateVO vo) {
-        return providerService.supportsProviderCreate(vo);
+    public ResponseDTO<String> providerCreate(@RequestBody @Valid BlinkProviderDTO dto) {
+        return providerService.supportsProviderCreate(dto);
     }
 
     @Operation(summary = "查询服务商列表")
-    @GetMapping("/supports/provider/queryPage")
-    public ResponseDTO<PageResult<BlinkProviderDTO>> supportsProviderQueryPage(BlinkProviderQry qry) {
+    @PostMapping("/supports/provider/queryPage")
+    public ResponseDTO<PageResult<BlinkProviderDTO>> supportsProviderQueryPage(@RequestBody @Valid BlinkProviderQry qry) {
         return providerService.supportsProviderQueryPage(qry);
     }
 

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkRetentionCustomerController.java

@@ -29,8 +29,8 @@ public class BlinkRetentionCustomerController {
     }
 
     @Operation(summary = "分页查询留资客户列表")
-    @GetMapping("/supports/retention/activity/queryPage")
-    public ResponseDTO<PageResult<BlinkRetentionCustomerDTO>> supportsRetentionCustomerQueryPage(BlinkRetentionCustomerQry qry) {
+    @PostMapping("/supports/retention/activity/queryPage")
+    public ResponseDTO<PageResult<BlinkRetentionCustomerDTO>> supportsRetentionCustomerQueryPage(@RequestBody @Valid BlinkRetentionCustomerQry qry) {
         return retentionCustomerService.supportsRetentionCustomerQueryPage(qry);
     }
 

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkClueDO.java

@@ -7,14 +7,19 @@ import com.wx.blink.base.common.domain.BaseEntity;
 import lombok.Data;
 
 @Data
-@TableName("blink_clue")
+@TableName("blink_project")
 public class BlinkClueDO extends BaseEntity {
 
     /**
      * id
      */
     @TableId(type = IdType.AUTO)
-    private Long id;
+    private String id;
+
+    /**
+     * 父级id
+     */
+    private String parentId;
 
     /**
      * 项目名称
@@ -22,10 +27,15 @@ public class BlinkClueDO extends BaseEntity {
     private String projectName;
 
     /**
-     * 项目编码
+     * 项目ID
      */
     private String projectId;
 
+    /**
+     * 分级码
+     */
+    private Integer gradeCode;
+
     /**
      * 项目类型
      */
@@ -36,11 +46,36 @@ public class BlinkClueDO extends BaseEntity {
      */
     private String clueName;
 
+    /**
+     * 流程流水编号
+     */
+    private String sequenceNumber;
+
+    /**
+     * 流程实例id
+     */
+    private String instanceId;
+
     /**
      * 线索来源
      */
     private String clueSource;
 
+    /**
+     * 服务商id
+     */
+    private String providerId;
+
+    /**
+     * 活动id
+     */
+    private String activityId;
+
+    /**
+     * 介绍说明
+     */
+    private String introduction;
+
     /**
      * 服务商名称
      */
@@ -87,54 +122,54 @@ public class BlinkClueDO extends BaseEntity {
     private String districtName;
 
     /**
-     * 项目地址
+     * 详细地址
      */
-    private String projectAddress;
+    private String address;
 
     /**
-     * 项目来源
+     * 业主单位
      */
-    private String projectSource;
+    private String landlordUnitId;
 
     /**
-     * 甲方
+     * 设计单位
      */
-    private String lessor;
+    private String designUnitId;
 
     /**
-     * 业主单位
-     * */
-    private String ownersFlats;
+     * 总承包单位
+     */
+    private String contractorUnitId;
 
     /**
-     * 设计单位
+     * 招标代理单位
      */
-    private String designFlats;
+    private String tenderUnitId;
 
     /**
-     * 总承包单位
+     * 甲方单位
      */
-    private String generalContractingFlats;
+    private String partAUnit;
 
     /**
-     * 招商代理单位
+     * 项目来源
      */
-    private String investmentAgentFlats;
+    private String projectSource;
 
     /**
      * 是否联合体
      */
-    private String complex;
+    private String coalitionUnitState;
 
     /**
      * 联合体情况说明
      */
-    private String complexDescription;
+    private String coalitionDescription;
 
     /**
      * 项目所属行业
      */
-    private String projectBelongIndustry;
+    private String belongIndustry;
 
     /**
      * 业务类型
@@ -154,17 +189,17 @@ public class BlinkClueDO extends BaseEntity {
     /**
      * 项目预算（概算金额【万】）
      */
-    private String projectBudget;
+    private String budgetAmount;
 
     /**
      * 项目资金来源
      */
-    private String projectMoneySource;
+    private String financeSource;
 
     /**
      * 分厂/几期/机组
      */
-    private String factory;
+    private String shortDescription;
 
     /**
      * 项目背景
@@ -174,22 +209,12 @@ public class BlinkClueDO extends BaseEntity {
     /**
      * 项目阶段
      */
-    private String projectStage;
+    private String projectProgress;
 
     /**
      * 归属营销人员
      */
-    private String belongMarketer;
-
-    /**
-     * 归属营销部门
-     */
-    private String belongMarketingDepartment;
-
-    /**
-     * 产品类型
-     */
-    private String productType;
+    private String marketStaff;
 
     /**
      * 附件集合
@@ -199,7 +224,7 @@ public class BlinkClueDO extends BaseEntity {
     /**
      * 审核状态（0待审核、1审核中、3不通过、4通过）
      */
-    private Integer status;
+    private Integer auditStatus;
 
     /**
      * 项目状态

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkClueTeamDO.java

@@ -7,7 +7,7 @@ import com.wx.blink.base.common.domain.BaseEntity;
 import lombok.Data;
 
 @Data
-@TableName("blink_clue_team")
+@TableName("blink_project_combine_team")
 public class BlinkClueTeamDO extends BaseEntity {
 
     /**
@@ -34,6 +34,6 @@ public class BlinkClueTeamDO extends BaseEntity {
     /**
      * 线索ID
      */
-    private Integer clueId;
+    private Integer projectId;
 
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkProviderDO.java

@@ -95,6 +95,11 @@ public class BlinkProviderDO extends BaseEntity {
      */
     private String address;
 
+    /**
+     * 沟通语言
+     */
+    private String communicateLanguage;
+
     /**
      * 联系人
      */

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkMarketActivityDTO.java

@@ -2,6 +2,7 @@ package com.wx.blink.backend.domain.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wx.blink.base.common.annoation.DataAdaptorMapping;
 import com.wx.blink.base.common.domain.BaseEntity;
 import com.wx.blink.base.common.json.deserializer.DictValueVoDeserializer;
 import com.wx.blink.base.common.json.deserializer.FileKeyVoDeserializer;
@@ -30,9 +31,10 @@ public class BlinkMarketActivityDTO extends BaseEntity {
     private String activityCode;
 
     /**
-     * 活动类型
+     * 活动类型（BLINK_EXPO_TYPE）
      */
     @JsonDeserialize(using = DictValueVoDeserializer.class)
+    @DataAdaptorMapping(type = "dict", value = "BLINK_EXPO_TYPE")
     private String activityType;
 
     /**

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/qry/BlinkProviderQry.java

@@ -9,7 +9,7 @@ public class BlinkProviderQry extends PageParam {
     /**
      * id
      */
-    private Long id;
+    private String id;
 
     /**
      * 服务商名称 search

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkMarketActivityServiceImpl.java

@@ -113,4 +113,23 @@ public class BlinkMarketActivityServiceImpl extends ServiceImpl<BlinkMarketActiv
         return ResponseDTO.ok(pageResult);
     }
 
+    /**
+     * 获取活动详情
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public ResponseDTO<BlinkMarketActivityDTO> supportsActivityQuery(Long id) {
+        // 验证活动名称是否重复
+        BlinkMarketActivityDO marketActivityDO = repository.queryByActivityName(null, id, Boolean.FALSE);
+        if (!Objects.nonNull(marketActivityDO)) {
+            return ResponseDTO.userErrorParam("活动不存在!请检查");
+        }
+        BlinkMarketActivityDTO dto = new BlinkMarketActivityDTO();
+        activityMapper.toBlinkMarketActivityDTO(marketActivityDO, dto);
+        return ResponseDTO.ok(dto);
+
+    }
+
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/objectmapper/BlinkMarketActivityMapper.java

@@ -17,5 +17,13 @@ public interface BlinkMarketActivityMapper {
      */
     void toBlinkMarketActivityDO(BlinkMarketActivityDTO dto, @MappingTarget BlinkMarketActivityDO activityDO);
 
+    /**
+     * 活动主数据do转dto
+     *
+     * @param dto
+     * @return
+     */
+    void toBlinkMarketActivityDTO(BlinkMarketActivityDO activityDO, @MappingTarget BlinkMarketActivityDTO dto);
+
 
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkMarketActivityService.java

@@ -23,5 +23,11 @@ public interface IBlinkMarketActivityService {
      */
     ResponseDTO<PageResult<BlinkMarketActivityDTO>> supportsActivityQueryPage(BlinkMarketActivityQry qry);
 
-
+    /**
+     * 获取活动详情
+     *
+     * @param id
+     * @return
+     */
+    ResponseDTO<BlinkMarketActivityDTO> supportsActivityQuery(Long id);
 }

bound-link-api/blink-backend/src/main/resources/mapper/BlinklMarketActivityRepositoryMapper.xml

@@ -19,8 +19,8 @@
         select *
         from blink_market_activity
         where deleted_flag = '0'
-        <if test="query.activityName != null and query.activityName !=''">
-            AND avtivity_name = #{query.activityName}
+        <if test="query.activityName != null and query.activityName != ''">
+            AND activity_name LIKE concat('%', #{query.activityName}, '%')
         </if>
         <if test="query.id != null">
             AND id = #{query.id}

bound-link-api/blink-common-dto/src/main/java/com/wx/blink/common/dto/BlinkProviderDTO.java

@@ -7,6 +7,7 @@ import com.wx.blink.base.common.domain.BaseEntity;
 import com.wx.blink.base.common.json.deserializer.DictValueVoDeserializer;
 import com.wx.blink.base.common.json.deserializer.FileKeyVoDeserializer;
 import com.wx.blink.base.common.json.serializer.FileKeyVoSerializer;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,13 +18,14 @@ public class BlinkProviderDTO extends BaseEntity {
     /**
      * 主键
      */
-    private Long id;
+    private String id;
 
     /**
      * 服务商类型
      */
     @JsonDeserialize(using = DictValueVoDeserializer.class)
     @DataAdaptorMapping(type = "dict", value = "BLINK_PROVIDER_TYPE")
+    @Schema(description = "服务商类型")
     private String providerType;
 
     /**
@@ -31,91 +33,115 @@ public class BlinkProviderDTO extends BaseEntity {
      */
     @JsonDeserialize(using = DictValueVoDeserializer.class)
     @DataAdaptorMapping(type = "dict", value = "BLINK_PROVIDER_REGION_TYPE")
+    @Schema(description = "区域类型")
     private String regionType;
 
     /**
      * 服务商名称
      */
+    @Schema(description = "服务商名称")
     private String providerName;
 
     /**
      * 统一社会代码
      */
+    @Schema(description = "统一社会代码")
     private String socialCode;
 
     /**
      * 法人
      */
+    @Schema(description = "法人")
     private String legalPerson;
 
     /**
      * 销售团队（数量）
      */
+    @Schema(description = "销售团队")
     private Integer teamNumber;
 
     /**
      * 当前职务
      */
+    @Schema(description = "当前职务")
     private String currentPosition;
 
     /**
      * 省市区
      */
+    @Schema(description = "省市区")
     private String provinceCityDistrict;
 
     /**
      * 国家或地区
      */
+    @Schema(description = "国家或地区")
     private String countryRegion;
 
     /**
      * 省份
      */
+    @Schema(description = "省份")
     private String province;
 
     /**
      * 省份名称
      */
+    @Schema(description = "省份名称")
     private String provinceName;
 
     /**
      * 城市
      */
+    @Schema(description = "城市")
     private String city;
 
     /**
      * 城市名称
      */
+    @Schema(description = "城市名称")
     private String cityName;
 
     /**
      * 区县
      */
+    @Schema(description = "区县")
     private String district;
 
     /**
      * 区县名称
      */
+    @Schema(description = "区县名称")
     private String districtName;
 
     /**
      * 详细地址
      */
+    @Schema(description = "详细地址")
     private String address;
 
+    /**
+     * 沟通语言
+     */
+    @Schema(description = "沟通语言")
+    private String communicateLanguage;
+
     /**
      * 联系人
      */
+    @Schema(description = "联系人")
     private String contactPeople;
 
     /**
      * 联系人电话
      */
+    @Schema(description = "联系人电话")
     private String contactPhone;
 
     /**
      * 紧急审核状态
      */
+    @Schema(description = "紧急审核状态")
     @JsonDeserialize(using = DictValueVoDeserializer.class)
     @DataAdaptorMapping(type = "dict", value = "BLINK_COMMON_JUDGE")
     private String emergencyState;
@@ -123,6 +149,7 @@ public class BlinkProviderDTO extends BaseEntity {
     /**
      * 是否有在手项目
      */
+    @Schema(description = "是否有在手项目")
     @JsonDeserialize(using = DictValueVoDeserializer.class)
     @DataAdaptorMapping(type = "dict", value = "BLINK_COMMON_JUDGE")
     private String inHandState;
@@ -130,11 +157,13 @@ public class BlinkProviderDTO extends BaseEntity {
     /**
      * 企业业务简介
      */
+    @Schema(description = "企业业务简介")
     private String companyDescription;
 
     /**
      * 业务资源简介
      */
+    @Schema(description = "业务资源简介")
     private String companyNature;
 
     /**
@@ -142,6 +171,7 @@ public class BlinkProviderDTO extends BaseEntity {
      */
     @JsonDeserialize(using = DictValueVoDeserializer.class)
     @DataAdaptorMapping(type = "dict", value = "BLINK_ENROLL_SOURCE")
+    @Schema(description = "注册来源")
     private String storeSource;
 
     /**
@@ -149,6 +179,13 @@ public class BlinkProviderDTO extends BaseEntity {
      */
     @JsonDeserialize(using = FileKeyVoDeserializer.class)
     @JsonSerialize(using = FileKeyVoSerializer.class)
+    @Schema(description = "营业执照")
     private String businessCertificate;
 
+    /**
+     * 入库状态 0已认证 1不合格
+     */
+    @Schema(description = "入库状态 0已认证 1不合格")
+    private String storeStatus;
+
 }

bound-link-api/sa-flow-api/src/main/java/com/cloud/sa/api/AppEngineController.java

@@ -1,21 +1,19 @@
 package com.cloud.sa.api;
 
 import com.alibaba.fastjson.JSONObject;
-import com.cloud.sa.flow.commom.domain.UserTaskQueryForm;
 import com.cloud.sa.flow.commom.common.model.StCodeMsg;
 import com.cloud.sa.flow.commom.common.model.StResult;
 import com.cloud.sa.flow.commom.common.utils.StString;
-import com.cloud.sa.flow.commom.domain.virentity.ViewFormTop;
-import com.cloud.sa.flow.commom.service.setting.StSettingService;
-import com.cloud.sa.flow.engine.service.StFlowService;
-import com.cloud.sa.flow.commom.service.flow.StTaskItemService;
+import com.cloud.sa.flow.commom.domain.UserTaskQueryForm;
 import com.cloud.sa.flow.commom.domain.entity.StFlowMenu;
 import com.cloud.sa.flow.commom.domain.entity.StFlowTemplate;
 import com.cloud.sa.flow.commom.domain.entity.StTaskitem;
 import com.cloud.sa.flow.commom.domain.virentity.FlowEnteredParam;
+import com.cloud.sa.flow.commom.domain.virentity.ViewFormTop;
 import com.cloud.sa.flow.commom.service.StMenuService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.cloud.sa.flow.commom.service.flow.StTaskItemService;
+import com.cloud.sa.flow.commom.service.setting.StSettingService;
+import com.cloud.sa.flow.engine.service.StFlowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -40,7 +38,6 @@ import java.util.concurrent.ExecutionException;
  * @author lc
  * @date 2024/6/19 17:50
  */
-@Tag(name = "流程中心")
 @RequestMapping("/bpm/core")
 @RestController
 public class AppEngineController {
@@ -60,18 +57,18 @@ public class AppEngineController {
      * @param flowEnteredParam
      * @return
      */
-    @Operation(summary = "提交流程")
     @PostMapping("/instance/savesubmit")
     public StResult SaveSubmitInstance(@Validated @RequestBody FlowEnteredParam flowEnteredParam) {
         StTaskitem taskitem = null;
-        if (StString.isNotEmpty(flowEnteredParam.getTableData())) {
+        if (flowEnteredParam.getIsBatches() == false) {
             //如果不是批量的审批通过，则先走一下保存
             taskitem = flowService.Save(flowEnteredParam, false);
             flowEnteredParam.setTaskid(taskitem.getObjectid());
         }
         try {
-            flowService.Submit(flowEnteredParam);
-            return StResult.success(taskitem);
+            String errorMessage = flowService.Submit(flowEnteredParam);
+            flowEnteredParam.setErrorMessage(errorMessage);
+            return StResult.success(flowEnteredParam);
         } catch (Exception e) {
             settingService.FlowCommonExceptionRecord(e, taskitem.getObjectid(), "提交");
             return StResult.error(StCodeMsg.SERVER_EXCEPTION, e.getMessage());

bound-link-api/sa-flow-common/src/main/java/com/cloud/sa/flow/commom/domain/virentity/FlowEnteredParam.java

@@ -1,12 +1,11 @@
 package com.cloud.sa.flow.commom.domain.virentity;
 
-import java.awt.print.PrinterGraphics;
-
 /**
  * @author lc
  * @date 2024/6/5 13:26
  */
 public class FlowEnteredParam {
+    private Boolean isBatches = false;
     private String flowCode;
     private Integer flowVersion;
     private String bizObjectid;
@@ -21,6 +20,23 @@ public class FlowEnteredParam {
      * 用于加签、传阅、转发等操作
      */
     private String targetUserCode;
+    private String errorMessage;
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public Boolean getIsBatches() {
+        return isBatches;
+    }
+
+    public void setIsBatches(Boolean isBatches) {
+        this.isBatches = isBatches;
+    }
 
     public String getComment() {
         return comment;