From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 02 一月 2025 18:44:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
index 2d89c9d..57efec3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
@@ -1,9 +1,16 @@
package com.ruoyi.web.controller.project;
import java.util.Arrays;
+import java.util.Calendar;
import java.util.List;
+
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.domain.BaseOnlyvalue;
+import com.ruoyi.project.service.IBaseOnlyvalueService;
+import com.ruoyi.web.controller.common.OnlyValueCommon;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -24,24 +31,29 @@
/**
* 澶栧洿鍗曚綅浜哄憳Controller
- *
+ *
* @author ruoyi
* @date 2021-11-24
*/
@RestController
@RequestMapping("/project/externalperson")
-public class ServiceExternalpersonController extends BaseController
-{
+public class ServiceExternalpersonController extends BaseController {
@Autowired
private IServiceExternalpersonService serviceExternalpersonService;
+
+ @Autowired
+ private IBaseOnlyvalueService baseOnlyvalueService;
+
+ @Autowired
+ private OnlyValueCommon onlyValueCommon;
/**
* 鏌ヨ澶栧洿鍗曚綅浜哄憳鍒楄〃
*/
- //@PreAuthorize("@ss.hasPermi('project:externalperson:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:externalperson:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceExternalperson serviceExternalperson)
- {
+ public TableDataInfo list(ServiceExternalperson serviceExternalperson) {
+ logger.info("璇㈠鍥村崟浣嶄汉鍛樺垪琛ㄧ殑鍏ュ弬涓� 锛歿}", serviceExternalperson);
startPage();
List<ServiceExternalperson> list = serviceExternalpersonService.queryList(serviceExternalperson);
return getDataTable(list);
@@ -50,11 +62,10 @@
/**
* 瀵煎嚭澶栧洿鍗曚綅浜哄憳鍒楄〃
*/
- //@PreAuthorize("@ss.hasPermi('project:externalperson:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:externalperson:export')")
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceExternalperson serviceExternalperson)
- {
+ public AjaxResult export(ServiceExternalperson serviceExternalperson) {
List<ServiceExternalperson> list = serviceExternalpersonService.queryList(serviceExternalperson);
ExcelUtil<ServiceExternalperson> util = new ExcelUtil<ServiceExternalperson>(ServiceExternalperson.class);
return util.exportExcel(list, "澶栧洿鍗曚綅浜哄憳鏁版嵁");
@@ -63,45 +74,47 @@
/**
* 鑾峰彇澶栧洿鍗曚綅浜哄憳璇︾粏淇℃伅
*/
- //@PreAuthorize("@ss.hasPermi('project:externalperson:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:externalperson:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceExternalpersonService.getById(id));
}
/**
* 鏂板澶栧洿鍗曚綅浜哄憳
*/
- //@PreAuthorize("@ss.hasPermi('project:externalperson:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:externalperson:add')")
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceExternalperson serviceExternalperson)
- {
- return toAjax(serviceExternalpersonService.save(serviceExternalperson));
+ public AjaxResult add(@RequestBody ServiceExternalperson serviceExternalperson) {
+ if (StringUtils.isEmpty(serviceExternalperson.getUserno())) {
+ String zj = onlyValueCommon.addOnlyValue("zj");
+ String formattedNumber = String.format("%05d", zj);
+ serviceExternalperson.setUserno(formattedNumber);
+ }
+ boolean save1 = serviceExternalpersonService.save(serviceExternalperson);
+ return AjaxResult.success(serviceExternalperson);
}
/**
* 淇敼澶栧洿鍗曚綅浜哄憳
*/
- //@PreAuthorize("@ss.hasPermi('project:externalperson:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:externalperson:edit')")
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.UPDATE)
@PostMapping("/editZJInfo")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceExternalperson serviceExternalperson)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceExternalperson serviceExternalperson) {
return toAjax(serviceExternalpersonService.updateById(serviceExternalperson));
}
/**
* 鍒犻櫎澶栧洿鍗曚綅浜哄憳
*/
- //@PreAuthorize("@ss.hasPermi('project:externalperson:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:externalperson:remove')")
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceExternalpersonService.removeByIds(Arrays.asList(ids)));
}
@@ -111,8 +124,7 @@
*/
@GetMapping(value = "/getInfoByUserNo/{userno}")
- public AjaxResult getInfoByUserNo(@PathVariable("userno") String userno)
- {
+ public AjaxResult getInfoByUserNo(@PathVariable("userno") String userno) {
return AjaxResult.success(serviceExternalpersonService.getInfoByUserNo(userno));
}
}
--
Gitblit v1.9.3