Merge branch 'feat-20230329-mazhou' into temp-pre

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

@@ -9,6 +9,7 @@ import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageSettleNote;
 import com.qunzhixinxi.hnqz.admin.entity.model.excel.WmSettlePackageSettleExcelModel;
 import com.qunzhixinxi.hnqz.admin.entity.output.WmTaskSettleNoteOutput;
+import com.qunzhixinxi.hnqz.admin.enums.PackageTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.SettleStatusEnum;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
@@ -87,6 +88,11 @@ public class WmScorePackageSettleNoteController {
 			note.setStartSubTime(startSubTime);
 			note.setEndSubTime(endSubTime);
 		}
+
+		WmScorePackage scorePackage = wmScorePackageService.getById(note.getPackageId());
+		if (PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(scorePackage.getPackageType1())) {
+			return R.ok(wmScorePackageSettleNoteService.getWmTaskForSettlePage2(page, note));
+		}
 		return R.ok(wmScorePackageSettleNoteService.getWmTaskForSettlePage(page, note));
 	}
 

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

@@ -143,4 +143,9 @@ public class WmTaskSettleNoteOutput {
 	 * 实际结算金额
 	 */
 	private BigDecimal actualAmount;
+
+	/**
+	 * 任务积分
+	 */
+	private Integer score;
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmScorePackageSettleNoteMapper.java

@@ -50,6 +50,15 @@ public interface WmScorePackageSettleNoteMapper extends BaseMapper<WmScorePackag
 	 */
 	IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage(Page page, @Param("query") WmScorePackageSettleNote note);
 
+	/**
+	 * 结算包结算列表（分页）
+	 *
+	 * @param page
+	 * @param note
+	 * @return
+	 */
+	IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage2(Page page, @Param("query") WmScorePackageSettleNote note);
+
 	/**
 	 * 结算包结算列表
 	 *

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

@@ -44,6 +44,15 @@ public interface WmScorePackageSettleNoteService extends IService<WmScorePackage
 	 */
 	IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage(Page page, WmScorePackageSettleNote note);
 
+	/**
+	 * 结算包结算列表（分页）
+	 *
+	 * @param page
+	 * @param note
+	 * @return
+	 */
+	IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage2(Page page, WmScorePackageSettleNote note);
+
 	/**
 	 * 结算包结算列表
 	 *

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

@@ -122,6 +122,18 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		return noteMapper.getWmTaskForSettlePage(page, note);
 	}
 
+	/**
+	 * 结算包结算列表（分页）
+	 *
+	 * @param page
+	 * @param note
+	 * @return
+	 */
+	@Override
+	public IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage2(Page page, WmScorePackageSettleNote note) {
+		return noteMapper.getWmTaskForSettlePage2(page, note);
+	}
+
 	/**
 	 * 结算包结算列表
 	 *
@@ -440,7 +452,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			updateEntity.setSubType(subType);
 			updateEntity.setSubjectLocation(note.getSubjectLocation());
 			updateEntity.setInvoiceType(note.getInvoiceType());
-			updateEntity.setCategoryName(note.toCategoryName());
+			updateEntity.setCategoryName(note.getCategoryName());
 			updateEntity.setSettleAmount(note.getSettleAmount());
 			updateEntity.setActualAmount(note.getActualAmount());
 			updateEntity.setSettleNoteStatus(9);
@@ -459,7 +471,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			entity.setSubType(subType);
 			entity.setSubjectLocation(note.getSubjectLocation());
 			entity.setInvoiceType(note.getInvoiceType());
-			entity.setCategoryName(note.toCategoryName());
+			entity.setCategoryName(note.getCategoryName());
 			entity.setSettleAmount(note.getSettleAmount());
 			entity.setActualAmount(note.getActualAmount());
 			entity.setDiscount(new BigDecimal(1));

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

@@ -133,6 +133,54 @@
 		ORDER BY e.sub_time DESC, t.id
 	</select>
 
+	<!-- 结算包结算列表（分页） -->
+	<select id="getWmTaskForSettlePage2" resultType="com.qunzhixinxi.hnqz.admin.entity.output.WmTaskSettleNoteOutput">
+		SELECT
+		t.id,
+		t.task_type_id,
+		t.create_time,
+		t.score_package_id,
+		p.score_package_name,
+		t.task_user_id,
+		t.lookinto_date,
+		t.score,
+		u.realname real_name,
+		u.username,
+		e.id noteId,
+		e.invoice_type,
+		e.sub_type,
+		e.category_name,
+		e.discount,
+		e.stream_id,
+		e.settle_no,
+		e.settle_amount,
+		e.actual_amount,
+		e.settle_note_status,
+		e.sub_time,
+		e.notify_time
+		FROM wm_task t
+		LEFT JOIN wm_score_package p on p.id = t.score_package_id
+		LEFT JOIN wm_score_package_settle_note e on t.id = e.task_id
+		LEFT JOIN sys_user u on t.task_user_id = u.user_id
+		WHERE 1= 1
+		<if test="query.userId!=null and query.userId!=''">
+			AND t.task_user_id =#{query.userId}
+		</if>
+		<if test="query.packageId!=null and query.packageId!=''">
+			AND t.score_package_id =#{query.packageId}
+		</if>
+		<if test="query.startSubTime != null and query.endSubTime != null">
+			AND e.sub_time BETWEEN #{query.startSubTime} AND #{query.endSubTime}
+		</if>
+		<if test="query.settleNoteStatus != null">
+			AND e.settle_note_status = #{query.settleNoteStatus}
+		</if>
+		<if test="query.realName != null">
+			AND u.realname like concat('%',#{query.realName},'%')
+		</if>
+		ORDER BY e.sub_time DESC, t.id
+	</select>
+
 	<!-- 结算包结算列表 -->
 	<select id="listWmTaskForSettle" resultType="com.qunzhixinxi.hnqz.admin.entity.output.WmTaskSettleNoteOutput">
 		SELECT