feat: 药店拜访-分页查询排序

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

@@ -1,7 +1,10 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,6 +18,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmTaskContentService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
+import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -31,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -59,18 +64,19 @@ public class WmDaPharmacyController {
 	 *
 	 * @param page         分页对象
 	 * @param wmDaPharmacy 档案-药店
-	 * @return
+	 * @return 分页数据
 	 */
 	@GetMapping("/page")
 	@PreAuthorize("@pms.hasPermission('admin_wmdapharmacy_view')")
-	public R getWmDaPharmacyPage(Page page, WmDaPharmacy wmDaPharmacy) {
+	public R<IPage<WmDaPharmacy>> getWmDaPharmacyPage(Page<WmDaPharmacy> page, WmDaPharmacy wmDaPharmacy) {
 
-		OrderItem orderItem = new OrderItem();
-		orderItem.setColumn("create_time");
-		orderItem.setAsc(false);
-		page.addOrder(orderItem);
+		LambdaQueryWrapper<WmDaPharmacy> queryWrapper = Wrappers.lambdaQuery();
+		if (StrUtil.isNotBlank(wmDaPharmacy.getPharmacyName())) {
+			queryWrapper.like(WmDaPharmacy::getPharmacyName, wmDaPharmacy.getPharmacyName());
+		}
+		queryWrapper.orderByDesc(WmDaPharmacy::getId);
 
-		return R.ok(wmDaPharmacyService.page(page, Wrappers.query(wmDaPharmacy)));
+		return R.ok(wmDaPharmacyService.page(page, queryWrapper));
 	}
 
 
@@ -131,6 +137,9 @@ public class WmDaPharmacyController {
 			return R.failed("药店名称已存在");
 		}
 
+		wmDaPharmacy.setCreateTime(LocalDateTime.now());
+		wmDaPharmacy.setCreateUser(SecurityUtils.getUser().getId());
+
 		return R.ok(wmDaPharmacyService.save(wmDaPharmacy));
 	}
 
@@ -153,22 +162,12 @@ public class WmDaPharmacyController {
 			return R.failed("药店名称已存在");
 		}
 
-		Integer hid = wmDaPharmacy.getUpdateUser();
-		wmDaPharmacy.setUpdateUser(0);
 		wmDaPharmacy.setDelFlag("0");
 		wmDaPharmacy.setEnableFlag("0");
-		wmDaPharmacyService.updateById(wmDaPharmacy);
-		if (null != hid && 0 != hid) {
-			WmTask wmTask = wmTaskService.getById(hid);
-			if (null != wmTask) {
-//				WmTaskContent wmTaskContent = wmTaskContentService.getById(wmTask.getTaskContentId());
-				wmTask.setPlatAuditStatus("1");
-				wmTaskService.updateById(wmTask);
-			}
-		}
+		wmDaPharmacy.setUpdateUser(SecurityUtils.getUser().getId());
+		wmDaPharmacy.setUpdateTime(LocalDateTime.now());
 
-
-		return R.ok();
+		return R.ok(wmDaPharmacyService.updateById(wmDaPharmacy));
 	}
 
 	/**