From adb51c3dc969a02d482bcc10b8b23206a933ebdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Sun, 10 Nov 2024 09:28:39 +0800
Subject: [PATCH 1/5] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../expert/county/components/ExpertForm.vue | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
index a350c3b..9d95419 100644
--- a/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
@@ -4,17 +4,17 @@
-
+
-
+
-
+
@@ -26,7 +26,7 @@
-
+
@@ -94,22 +94,22 @@
-
+
-
+
From 8730bfa29ab205b386b643a4b8dc778ed3b369f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Sun, 10 Nov 2024 09:30:56 +0800
Subject: [PATCH 2/5] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/expert/firm/components/ExpertForm.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
index 5912aa0..62635de 100644
--- a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
@@ -97,8 +97,8 @@
-
-
+
+
From eb4ce26c3ecce56225c6e18e21892cda5126a9c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Sun, 10 Nov 2024 09:38:24 +0800
Subject: [PATCH 3/5] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jeecg/modules/demo/expert/controller/ExpertController.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
index 4e48d96..44e7857 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
@@ -183,6 +183,7 @@ public class ExpertController extends JeecgController {
//用于查看本县区下面的专家信息无论是否审核，无论哪个部门
QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(expert, req.getParameterMap());
queryWrapper.eq("isdone","Y");
+ queryWrapper.eq("compopen","2");
queryWrapper.in("seusername",usernames);
Page page = new Page(pageNo, pageSize);
IPage pageList = expertService.page(page, queryWrapper);
From bee5dbbbf873201f085fc1ebf726b07055f80a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Sun, 10 Nov 2024 09:54:26 +0800
Subject: [PATCH 4/5] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../expert/controller/ExpertController.java | 35 +++++++++++++++++++
.../src/views/expert/adminback/Expert.api.ts | 2 +-
.../src/views/expert/adminback/Expert.data.ts | 6 ++++
3 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
index 44e7857..c01315a 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
@@ -457,6 +457,41 @@ public class ExpertController extends JeecgController {
return Result.OK("编辑成功!");
}
+
+ /**
+ * 编辑
+ *
+ * @param expert
+ * @return
+ */
+ @AutoLog(value = "专家管理（市局管理员）-编辑")
+ @ApiOperation(value="专家管理（市局管理员）-编辑", notes="专家管理（市局管理员）-编辑")
+ @RequestMapping(value = "/editstatic", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result editstatic(@RequestBody Expert expert) {
+ if (expert.getExpsture().equals("N")) {
+ expert.setErrinfo("");
+ }
+ expertService.updateById(expert);
+ //开始添加到用户表
+ SysUser user = new SysUser();
+ user.setAvatar(expert.getTopPic());
+ user.setSex(expert.getSex());
+ user.setRealname(expert.getRealname());
+ user.setUsername(expert.getSeusername());
+ user.setWorkNo(expert.getWorkon());
+ user.setEmail(expert.getEmails());
+ user.setPhone(expert.getPhone());
+ user.setCreateTime(new Date());//设置创建时间
+ String salt = oConvertUtils.randomGen(8);
+ user.setSalt(salt);
+ String passwordEncode = PasswordUtil.encrypt(expert.getSeusername(), expert.getPsd(), salt);
+ user.setPassword(passwordEncode);
+ user.setStatus(1);
+ user.setDelFlag(CommonConstant.DEL_FLAG_0);
+ sysUserService.editUser(user,"1843478958968647681", expert.getSsdep(), "", "");
+ return Result.OK("编辑成功!");
+ }
+
/**
* 编辑
*
diff --git a/jeecgboot-vue3/src/views/expert/adminback/Expert.api.ts b/jeecgboot-vue3/src/views/expert/adminback/Expert.api.ts
index deff48b..201d194 100644
--- a/jeecgboot-vue3/src/views/expert/adminback/Expert.api.ts
+++ b/jeecgboot-vue3/src/views/expert/adminback/Expert.api.ts
@@ -6,7 +6,7 @@ const { createConfirm } = useMessage();
enum Api {
list = '/expert/expert/listadminstatic',
save='/expert/expert/add',
- edit='/expert/expert/edit',
+ edit='/expert/expert/editstatic',
deleteOne = '/expert/expert/delete',
deleteBatch = '/expert/expert/deleteBatch',
importExcel = '/expert/expert/importExcel',
diff --git a/jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts b/jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts
index f1cf9e6..066a335 100644
--- a/jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts
+++ b/jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts
@@ -76,6 +76,12 @@ export const columns: BasicColumn[] = [
return render.renderSwitch(text, [{text:'正常',value:'N'},{text:'异常',value:'Y'}]);
},
},
+
+ {
+ title: '异常原因',
+ align: "center",
+ dataIndex: 'errinfo_dictText'
+ },
];
// 高级查询数据
From ff77eaa3428460cb17628ec83acd8f85d893db68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Sun, 10 Nov 2024 11:19:52 +0800
Subject: [PATCH 5/5] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../expproject/controller/ExpprojectController.java | 2 +-
.../views/expert/admin/components/ExpertForm.vue | 13 ++++++++++---
.../views/expert/county/components/ExpertForm.vue | 9 ++++++---
.../src/views/expert/firm/components/ExpertForm.vue | 9 ++++++---
.../src/views/expproject/admin/Expproject.data.ts | 4 ++--
5 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java
index b07adf5..ac98550 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java
@@ -143,7 +143,7 @@ public class ExpprojectController {
public Result add(@RequestBody ExpprojectPage expprojectPage) {
Expproject expproject = new Expproject();
BeanUtils.copyProperties(expprojectPage, expproject);
- if (!expprojectPage.getExpandproList().isEmpty()) {
+ if ( expprojectPage.getExpandproList() != null && !expprojectPage.getExpandproList().isEmpty()) {
if (expproject.getNeedexp() >= expprojectPage.getExpandproList().size()) {
expprojectService.saveMain(expproject, expprojectPage.getExpandproList());
return Result.OK("添加成功！");
diff --git a/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
index b867049..b04e097 100644
--- a/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
@@ -9,12 +9,12 @@
-
+
-
+
@@ -126,6 +126,8 @@