Merge branch 'feat-20231019-mahv2' into temp-pre

db/v2.0/20231019.sql

@@ -1,3 +1,5 @@
 alter table wm_score_package
     add mah_settle_step char(8) default 'BUSINESS' null comment 'MAH结算-步进状态(BUSINESS-业务, FINANCE-财务)' after mah_settle_dept_id;
 
+alter table wm_score_package
+    add mah_settle_time datetime null comment 'mah结算时间' after mah_settle_step;

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

@@ -2588,7 +2588,7 @@ public class WmScorePackageController {
 
 		long startMillis = System.currentTimeMillis();
 		Page<WmScorePackage> wmScorePackagePage = wmScorePackageMapper.listScorePackage(new Page<>(current, size),
-				queryWrapper.orderByDesc("p.create_time"), acceptUser, relationScoreId, toApproval);
+				queryWrapper.orderByDesc("p.settlement_date"), acceptUser, relationScoreId, toApproval);
 
 		log.info("MAH积分包列表sql耗时:{}", System.currentTimeMillis() - startMillis);
 
@@ -2620,6 +2620,7 @@ public class WmScorePackageController {
 			log.info("MAHbuild积分包耗时:{}", System.currentTimeMillis() - buildStartMillis);
 		}
 
+		// 个人承接-其他 标记已读提醒
 		wmBizReminderService.markRead(UpmsType.BizReminderType.ASSIGN_POINTS_OTHER_REMINDER, sendDeptId);
 
 		return R.ok(wmScorePackagePage);

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

@@ -549,6 +549,11 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	 */
 	private UpmsType.MahSettleStep mahSettleStep;
 
+	/**
+	 * mah结算时间
+	 */
+	private LocalDateTime mahSettleTime;
+
 	/**
 	 * 企业任务上限(单位%)
 	 */

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

@@ -115,12 +115,20 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		}
 		WmScorePackage updateEntity = new WmScorePackage();
 		updateEntity.setId(wmScorePackage.getId());
-		updateEntity.setScorePackageStatus("4");
+
+		if (UpmsType.MahSettleStep.FINANCE.equals(wmScorePackage.getMahSettleStep())) {
+			// mah结算回退到药企的业务(个人承接-其他)
+			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.SUBMITTED_TO_DRUGENT.val());
+			updateEntity.setMahSettleStep(UpmsType.MahSettleStep.BUSINESS);
+		} else {
+			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.val());
+		}
 		updateEntity.setSettleFlag("0");
 		wmScorePackageService.updateById(updateEntity);
 
 		WmScorePackageSettleNote deleteQuery = new WmScorePackageSettleNote();
 		deleteQuery.setPackageId(input.getId());
+		log.info("回退删除settlenote: {}", deleteQuery);
 		noteService.remove(Wrappers.query(deleteQuery));
 
 		return R.ok(Boolean.TRUE);
@@ -525,7 +533,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		updateEntity.setDescription(input.getDescription());
 		updateEntity.setSubType(String.valueOf(input.getSubjectLocation().getGigType().getCode()));
 		updateEntity.setLocation(input.getSubjectLocation());
-		updateEntity.setSettlementDate(LocalDateTime.now());
+		updateEntity.setMahSettleTime(LocalDateTime.now());
 		updateEntity.setMahSettleDeptId(deptId);
 		// MAH提交到财务结算的标记
 		updateEntity.setMahSettleStep(UpmsType.MahSettleStep.FINANCE);
@@ -730,13 +738,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		// 结算配置信息
 		HnqzUser operator = SecurityUtils.getUser();
 
-		if (SubjectLocation.MAH_SETTLE.equals(wmScorePackage.getLocation())) {
-			// MAH结算的情况-标记
-			input.setMahSettleDeptId(operator.getDeptId());
-		} else {
-			input.setMahSettleDeptId(null);
-		}
-
 		SysDeptSub sysDeptSub = sysDeptSubService.getDeptSub(operator.getDeptId(), location);
 		SysDept sysDept = sysDeptService.getById(sysDeptSub.getDeptId());
 		String taxCode = sysDept.getTaxCode();
@@ -820,18 +821,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1016,18 +1008,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1219,18 +1202,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1417,18 +1391,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1624,18 +1589,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -1824,18 +1780,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -2035,18 +1982,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -2240,18 +2178,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		for (WmScorePackageSettleNote note : notes) {
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
-
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {
@@ -2391,17 +2320,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 
 			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
 
-			Integer deptId;
-			// MAH结算校验原企业认证信息
-			if (input.getMahSettleDeptId() != null) {
-				deptId = sysUser.getDeptId();
-			} else {
-				deptId = operator.getDeptId();
-			}
 			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 					.eq(SysUserSub::getSubjectLocation, input.getSubjectLocation())
-					.eq(SysUserSub::getDeptId, deptId)
 			);
 
 			if (userSub == null) {

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

@@ -1466,7 +1466,12 @@
 			AND p.sub_type= #{query.subType}
 		</if>
 		ORDER BY
-		p.create_time DESC
+		<if test="query.mahSettleStep != null">
+			p.mah_settle_time DESC
+		</if>
+		<if test="query.mahSettleStep == null">
+			p.create_time DESC
+		</if>
 	</select>
 
 	<!-- 积分包结算（分页） -->
@@ -1532,7 +1537,12 @@
 			</if>
 		</where>
 		ORDER BY
-		p.create_time DESC
+		<if test="query.mahSettleStep != null">
+			p.mah_settle_time DESC
+		</if>
+		<if test="query.mahSettleStep == null">
+			p.create_time DESC
+		</if>
 	</select>
 
 	<!-- 积分包结算列表 -->