feat: 新增企业的任务类型1

db/v2.0/20230921.sql

@@ -0,0 +1,2 @@
+alter table wm_task_type
+    add task_receiver_type char default '1' null comment '承接对象(1-个人,2-企业)';

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDeptTaskController.java

@@ -0,0 +1,48 @@
+package com.qunzhixinxi.hnqz.admin.controller;
+
+import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
+import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageMapper;
+import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 企业任务控制器
+ *
+ * @author lixuesong
+ * @date 2023/09/21
+ */
+@Slf4j
+@RestController
+@AllArgsConstructor
+public class WmDeptTaskController {
+
+    private final WmScorePackageMapper wmScorePackageMapper;
+
+    /**
+     * 查询关联的企业积分包
+     *
+     * @return {@link R}<{@link ?}> 结果
+     */
+    @GetMapping("/dept-task/list-related-ent-package")
+    public R<?> listRelatedEntPackage() {
+        Integer deptId = SecurityUtils.getUser().getDeptId();
+
+        WmScorePackage queryPackage = new WmScorePackage();
+        queryPackage.setDeptId(String.valueOf(deptId));
+        queryPackage.setTypeid("0,1,2");
+        List<WmScorePackage> packageList = wmScorePackageMapper.getScorePackagekfpjf(queryPackage);
+
+        return R.ok(packageList);
+    }
+
+    public R<?> saveEntTask() {
+        // TODO
+        return null;
+    }
+}

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

@@ -154,4 +154,9 @@ private static final long serialVersionUID = 1L;
 	 */
 	@ApiModelProperty(value="父级id")
 	private String parentId;
-    }
+
+	/**
+	 * 承接对象(1-个人,2-企业)
+	 */
+	private String taskReceiverType;
+}

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

@@ -0,0 +1,89 @@
+package com.qunzhixinxi.hnqz.admin.entity.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class DeptTaskDTO implements Serializable {
+    private static final long serialVersionUID = 410601826934557948L;
+
+    @Getter
+    @AllArgsConstructor
+    public enum DeptTaskDTOEnum {
+
+    }
+
+    /**
+     * 任务类型62-医学会各级年会及卫星会
+     *
+     * @author lixuesong
+     * @date 2023/09/21
+     */
+    @Data
+    public static class TaskType62 implements Serializable {
+        private static final long serialVersionUID = -2282200603021121878L;
+        /**
+         * 积分包id
+         */
+        private String packageId;
+
+        /**
+         * 会议主题
+         */
+        private String meetingtTitle;
+
+        /**
+         * 会议时间
+         */
+        private LocalDateTime meetingTime;
+
+        /**
+         * 会议人次
+         */
+        private String meetingNumber;
+
+        /**
+         * 会议邀请函
+         */
+        private String[] meetingInvitationUrl;
+
+        /**
+         * 会议计划表
+         */
+        private String[] meetingPlanUrl;
+
+        /**
+         * 会议签到表
+         */
+        private String[] meetingCheckInUrl;
+
+        /**
+         * 现场照片
+         */
+        private String[] livePhotosUrl;
+
+        /**
+         * 会议内容
+         */
+        private String[] meetingContent;
+
+        /**
+         * 外采费用
+         */
+        private String outsourcingAmount;
+
+        /**
+         * 外采费用-凭证
+         */
+        private String[] outsourcingAmountProof;
+
+        /**
+         * 会议总结
+         */
+        private String meetingSummary;
+    }
+}

hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/WmTaskTypeServiceTest.java

@@ -52,7 +52,9 @@ public class WmTaskTypeServiceTest {
 	
 	// 任务类型list
 	private static final List<String> taskTypeIdList = new ArrayList<String>(){{
-		add("41");
+		add("58");
+		add("59");
+		add("60");
 	}};
 
 	/**
@@ -94,6 +96,7 @@ public class WmTaskTypeServiceTest {
 				newOne.setBaseId(wmTaskType1.getId());
 				newOne.setRuleId(wmDaDrugEnt.getId());
 				newOne.setParentId(wmTaskType1.getParentId());
+				newOne.setTaskReceiverType(wmTaskType1.getTaskReceiverType());
 				List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
 						.eq(WmTaskType::getTaskTypeName, wmTaskType1.getTaskTypeName())
 						.eq(WmTaskType::getRuleId, newOne.getRuleId())
@@ -141,6 +144,7 @@ public class WmTaskTypeServiceTest {
 					newOne.setDeptId(wmDaAgent.getDeptId());
 					newOne.setStatus("0");
 					newOne.setBaseId(wmTaskType1.getId());
+					newOne.setTaskReceiverType(wmTaskType1.getTaskReceiverType());
 					List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
 							.eq(WmTaskType::getTaskTypeName, wmTaskType1.getTaskTypeName())
 							.eq(WmTaskType::getRuleId, newOne.getRuleId())
@@ -163,6 +167,7 @@ public class WmTaskTypeServiceTest {
 					newOne.setDeptId(wmDaAgent.getDeptId());
 					newOne.setStatus("0");
 					newOne.setBaseId(wmTaskType2.getId());
+					newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
 					List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
 							.eq(WmTaskType::getTaskTypeName, wmTaskType2.getTaskTypeName())
 							.eq(WmTaskType::getRuleId, newOne.getRuleId())
@@ -199,6 +204,7 @@ public class WmTaskTypeServiceTest {
 						newOne.setDeptId(wmDaAgent2.getDeptId());
 						newOne.setStatus("0");
 						newOne.setBaseId(wmTaskType2.getId());
+						newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
 						List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
 								.eq(WmTaskType::getTaskTypeName, wmTaskType2.getTaskTypeName())
 								.eq(WmTaskType::getRuleId, newOne.getRuleId())
@@ -248,6 +254,7 @@ public class WmTaskTypeServiceTest {
 				newOne.setDeptId(wmDaAgent.getDeptId());
 				newOne.setStatus("0");
 				newOne.setBaseId(wmTaskType2.getId());
+				newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
 				List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
 						.eq(WmTaskType::getTaskTypeName, wmTaskType2.getTaskTypeName())
 						.eq(WmTaskType::getRuleId, newOne.getRuleId())
@@ -284,6 +291,7 @@ public class WmTaskTypeServiceTest {
 					newOne.setDeptId(wmDaAgent2.getDeptId());
 					newOne.setStatus("0");
 					newOne.setBaseId(wmTaskType2.getId());
+					newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
 					List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
 						.eq(WmTaskType::getTaskTypeName, wmTaskType2.getTaskTypeName())
 						.eq(WmTaskType::getRuleId, newOne.getRuleId())