From 1f106845d6c8d3fc8ffc560e8a7271e77e8a773f 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:40:24 +0800 Subject: [PATCH 1/6] =?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 --- .../demo/expert/controller/ExpertController.java | 16 ++++++++++------ .../modules/demo/expert/mapper/ExpertMapper.java | 3 +++ .../demo/expert/service/IExpertService.java | 2 ++ .../expert/service/impl/ExpertServiceImpl.java | 5 +++++ 4 files changed, 20 insertions(+), 6 deletions(-) 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 c01315a..e5d35b3 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 @@ -193,6 +193,7 @@ public class ExpertController extends JeecgController { String depid = expertService.getdeps(sysUser.getId()); SysDepart sysDepart = sysDepartService.getById(depid); experttemp.setRealname(sysUser.getRealname()); + experttemp.setSepsd(sysUser.getPassword()); experttemp.setWorkon(sysUser.getWorkNo()); experttemp.setSex(sysUser.getSex()); experttemp.setTopPic(sysUser.getAvatar()); @@ -394,7 +395,7 @@ public class ExpertController extends JeecgController { expert.setCompopen("2"); //开始添加到用户表 - SysUser user = new SysUser(); +/* SysUser user = new SysUser(); user.setAvatar(expert.getTopPic()); user.setSex(expert.getSex()); user.setRealname(expert.getRealname()); @@ -409,7 +410,8 @@ public class ExpertController extends JeecgController { user.setPassword(passwordEncode); user.setStatus(1); user.setDelFlag(CommonConstant.DEL_FLAG_0); - sysUserService.saveUser(user, "1843478958968647681", expert.getSsdep(), ""); + sysUserService.saveUser(user, "1843478958968647681", expert.getSsdep(), "");*/ + expertService.updateuser(expert.getTopPic(),expert.getSex(),expert.getSeusername()); expertService.save(expert); // return Result.OK("添加成功！"); @@ -438,7 +440,7 @@ public class ExpertController extends JeecgController { public Result edit(@RequestBody Expert expert) { expertService.updateById(expert); //开始添加到用户表 - SysUser user = new SysUser(); + /*SysUser user = new SysUser(); user.setAvatar(expert.getTopPic()); user.setSex(expert.getSex()); user.setRealname(expert.getRealname()); @@ -453,7 +455,8 @@ public class ExpertController extends JeecgController { user.setPassword(passwordEncode); user.setStatus(1); user.setDelFlag(CommonConstant.DEL_FLAG_0); - sysUserService.editUser(user,"1843478958968647681", expert.getSsdep(), "", ""); + sysUserService.editUser(user,"1843478958968647681", expert.getSsdep(), "", "");*/ + expertService.updateuser(expert.getTopPic(),expert.getSex(),expert.getSeusername()); return Result.OK("编辑成功!"); } @@ -507,7 +510,7 @@ public class ExpertController extends JeecgController { expert.setCompopen("1"); expertService.updateById(expert); //开始添加到用户表 - SysUser user = new SysUser(); + /* SysUser user = new SysUser(); user.setAvatar(expert.getTopPic()); user.setSex(expert.getSex()); user.setRealname(expert.getRealname()); @@ -522,7 +525,8 @@ public class ExpertController extends JeecgController { user.setPassword(passwordEncode); user.setStatus(1); user.setDelFlag(CommonConstant.DEL_FLAG_0); - sysUserService.editUser(user,"1843478958968647681", expert.getSsdep(), "", ""); + sysUserService.editUser(user,"1843478958968647681", expert.getSsdep(), "", "");*/ + expertService.updateuser(expert.getTopPic(),expert.getSex(),expert.getSeusername()); return Result.OK("编辑成功!"); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java index 7711d40..d605ea3 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java @@ -58,4 +58,7 @@ public interface ExpertMapper extends BaseMapper { @Update("UPDATE expert SET adminopen = '3' , isdone = 'N' WHERE id = #{id}") void handlebackcount(String id); + + @Update("UPDATE sys_user SET sex = #{sex} , avatar = #{topPic} WHERE username = #{seusername}") + void updateuser(String topPic, Integer sex, String seusername); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/service/IExpertService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/service/IExpertService.java index a52cb4f..8b40466 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/service/IExpertService.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/service/IExpertService.java @@ -43,4 +43,6 @@ public interface IExpertService extends IService { void handleupcount(String id); void handlebackcount(String id); + + void updateuser(String topPic, Integer sex, String seusername); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/service/impl/ExpertServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/service/impl/ExpertServiceImpl.java index 8076c5b..56e21c4 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/service/impl/ExpertServiceImpl.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/service/impl/ExpertServiceImpl.java @@ -107,4 +107,9 @@ public class ExpertServiceImpl extends ServiceImpl impleme public void handlebackcount(String id) { expertMapper.handlebackcount(id); } + + @Override + public void updateuser(String topPic, Integer sex, String seusername) { + expertMapper.updateuser(topPic,sex,seusername); + } } From b55bce7086c4ecb34e612ce44f00331d761273c5 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854@qq.com> Date: Sun, 10 Nov 2024 12:27:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=2011.1?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/shiro/ShiroConfig.java | 5 +- .../controller/SysDepartController.java | 28 +++ .../system/service/ISysDepartService.java | 1 + .../service/impl/SysDepartServiceImpl.java | 47 ++++ jeecgboot-vue3/src/api/common/api.ts | 8 + .../jeecg/components/JSelectDept4FaRen.vue | 207 ++++++++++++++++++ .../modal/DeptSelectModal4FaRen.vue | 131 +++++++++++ .../system/loginmini/MiniRegister4faren.vue | 3 +- 8 files changed, 428 insertions(+), 2 deletions(-) create mode 100644 jeecgboot-vue3/src/components/Form/src/jeecg/components/JSelectDept4FaRen.vue create mode 100644 jeecgboot-vue3/src/components/Form/src/jeecg/components/modal/DeptSelectModal4FaRen.vue diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index a76b18e..a9d5810 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -185,7 +185,10 @@ public class ShiroConfig { filterChainDefinitionMap.put("/sys/user/userRegister4Faren", "anon"); //法人注册接口 filterChainDefinitionMap.put("/sys/user/userRegister4Shenbaoren", "anon");//申报人注册 - filterChainDefinitionMap.put("/sys/sysDepart/queryDepartTreeSync", "anon");//申报人用户注册 + + filterChainDefinitionMap.put("/sys/sysDepart/queryDepartTreeSync", "anon");//申报人注册时，选择部门列表 + + filterChainDefinitionMap.put("/sys/sysDepart/queryDepartTreeSync4FaRen", "anon");//法人注册时，选择部门列表 diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index d90e3a4..803fd42 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -44,6 +44,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.*; +import java.util.stream.Collectors; /** *

@@ -170,6 +171,33 @@ public class SysDepartController { return result; } + /** + * @description: 法人注册时，只显示市和县区科技局，不显示下属单位 + * @param: [parentId, ids, primaryKey] + * @return: org.jeecg.common.api.vo.Result> + * @author: z.h.c + * @date: 24/11/9 16:07 + */ + @RequestMapping(value = "/queryDepartTreeSync4FaRen", method = RequestMethod.GET) + public Result> queryDepartTreeSync4FaRen(@RequestParam(name = "pid", required = false) String parentId, + @RequestParam(name = "ids", required = false) String ids, + @RequestParam(name = "primaryKey", required = false) String primaryKey) { + Result> result = new Result<>(); + try { +// parentId = "1839495887972130817"; + List sysDeparts = sysDepartService.list(new LambdaQueryWrapper().eq(SysDepart::getParentId, "1839495887972130817")); + ids = Optional.ofNullable(sysDeparts).orElse(new LinkedList<>()).stream().map(e -> e.getId()).collect(Collectors.joining(",")); + List list = sysDepartService.queryTreeListByPid4FaRen(parentId, ids, primaryKey); + result.setResult(list); + result.setSuccess(true); + } catch (Exception e) { + log.error(e.getMessage(), e); + result.setSuccess(false); + result.setMessage("查询失败"); + } + return result; + } + /** * 获取某个部门的所有父级部门的ID * diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java index 95503a8..23404eb 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java @@ -148,6 +148,7 @@ public interface ISysDepartService extends IService{ * @return */ List queryTreeListByPid(String parentId,String ids, String primaryKey); + List queryTreeListByPid4FaRen(String parentId,String ids, String primaryKey); /** * 获取某个部门的所有父级部门的ID diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index 279ad83..3d1ad59 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -645,6 +645,53 @@ public class SysDepartServiceImpl extends ServiceImpl queryTreeListByPid4FaRen(String parentId,String ids, String primaryKey) { + /*Consumer> square = i -> { + if (oConvertUtils.isNotEmpty(ids)) { + if (CommonConstant.DEPART_KEY_ORG_CODE.equals(primaryKey)) { + i.in(SysDepart::getOrgCode, ids.split(SymbolConstant.COMMA)); + } else { + i.in(SysDepart::getId, ids.split(SymbolConstant.COMMA)); + } + } else { + if(oConvertUtils.isEmpty(parentId)){ + i.and(q->q.isNull(true,SysDepart::getParentId).or().eq(true,SysDepart::getParentId,"")); + }else{ + i.eq(true,SysDepart::getParentId,parentId); + } + } + };*/ + LambdaQueryWrapper lqw=new LambdaQueryWrapper<>(); + + lqw.in(SysDepart::getId,ids.split(SymbolConstant.COMMA)); +// i.in(SysDepart::getOrgCode, ids.split(SymbolConstant.COMMA)); + //------------------------------------------------------------------------------------------------ + //是否开启系统管理模块的 SASS 控制 + /*if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){ + lqw.eq(SysDepart::getTenantId, oConvertUtils.getInt(TenantContext.getTenant(), 0)); + }*/ + //------------------------------------------------------------------------------------------------ + lqw.eq(true,SysDepart::getDelFlag,CommonConstant.DEL_FLAG_0.toString()); +// lqw.func(square); + //update-begin---author:wangshuai ---date:20220527 for：[VUEN-1143]排序不对，vue3和2应该都有问题，应该按照升序排------------ + lqw.orderByAsc(SysDepart::getDepartOrder); + //update-end---author:wangshuai ---date:20220527 for：[VUEN-1143]排序不对，vue3和2应该都有问题，应该按照升序排-------------- + List list = list(lqw); + //update-begin---author:wangshuai ---date:20220316 for：[JTC-119]在部门管理菜单下设置部门负责人 创建用户的时候不需要处理 + //设置用户id,让前台显示 +// this.setUserIdsByDepList(list); + //update-end---author:wangshuai ---date:20220316 for：[JTC-119]在部门管理菜单下设置部门负责人 创建用户的时候不需要处理 + List records = new ArrayList<>(); + for (int i = 0; i < list.size(); i++) { + SysDepart depart = list.get(i); + SysDepartTreeModel treeModel = new SysDepartTreeModel(depart); + //TODO 异步树加载key拼接__+时间戳,以便于每次展开节点会刷新数据 + //treeModel.setKey(treeModel.getKey()+"__"+System.currentTimeMillis()); + records.add(treeModel); + } + return records; + } + @Override public JSONObject queryAllParentIdByDepartId(String departId) { JSONObject result = new JSONObject(); diff --git a/jeecgboot-vue3/src/api/common/api.ts b/jeecgboot-vue3/src/api/common/api.ts index 47d5cfb..7772087 100644 --- a/jeecgboot-vue3/src/api/common/api.ts +++ b/jeecgboot-vue3/src/api/common/api.ts @@ -8,6 +8,7 @@ enum Api { userList = '/sys/user/list', roleList = '/sys/role/list', queryDepartTreeSync = '/sys/sysDepart/queryDepartTreeSync', + queryDepartTreeSync4FaRen = '/sys/sysDepart/queryDepartTreeSync4FaRen', queryTreeList = '/sys/sysDepart/queryTreeList', loadTreeData = '/sys/category/loadTreeData', loadDictItem = '/sys/category/loadDictItem/', @@ -51,6 +52,13 @@ export const getRoleList = (params) => { export const queryDepartTreeSync = (params?) => { return defHttp.get({ url: Api.queryDepartTreeSync, params }); }; + +// 法人注册时，弹出列表只显示市和县区科技局，不显示下属单位 add by zhc 11.10 +export const queryDepartTreeSync4FaRen = (params?) => { + return defHttp.get({ url: Api.queryDepartTreeSync4FaRen, params }); +}; + + /** * 获取部门树列表 */ diff --git a/jeecgboot-vue3/src/components/Form/src/jeecg/components/JSelectDept4FaRen.vue b/jeecgboot-vue3/src/components/Form/src/jeecg/components/JSelectDept4FaRen.vue new file mode 100644 index 0000000..6429ee3 --- /dev/null +++ b/jeecgboot-vue3/src/components/Form/src/jeecg/components/JSelectDept4FaRen.vue @@ -0,0 +1,207 @@ + + + + diff --git a/jeecgboot-vue3/src/components/Form/src/jeecg/components/modal/DeptSelectModal4FaRen.vue b/jeecgboot-vue3/src/components/Form/src/jeecg/components/modal/DeptSelectModal4FaRen.vue new file mode 100644 index 0000000..ec88712 --- /dev/null +++ b/jeecgboot-vue3/src/components/Form/src/jeecg/components/modal/DeptSelectModal4FaRen.vue @@ -0,0 +1,131 @@ + + + diff --git a/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue b/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue index 506adcf..1085f79 100644 --- a/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue +++ b/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue @@ -41,7 +41,7 @@

- +
@@ -126,6 +126,7 @@ import eyeKImg from '/@/assets/loginmini/icon/icon-eye-k.png'; import eyeGImg from '/@/assets/loginmini/icon/icon-eye-g.png'; import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue'; + import JSelectDept4FaRen from '/@/components/Form/src/jeecg/components/JSelectDept4FaRen.vue'; import { useI18n } from '/@/hooks/web/useI18n'; import codeImg from '/@/assets/images/checkcode.png'; From 894662cfda9013d5a28f64d26877dfca51c84b2d 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 13:18:46 +0800 Subject: [PATCH 3/6] =?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 | 26 ++- .../modules/demo/expert/entity/Expert.java | 6 + .../demo/expert/mapper/ExpertMapper.java | 2 +- .../src/views/expert/admin/Expert.api.ts | 5 + .../src/views/expert/admin/ExpertList.vue | 32 +-- .../expert/admin/components/ExpertForm1.vue | 188 ++++++++++++++++++ .../expert/admin/components/ExpertModal1.vue | 78 ++++++++ .../src/views/expert/county/Expert.api.ts | 7 + .../src/views/expert/county/ExpertList.vue | 19 +- .../expert/county/components/ExpertForm1.vue | 182 +++++++++++++++++ .../expert/county/components/ExpertModal1.vue | 77 +++++++ .../expert/firm/components/ExpertForm.vue | 2 +- .../expert/self/components/ExpertForm.vue | 4 +- 13 files changed, 600 insertions(+), 28 deletions(-) create mode 100644 jeecgboot-vue3/src/views/expert/admin/components/ExpertForm1.vue create mode 100644 jeecgboot-vue3/src/views/expert/admin/components/ExpertModal1.vue create mode 100644 jeecgboot-vue3/src/views/expert/county/components/ExpertForm1.vue create mode 100644 jeecgboot-vue3/src/views/expert/county/components/ExpertModal1.vue 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 e5d35b3..7e72a5d 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 @@ -629,7 +629,7 @@ public class ExpertController extends JeecgController { public Result handleupupfirm(@RequestParam(name="id",required=true) String id) { String str =""; Expert expert =expertService.getById(id); - if (expert.getCompopen().equals("1")) { + if (expert.getCompopen().equals("1") ||expert.getCompopen().equals("3")) { //修改提交审核状态 expertService.handleupupfirm(id); str ="通过审核"; @@ -659,11 +659,11 @@ public class ExpertController extends JeecgController { //这个是专家的上级管理员审核 @AutoLog(value = "专家管理-这个是上级管理员的通过审核") @ApiOperation(value="专家管理-这个是上级管理员的通过审核", notes="专家管理-这个是上级管理员的通过审核") - @GetMapping(value = "handleupcount") + @GetMapping(value = "/handleupcount") public Result handleupcount(@RequestParam(name="id",required=true) String id) { String str =""; Expert expert =expertService.getById(id); - if (expert.getCompopen().equals("2") && expert.getAdminopen().equals("1")) { + if ((expert.getCompopen().equals("2") && expert.getAdminopen().equals("1")) || (expert.getCompopen().equals("2") && expert.getAdminopen().equals("3"))) { //修改提交审核状态 expertService.handleupcount(id); str ="审核通过"; @@ -935,4 +935,24 @@ public class ExpertController extends JeecgController { } + @AutoLog(value = "专家管理-市局/县区管理员驳回") + @ApiOperation(value="专家管理-市局/县区管理员驳回", notes="专家管理-市局/县区管理员驳回") + @RequestMapping(value = "/saveOrUpdateadminbh", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result saveOrUpdateadminbh(@RequestBody Expert expert) { + expert.setAdminopen("3"); + expert.setCompopen("3"); + expert.setIsdone("N"); + expertService.updateById(expert); + return Result.OK("驳回成功，已责令专家重新编辑!"); + } + @AutoLog(value = "专家管理-公司驳回") + @ApiOperation(value="专家管理-公司驳回", notes="专家管理-公司驳回") + @RequestMapping(value = "/saveOrUpdatefimebh", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result saveOrUpdatefimebh(@RequestBody Expert expert) { + expert.setCompopen("3"); + + expertService.updateById(expert); + return Result.OK("编辑成功!"); + } + } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java index 0391aa9..30f5e4c 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java @@ -102,6 +102,7 @@ public class Expert implements Serializable { private String phone; @TableField(exist = false) private String emails; + @Dict(dicCode = "sex") @TableField(exist = false) private Integer sex; @TableField(exist = false) @@ -140,4 +141,9 @@ public class Expert implements Serializable { @ApiModelProperty(value = "职称") private java.lang.String zc; + /**驳回原因*/ + @Excel(name = "驳回原因", width = 15) + @ApiModelProperty(value = "驳回原因") + private java.lang.String backinfo; + } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java index d605ea3..9416b57 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java @@ -44,7 +44,7 @@ public interface ExpertMapper extends BaseMapper { @Select("SELECT user_id FROM sys_user_role WHERE role_id =#{number}") List userbyrole(String number); - @Update("UPDATE expert SET isdone = 'Y' WHERE id = #{id}") + @Update("UPDATE expert SET isdone = 'Y' , backinfo = '' WHERE id = #{id}") void updatetj(String id); @Update("UPDATE expert SET compopen = '2' WHERE id = #{id}") diff --git a/jeecgboot-vue3/src/views/expert/admin/Expert.api.ts b/jeecgboot-vue3/src/views/expert/admin/Expert.api.ts index 354bae9..91924e6 100644 --- a/jeecgboot-vue3/src/views/expert/admin/Expert.api.ts +++ b/jeecgboot-vue3/src/views/expert/admin/Expert.api.ts @@ -13,6 +13,7 @@ enum Api { exportXls = '/expert/expert/exportXls', handleadminback = '/expert/expert/handleadminback', handleadminup = '/expert/expert/handleadminup', + saveOrUpdateadminbhapi= '/expert/expert/saveOrUpdateadminbh', } /** @@ -89,3 +90,7 @@ export const saveOrUpdate = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({ url: url, params }, { isTransformResponse: false }); } +export const saveOrUpdateadminbh = (params, isUpdate) => { + let url = isUpdate ? Api.saveOrUpdateadminbhapi : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} diff --git a/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue b/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue index 8975cb8..72d4814 100644 --- a/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue +++ b/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue @@ -79,6 +79,7 @@ + @@ -90,6 +91,7 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl,handleadminup,handleadminback } from './Expert.api'; import { downloadFile } from '/src/utils/common/renderUtils'; import ExpertModal from './components/ExpertModal.vue' + import ExpertModal1 from './components/ExpertModal1.vue' import { useUserStore } from '/src/store/modules/user'; import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue'; @@ -99,6 +101,7 @@ const queryParam = reactive({}); const toggleSearchStatus = ref(false); const registerModal = ref(); + const registerModal1zbc = ref(); const userStore = useUserStore(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ @@ -166,6 +169,13 @@ registerModal.value.disableSubmit = false; registerModal.value.edit(record); } + function handleEdit1zbc(record: Recordable) { + registerModal1zbc.value.disableSubmit = false; + console.log(registerModal1zbc.value,'registerForm.value') + + registerModal1zbc.value.edit(record); + } + /** * 详情 @@ -237,14 +247,10 @@ confirm: handleupadmin.bind(null, record), placement: 'topLeft', }, - }, { - label: '驳回审核', - popConfirm: { - title: '是否驳回', - confirm: handlebackadmin.bind(null, record), - placement: 'topLeft', - }, - } + }, { + label: '驳回', + onClick: handleEdit1zbc.bind(null, record), + }, ]; } @@ -271,13 +277,9 @@ placement: 'topLeft', }, }, { - label: '驳回审核', - popConfirm: { - title: '是否驳回', - confirm: handlebackadmin.bind(null, record), - placement: 'topLeft', - }, - } + label: '驳回', + onClick: handleEdit1zbc.bind(null, record), + }, ] } diff --git a/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm1.vue b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm1.vue new file mode 100644 index 0000000..5e6a335 --- /dev/null +++ b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm1.vue @@ -0,0 +1,188 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/expert/admin/components/ExpertModal1.vue b/jeecgboot-vue3/src/views/expert/admin/components/ExpertModal1.vue new file mode 100644 index 0000000..28fc94e --- /dev/null +++ b/jeecgboot-vue3/src/views/expert/admin/components/ExpertModal1.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/jeecgboot-vue3/src/views/expert/county/Expert.api.ts b/jeecgboot-vue3/src/views/expert/county/Expert.api.ts index 7222793..634f747 100644 --- a/jeecgboot-vue3/src/views/expert/county/Expert.api.ts +++ b/jeecgboot-vue3/src/views/expert/county/Expert.api.ts @@ -13,6 +13,7 @@ enum Api { exportXls = '/expert/expert/exportXls', handleupcount = '/expert/expert/handleupcount', handlebackcoount = '/expert/expert/handlebackcoount', + saveOrUpdateadminbhapi= '/expert/expert/saveOrUpdateadminbh', } /** @@ -88,3 +89,9 @@ export const saveOrUpdate = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({ url: url, params }, { isTransformResponse: false }); } + + +export const saveOrUpdateadminbh = (params, isUpdate) => { + let url = isUpdate ? Api.saveOrUpdateadminbhapi : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} diff --git a/jeecgboot-vue3/src/views/expert/county/ExpertList.vue b/jeecgboot-vue3/src/views/expert/county/ExpertList.vue index 954748e..5de33c8 100644 --- a/jeecgboot-vue3/src/views/expert/county/ExpertList.vue +++ b/jeecgboot-vue3/src/views/expert/county/ExpertList.vue @@ -69,6 +69,7 @@ + @@ -80,6 +81,7 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl,handleupcount,handlebackco } from './Expert.api'; import { downloadFile } from '/src/utils/common/renderUtils'; import ExpertModal from './components/ExpertModal.vue' + import ExpertModal1 from './components/ExpertModal1.vue' import { useUserStore } from '/src/store/modules/user'; import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue'; @@ -90,6 +92,7 @@ const queryParam = reactive({}); const toggleSearchStatus = ref(false); const registerModal = ref(); + const registerModal1 = ref(); const userStore = useUserStore(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ @@ -158,6 +161,14 @@ registerModal.value.edit(record); } + /** + * 编辑事件 + */ + function handleEdit1(record: Recordable) { + registerModal1.value.disableSubmit = false; + registerModal1.value.edit(record); + } + /** * 详情 */ @@ -229,12 +240,8 @@ }, }, { label: '驳回', - popConfirm: { - title: '是否确认通过审核', - confirm: handlebackcount.bind(null, record), - placement: 'topLeft', - }, - } + onClick: handleEdit1.bind(null, record), + }, ]; } diff --git a/jeecgboot-vue3/src/views/expert/county/components/ExpertForm1.vue b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm1.vue new file mode 100644 index 0000000..e0a615b --- /dev/null +++ b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm1.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/expert/county/components/ExpertModal1.vue b/jeecgboot-vue3/src/views/expert/county/components/ExpertModal1.vue new file mode 100644 index 0000000..32f8ad5 --- /dev/null +++ b/jeecgboot-vue3/src/views/expert/county/components/ExpertModal1.vue @@ -0,0 +1,77 @@ + + + + + + diff --git a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue index 7abd887..e13d20b 100644 --- a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue +++ b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue @@ -98,7 +98,7 @@ - + diff --git a/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue index a9e378d..fd0abe8 100644 --- a/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue +++ b/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue @@ -94,8 +94,8 @@ - - + + From 9a53796eca4516b853e698b85a148a8b058864e1 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 13:22:25 +0800 Subject: [PATCH 4/6] =?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 | 17 ----------------- 1 file changed, 17 deletions(-) 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 7e72a5d..179d030 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 @@ -475,23 +475,6 @@ public class ExpertController extends JeecgController { 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("编辑成功!"); } From 5557dbf54bea0b81ccb8aadf999fce57eef2081e 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 13:29:48 +0800 Subject: [PATCH 5/6] =?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 | 2 +- 1 file changed, 1 insertion(+), 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 179d030..f788be8 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 @@ -858,7 +858,7 @@ public class ExpertController extends JeecgController { @ApiOperation(value="管理员专家数据---专家待提交/未审核", notes="管理员专家数据---专家待提交/未审核") @GetMapping(value = "/expdatawtjsh") public Result expdatawtjsh() { - List expertList = expertService.query().eq("adminopen","1").or().eq("compopen","1").or().eq("isdone","N").list(); + List expertList = expertService.query().eq("adminopen","1").or().eq("compopen","1").or().eq("adminopen","3").or().eq("compopen","3").or().eq("isdone","N").list(); return Result.OK(expertList.size()); } From dbd650217ffbf2952a6993c88aa47125e57bf70a 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 14:56:33 +0800 Subject: [PATCH 6/6] =?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 --- .../modules/demo/expert/controller/ExpertController.java | 2 +- .../demo/expproject/controller/ExpprojectController.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) 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 f788be8..d742e89 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 @@ -632,7 +632,7 @@ public class ExpertController extends JeecgController { if (expert.getCompopen().equals("1")) { //修改提交审核状态 expertService.handlebackbackfirm(id); - str ="驳回审核！请到编辑页面确定问题数据并填写驳回原因"; + str ="驳回审核！"; } else if (expert.getCompopen().equals("3") || expert.getCompopen().equals("2") ) { str ="已驳回或者是已通过审核"; } 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 ac98550..043981c 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 @@ -172,7 +172,14 @@ public class ExpprojectController { if(expprojectEntity==null) { return Result.error("未找到对应数据"); } - if (expproject.getNeedexp()>=expprojectPage.getExpandproList().size()) { + int a=0; + if ( expprojectPage.getExpandproList() != null && !expprojectPage.getExpandproList().isEmpty()) { + a=expprojectPage.getExpandproList().size(); + }else { + a=0; + } + + if (expproject.getNeedexp()>=a) { expprojectService.updateMain(expproject, expprojectPage.getExpandproList()); return Result.OK("编辑成功!"); }else {