feat: 企业管理/客户数据管理2

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysDept.java

@@ -175,6 +175,12 @@ public class SysDept extends Model<SysDept> {
 	@TableField(exist = false)
 	private String csmNames;
 
+	/**
+	 * csm负责人用户id
+	 */
+	@TableField(exist = false)
+	private Integer[] csmUserIds;
+
 	/**
 	 * 上级企业名称
 	 */

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

@@ -76,7 +76,18 @@ public class ReportExportController {
 	private final RedisTemplate<String,String> redisTemplate;
 	private final RabbitMqClient rabbitMqClient;
 
+	/**
+	 * 报告导出--个人报告导出分页查询 用于BC
+	 *
+	 * @param page           分页对象
+	 * @param wmScorePackage 积分包
+	 * @return
+	 */
+	@GetMapping("/getExportPackageZbTotalListForBC")
+	public R getExportPackageZbTotalListForBC(Page page, WmScorePackage wmScorePackage) {
 
+		return reportExportService.getExportPackageZbTotalList(page,wmScorePackage);
+	}
 
 	/**
 	 * 报告导出--个人报告导出分页查询
@@ -87,6 +98,9 @@ public class ReportExportController {
 	 */
 	@GetMapping("/getExportPackageZbTotalList")
 	public R getExportPackageZbTotalList(Page page, WmScorePackage wmScorePackage) {
+
+		wmScorePackage.setSendPackageDeptId(String.valueOf(SecurityUtils.getUser().getDeptId()));
+
 		return reportExportService.getExportPackageZbTotalList(page,wmScorePackage);
 	}
 

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

@@ -542,7 +542,8 @@ public class SysDeptController {
 			if (CollUtil.isNotEmpty(deptCsms)) {
 				Set<Integer> userIds = deptCsms.stream().map(SysDeptCsm::getUserId).collect(Collectors.toSet());
 				List<SysUser> users = sysUserMapper.selectBatchIds(userIds);
-				record.setCsmNames(users.stream().map(SysUser::getRealname).collect(Collectors.joining(";")));
+				record.setCsmNames(users.stream().map(SysUser::getRealname).collect(Collectors.joining(",")));
+				record.setCsmUserIds(userIds.toArray(new Integer[0]));
 			}
 			// 是否启用
 			if (StrUtil.isNotBlank(record.getDelFlag())) {

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

@@ -290,6 +290,23 @@ public class WmPayOffController {
 		return wmPayOffService.settleInfoByTaskIds(taskIds);
 	}
 
+	/**
+	 * 财务审核页面 用于BC
+	 *
+	 * @param page  分页信息
+	 * @param input 参数
+	 * @return 分页结果
+	 */
+	@SysLog("分页查询结算-用于BC")
+	@GetMapping("/listPackageSettleListForBC")
+	public R<?> listPackageSettleListForBC(Page<WmScorePackageSettleOutput> page, WmScorePackageSettleInput input) {
+
+		input.setPackageFinishStatus("1");
+		input.setTypeid("4,5");
+		input.setSettleFlag("1");
+		return R.ok(wmScorePackageService.listPackageSettleList(page, input));
+	}
+
 	/**
 	 * 财务审核页面
 	 *

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

@@ -2857,7 +2857,7 @@ public class WmScorePackageController {
 	}
 
 	/**
-	 * 个人承接积分值导出
+	 * 个人承接积分值导出-用于BC
 	 *
 	 * @param acceptUser 接单对象，模糊查询
 	 */

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

@@ -55,6 +55,11 @@ public class WmScorePackageSettleOutput {
 
 	private String scorePackageName;
 
+	/**
+	 * 关联积分包名称
+	 */
+	private String relationScoreName;
+
 	/**
 	 * 积分包编号
 	 */

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

@@ -106,7 +106,6 @@ public class ReportExportServiceImpl implements ReportExportService {
 	 */
 	public R getExportPackageZbTotalList(Page page, WmScorePackage wmScorePackage) {
 
-		wmScorePackage.setSendPackageDeptId(SecurityUtils.getUser().getDeptId()+"");
 		wmScorePackage.setTypeid("4");
 		IPage pageAnswer = wmScorePackageService.getExportPackageTotalList1(page, wmScorePackage);
 		return R.ok(pageAnswer);

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -1500,8 +1500,11 @@
 			p.source_type,
 			p.oms_order_sn,
 			p.invoice_number,
-			p.invoice_file
-		FROM wm_score_package p left join sys_dept d on p.send_package_dept_id = d.dept_id
+			p.invoice_file,
+			p2.score_package_name as relation_score_name
+		FROM wm_score_package p
+			left join wm_score_package p2 on p.relation_score_id = p2.id
+		    left join sys_dept d on p.send_package_dept_id = d.dept_id
 		<if test="query.userNames != null">
 			left join wm_score_package_status ps on p.id = ps.package_id
 			left join sys_user su on ps.user_id = su.user_id