feat: 新增/查询积分包相关 适配招商经理角色

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

@@ -1745,7 +1745,7 @@ public class ApiController {
 //		LambdaQueryWrapper<WmScorePackage> scoreQuery = Wrappers.lambdaQuery(query);
 
 		IPage<WmScorePackageApiOutput> scorePage;
-		// 小程序角色:5-全职学术信息沟通专员, 6-兼职学术信息沟通专员, 10-兼职CRC, 13-HCP
+		// 小程序角色:5-全职学术信息沟通专员, 6-兼职学术信息沟通专员, 10-兼职CRC, 13-HCP, 31-招商经理 (全职/招商经理不用领包)
 		if (1 == selType && (isZbRole(userVO.getRoleList(), 6) || isZbRole(userVO.getRoleList(), 10)
 				|| isZbRole(userVO.getRoleList(), 13))) {
 			WmScorePackage query = new WmScorePackage();

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

@@ -332,7 +332,7 @@ public class SysDeptInvoiceServiceImpl extends ServiceImpl<SysDeptInvoiceMapper,
             vo.setScorePackageStatusStr(Objects.requireNonNull(ScorePackageStatusEnum.getByVal(vo.getScorePackageStatus())).getDesc());
             WmScorePackage scorePackage = finalScorePackageMap.get(vo.getScorePackageId());
             if (scorePackage != null) {
-                if ("3".equals(scorePackage.getTypeid()) || "4".equals(scorePackage.getTypeid())) {
+                if ("3".equals(scorePackage.getTypeid()) || "4".equals(scorePackage.getTypeid()) || "5".equals(scorePackage.getTypeid())) {
                     vo.setType(RechargeRecordType.SEND_PACKAGE_PERSONAL);
                     vo.setTypeStr(RechargeRecordType.SEND_PACKAGE_PERSONAL.getDescription());
                 } else {

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

@@ -592,7 +592,7 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
 			scorePackageWrapper.eq(WmScorePackage::getPackageType1, PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val());
 			scorePackageWrapper.eq(WmScorePackage::getPackageType2, PackageTypeEnum.TYPE2_TASK_PACKAGE.val());
 			scorePackageWrapper.ge(WmScorePackage::getScorePackageStatus, ScorePackageStatusEnum.IN_PROGRESS.val());
-			scorePackageWrapper.in(WmScorePackage::getTypeid, "3", "4");
+			scorePackageWrapper.in(WmScorePackage::getTypeid, "3", "4", "5");
 			if (taskTypeConfigJsonDTO.getAssociateLower()) {
 				// 配置了关联下级，则同时查询'对应机构下发的企业承接的任务，再下发给个人的积分包'
 				List<WmScorePackage> scorePackageList = wmScorePackageService.list(scorePackageWrapper);

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

@@ -743,11 +743,17 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		// 数据来源类型（0-手动上传，1-系统对接）
 		wmScorePackage.setSourceType("0");
 
-		if ("3".equals(wmScorePackage.getTypeid())) {//全职学术推广员
-			wmScorePackage.setIsReceive("1");//不允许接单
-			wmScorePackage.setScorePackageStatus("3");//全职学术推广员不需要审核，所有状态直接是进行中
-		} else if ("4".equals(wmScorePackage.getTypeid())) {//兼职学术推广员
-			wmScorePackage.setIsReceive("0");//允许接单
+		if ("3".equals(wmScorePackage.getTypeid()) || "5".equals(wmScorePackage.getTypeid())) {
+			// 全职学术推广员/招商经理角色的处理
+			// 不允许接单
+			wmScorePackage.setIsReceive("1");
+			// 全职学术推广员不需要审核，所有状态直接是进行中
+			wmScorePackage.setScorePackageStatus("3");
+		} else if ("4".equals(wmScorePackage.getTypeid())) {
+			// 兼职学术推广员的处理
+			// 允许接单
+			wmScorePackage.setIsReceive("0");
+			// 已分派待申领
 			wmScorePackage.setScorePackageStatus("1");//已分派待申领
 		}
 		if (PackageTypeEnum.TYPE1_HCP_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
@@ -921,7 +927,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		page.addOrder(orderItem);
 		wmScorePackage.setSendPackageDeptId(SecurityUtils.getUser().getDeptId() + "");
 		if (StringUtil.isEmpty(wmScorePackage.getTypeid())) {
-			wmScorePackage.setTypeid("3,4");
+			wmScorePackage.setTypeid("3,4,5");
 		}
 		IPage<WmScorePackage> pages = wmScorePackageMapper.getScorePackageList(page, wmScorePackage);
 		List<WmScorePackage> records = pages.getRecords();
@@ -1365,8 +1371,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		Set taskTypeSet = taskTypelist.stream().map(WmScoreTaskType::getTaskTypeId).collect(Collectors.toSet());
 		wmScorePackage.setTaskTypeSet(taskTypeSet);
 		wmScorePackage.setTaskTypeId(taskTypelist.get(0).getTaskTypeId());
-		if (wmScorePackage.getTypeid().equals("3")) {
-			//查询接单对象
+		if (wmScorePackage.getTypeid().equals("3") || wmScorePackage.getTypeid().equals("5")) {
+			//查询接单对象(3-全职,5-招商经理)
 			List<WmScorePackageStatus> staList = wmScorePackageStatusService.list(Wrappers.<WmScorePackageStatus>lambdaQuery()
 					.eq(WmScorePackageStatus::getPackageId, wmScorePackage.getId())
 					.eq(WmScorePackageStatus::getDelFlag, "0"));
@@ -1507,7 +1513,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 		//保存接单对象，全职学术推广员，允许选多个
 		wmScorePackageStatusService.delStatusByPackageId(wmScorePackage.getId());
-		if (wmScorePackage.getTypeid().equals("3")) {
+		if (wmScorePackage.getTypeid().equals("3") || wmScorePackage.getTypeid().equals("5")) {
 			List<String> userList = wmScorePackage.getUserList();
 			if (null != userList && userList.size() > 0) {
 				List<WmScorePackageStatus> stuList = new ArrayList<>();
@@ -1623,7 +1629,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		if (wmScorePackage.getTypeid() != null && wmScorePackage.getTypeid().equals("4")) {//兼职学术推广员
 			wmScorePackage.setXxdbId(null);
 		}
-		if ("3".equals(wmScorePackage.getTypeid())) {//全职学术推广员
+		if ("3".equals(wmScorePackage.getTypeid()) || "5".equals(wmScorePackage.getTypeid())) {//全职学术推广员
 			wmScorePackage.setIsReceive("1");//不允许接单
 			wmScorePackage.setScorePackageStatus("3");//全职学术推广员不需要审核，所有状态直接是进行中
 
@@ -1977,7 +1983,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 				.eq(WmScorePackage::getSendPackageDeptId, sendDeptId);
 
 		if (StringUtil.isEmpty(typeId)) {
-			queryWrapper.in(WmScorePackage::getTypeid, "3", "4");
+			queryWrapper.in(WmScorePackage::getTypeid, "3", "4", "5");
 		} else {
 			List<String> split = StrUtil.split(typeId, StrUtil.COMMA);
 			queryWrapper.in(WmScorePackage::getTypeid, split);