Merge branch 'feat-20240129-meetingtasktype'

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/dto/DeptTaskDTO.java

@@ -152,6 +152,11 @@ public class DeptTaskDTO implements Serializable {
          */
         private List<FileUrlObj> outsourcingAmountProof;
 
+		/**
+		 * 企业批复证明
+		 */
+		private List<FileUrlObj> enterpriseApprovalProof;
+
         /**
          * 会议总结
          */
@@ -159,7 +164,7 @@ public class DeptTaskDTO implements Serializable {
     }
 
     /**
-     * 任务类型63-专家共识巡讲会
+     * 任务类型63-专家学术研讨会(曾用名:专家共识巡讲会)
      *
      * @author lixuesong
      * @date 2023/09/21
@@ -232,6 +237,11 @@ public class DeptTaskDTO implements Serializable {
          */
         private List<FileUrlObj> outsourcingAmountProof;
 
+		/**
+		 * 企业批复证明
+		 */
+		private List<FileUrlObj> enterpriseApprovalProof;
+
         /**
          * 会议总结
          */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDeptTaskServiceImpl.java

@@ -167,6 +167,8 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
         taskContent.setTemp10(params.getOutsourcingAmount());
         // 外采费用凭证
         taskContent.setTemp11(this.convertFileUrlArrayToString(params.getOutsourcingAmountProof()));
+		// 企业批复证明
+		taskContent.setTemp15(this.convertFileUrlArrayToString(params.getEnterpriseApprovalProof()));
         // 总结
         taskContent.setTemp12(params.getMeetingSummary());
         log.info("保存taskContent参数:{}", taskContent);
@@ -226,6 +228,8 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
         taskContent.setTemp10(params.getOutsourcingAmount());
         // 外采费用凭证
         taskContent.setTemp11(this.convertFileUrlArrayToString(params.getOutsourcingAmountProof()));
+		// 企业批复证明
+		taskContent.setTemp15(this.convertFileUrlArrayToString(params.getEnterpriseApprovalProof()));
         // 总结
         taskContent.setTemp12(params.getMeetingSummary());
         log.info("保存taskContent参数:{}", taskContent);