From cedaeeed6d401aefebf93ea6ea21cc9e06d5f5db Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:36:48 +0800
Subject: [PATCH] 新增搜索 模块+同伴+时间
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java | 103 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 86 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
index ea3ed43..e9690ca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
@@ -10,7 +10,9 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
+import com.ruoyi.domain.dto.AncestorClan;
import com.ruoyi.domain.dto.AncestorHelper;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfAncestorService;
@@ -23,12 +25,14 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import static com.ruoyi.common.core.domain.AjaxResult.error;
import static com.ruoyi.common.core.page.TableSupport.*;
+//import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
@RestController
@RequestMapping("/ZfAncestor")
@@ -140,18 +144,88 @@
zInfoUserService.updateById(infoUser);
}
+ @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ZfAncestor zfAncestor) {
+ List<AncestorClan> list = new ArrayList<>();
+
+ list = zfAncestorService.selectByCondition(zfAncestor);
+ // log.info("瀵煎嚭璁板綍涓�:{}", list);
+ ExcelUtil<AncestorClan> util = new ExcelUtil<>(AncestorClan.class);
+ util.exportExcel(response, list, "绁栧厛璁板綍鏁版嵁");
+
+ }
+ /**
+ * 瀵煎嚭瀵煎嚭绁栧厛淇℃伅璁板綍鍒楄〃
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "瀵煎嚭绁栧厛淇℃伅", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids)
+ {
+ List<AncestorClan> list = zfAncestorService.selectByIds(ids);
+ // log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<AncestorClan> util = new ExcelUtil<>(AncestorClan.class);
+ util.exportExcel(response, list, "绁栧厛璁板綍鏁版嵁");
+ }
+
+
/**
* 淇敼绁栧厛淇℃伅
*/
@Log(title = "绁栧厛", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody ZfAncestor zfAncestor) {
+ public AjaxResult edit(@RequestBody AncestorHelper ancestorHelper) {
- ZfAncestor spouseSex = zfAncestorService.update(zfAncestor);
- updateAncestor(zfAncestor);
- if (spouseSex.getId() != null)
- updateAncestor(spouseSex);
+// ZfAncestor spouseSex = zfAncestorService.update(zfAncestor);
+// updateAncestor(zfAncestor);
+// if (spouseSex.getId() != null)
+// updateAncestor(spouseSex);
+
+ //淇敼sys_user琛�
+ SysUser us = new SysUser();
+ if (ancestorHelper.getName() != null) {
+ us.setNickName(ancestorHelper.getName());
+ us.setUserName(ancestorHelper.getName());
+ // us.setStatus(String.valueOf(zfAncestor.getStatus()));
+ }
+ if(ancestorHelper.getSex() != null)
+ us.setSex(String.valueOf(ancestorHelper.getSex()));
+
+// us.setClanId(ancestorHelper.getClanId());
+ us.setUserId(ancestorHelper.getSysId());
+
+ if (!userService.checkNickNameUnique(us)) {
+ return error("淇敼绁栧厛'" + us.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ }
+ userService.updateUser(us);
+
+
+ //淇敼z_info_user琛�
+ ZInfoUser infoUser = new ZInfoUser();
+ infoUser.setSysId(us.getUserId());
+ if (ancestorHelper.getName() != null) {
+ infoUser.setNickName(us.getNickName());
+ infoUser.setOldName(us.getUserName());
+ }
+ if(ancestorHelper.getSex() != null)
+ infoUser.setSex(Integer.parseInt(us.getSex()));
+ ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(us.getUserId());
+ infoUser.setUserId(infoBysysId.getUserId());
+
+ zInfoUserService.saveOrUpdate(infoUser);
+
+ //淇敼zf_ancestor琛�
+ ZfAncestor zfAncestor = new ZfAncestor();
+// zfAncestor.setClanId(ancestorHelper.getClanId());
+ if (ancestorHelper.getName() != null)
+ zfAncestor.setName(ancestorHelper.getName());
+ if(ancestorHelper.getSex() != null)
+ zfAncestor.setSex(ancestorHelper.getSex());
+ zfAncestor.setSysId(ancestorHelper.getSysId());
+
+ zfAncestorService.update(zfAncestor);
return AjaxResult.success();
}
@@ -187,8 +261,8 @@
us.setPassword("123456");
us.setUserName(ancestorHelper.getName());
us.setClanId(ancestorHelper.getClanId());
- if (!userService.checkUserNameUnique(us)) {
- return error("鏂板绁栧厛'" + us.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ if (!userService.checkNickNameUnique(us)) {
+ return error("鏂板绁栧厛'" + us.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
us.setPassword(SecurityUtils.encryptPassword(us.getPassword()));
@@ -201,11 +275,11 @@
usa.setPassword("123456");
usa.setClanId(ancestorHelper.getClanId());
usa.setUserName(ancestorHelper.getFname());
- if (!userService.checkUserNameUnique(usa)) {
- return error("鏂板绁栧厛1'" + usa.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ if (!userService.checkNickNameUnique(usa)) {
+ return error("鏂板绁栧厛1'" + usa.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
- us.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
+ usa.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
userService.insertUser(usa);
@@ -277,10 +351,6 @@
zfAncestor1.setStatus(0);
zfAncestor1.setSysId(usa.getUserId());
zfAncestorService.addData(zfAncestor1);
-
-
-
-
}
else{
//淇濆瓨绁栧厛绠＄悊鍛�,涔熷厛淇濆瓨鍒皊ys_user
@@ -293,8 +363,8 @@
us.setClanId(ancestorHelper.getClanId());
System.out.println(ancestorHelper.getClanId());
System.out.println("0000_______+++++++++++++999999999999");
- if (!userService.checkUserNameUnique(us)) {
- return error("鏂板绁栧厛绠＄悊鍛�'" + us.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ if (!userService.checkNickNameUnique(us)) {
+ return error("鏂板绁栧厛绠＄悊鍛�'" + us.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
us.setPassword(SecurityUtils.encryptPassword(us.getPassword()));
@@ -321,7 +391,6 @@
zfAncestor.setSysId(us.getUserId());
zfAncestorService.addData(zfAncestor);
-
}
--
Gitblit v1.9.1