Kaynağa Gözat

fix: 积分包结算管理/结算复核页面sql查询优化3

lixuesong 1 yıl önce
ebeveyn
işleme
f08d00ac8c

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

@@ -480,8 +480,8 @@ public class WmPayOffController {
 	 * @return excel模型
 	 */
 	@ResponseExcel(name = "exportPackageSettle", sheet = "积分包结算数据")
-	@SysLog("积分包结算导出")
-	@PostMapping("/exportPackageSettle")
+//	@SysLog("积分包结算导出")
+	@GetMapping("/exportPackageSettle")
 	public List<WmScorePackageSettleExcelModel> exportPackageSettle(WmScorePackageSettleInput input) {
 
 		if (input.getSendPackageDeptId() == null) {
@@ -498,7 +498,7 @@ public class WmPayOffController {
 	 * @return excel模型
 	 */
 	@ResponseExcel(name = "exportPackageSettle", sheet = "积分包结算数据")
-	@SysLog("积分包结算导出")
+//	@SysLog("积分包结算导出")
 	@PostMapping("/exportPackageSettleByMAH")
 	public List<WmScorePackageSettleExcelModel> exportPackageSettleByMAH(WmScorePackageSettleInput input) {
 

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

@@ -1503,6 +1503,9 @@
 			p.relation_score_id,
 			p.send_package_dept_id
 		FROM wm_score_package p
+		<if test="query.packageEntName != null and query.packageEntName != ''">
+			left join sys_dept d on p.send_package_dept_id = d.dept_id
+		</if>
 		<if test="query.userNames != null and query.userNames != ''">
 			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