From b5d319285186901e6b8f958d1a815c6aa592f0e4 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 19 二月 2025 15:34:53 +0800
Subject: [PATCH] 新增行业主管部门
---
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 7 +++++++
business/src/main/resources/mapper/ProjectInfoMapper.xml | 5 ++++-
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java | 7 +++++++
start/src/main/java/com/ycl/web/controller/system/SysUserController.java | 5 +++++
system/src/main/java/com/ycl/system/service/ISysUserService.java | 2 ++
system/src/main/resources/mapper/system/SysUserMapper.xml | 3 +++
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 8 ++++++++
system/src/main/java/com/ycl/system/mapper/SysUserMapper.java | 3 +++
system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java | 2 ++
system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java | 5 +++++
10 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
index 5053aa7..0e32af5 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -155,4 +156,10 @@
@TableField("remark")
/** 瀹℃牳淇℃伅 */
private String remark;
+ @TableField("industry_competent_department")
+ private Long industryCompetentDepartment;
+ @TableField("industry_competent_department_person")
+ private Long industryCompetentDepartmentPerson;
+ @TableField("department_person_phone")
+ private String departmentPersonPhone;
}
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
index a55ea2f..7e6b757 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
@@ -134,6 +134,13 @@
@ApiModelProperty("璧嬬爜")
private String coding;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬")
+ private Long industryCompetentDepartment;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴浜�")
+ private Long industryCompetentDepartmentPerson;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡")
+ private String departmentPersonPhone;
+
private String remark;
public static ProjectInfo getEntityByForm(@NonNull ProjectInfoForm form, ProjectInfo entity) {
if(entity == null) {
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
index 7461909..ed1c2da 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -169,6 +169,14 @@
@ApiModelProperty("鏂囦欢")
private List<File> fileList;
+
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬")
+ private Long industryCompetentDepartment;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴浜�")
+ private Long industryCompetentDepartmentPerson;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡")
+ private String departmentPersonPhone;
+
private Integer usedStatus;
private String remark;
private Long processId;
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index ff3c457..c8c8bf3 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -47,7 +47,10 @@
TPI.update_by,
TPI.create_by,
TPI.remark,
- TPI.id
+ TPI.id,
+ TPI.industry_competent_department,
+ TPI.industry_competent_department_person,
+ TPI.department_person_phone
FROM
t_project_info TPI
WHERE
diff --git a/start/src/main/java/com/ycl/web/controller/system/SysUserController.java b/start/src/main/java/com/ycl/web/controller/system/SysUserController.java
index 08d405b..f6580d6 100644
--- a/start/src/main/java/com/ycl/web/controller/system/SysUserController.java
+++ b/start/src/main/java/com/ycl/web/controller/system/SysUserController.java
@@ -251,4 +251,9 @@
public AjaxResult flowDeptTree(SysDept dept) {
return success(deptService.flowDeptTree(dept));
}
+
+ @GetMapping("/getByDept/{deptId}")
+ public AjaxResult getByDept(@PathVariable Long deptId) {
+ return success(userService.getByDept(deptId));
+ }
}
diff --git a/system/src/main/java/com/ycl/system/mapper/SysUserMapper.java b/system/src/main/java/com/ycl/system/mapper/SysUserMapper.java
index 91e35fe..5a19084 100644
--- a/system/src/main/java/com/ycl/system/mapper/SysUserMapper.java
+++ b/system/src/main/java/com/ycl/system/mapper/SysUserMapper.java
@@ -126,4 +126,7 @@
* @return 缁撴灉
*/
public SysUser checkEmailUnique(String email);
+
+ List<SysUser> getByDept(Long deptId);
+
}
diff --git a/system/src/main/java/com/ycl/system/service/ISysUserService.java b/system/src/main/java/com/ycl/system/service/ISysUserService.java
index 3a63496..1468979 100644
--- a/system/src/main/java/com/ycl/system/service/ISysUserService.java
+++ b/system/src/main/java/com/ycl/system/service/ISysUserService.java
@@ -213,4 +213,6 @@
* @return 缁撴灉
*/
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+ List<SysUser> getByDept(Long deptId);
}
diff --git a/system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java b/system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
index 6e291af..47de2b5 100644
--- a/system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
+++ b/system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
@@ -414,4 +414,6 @@
}).collect(Collectors.toList());
return list;
}
+
+
}
diff --git a/system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java b/system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java
index 191b39d..577e40d 100644
--- a/system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java
+++ b/system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java
@@ -551,4 +551,9 @@
}
return successMsg.toString();
}
+
+ @Override
+ public List<SysUser> getByDept(Long deptId) {
+ return userMapper.getByDept(deptId);
+ }
}
diff --git a/system/src/main/resources/mapper/system/SysUserMapper.xml b/system/src/main/resources/mapper/system/SysUserMapper.xml
index 4e2e32b..725195f 100644
--- a/system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -226,4 +226,7 @@
</foreach>
</delete>
+ <select id="getByDept" resultMap="SysUserResult">
+ select * from sys_user where dept_id = #{deptId}
+ </select>
</mapper>
--
Gitblit v1.8.0