feat: mah结算-排序

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

@@ -2857,7 +2857,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);
 
@@ -2889,6 +2889,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

@@ -565,6 +565,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

@@ -533,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);

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>
 
 	<!-- 积分包结算列表 -->