瀏覽代碼

新增获取公司部门数据

anderx 4 月之前
父節點
當前提交
fe122cc47e

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ProjectTaskController.java

@@ -550,7 +550,7 @@ public class ProjectTaskController extends BaseController {
     }
 
     /**
-     * 获取公司打卡数据
+     * 获取公司部门,项目,人员信息
      */
     @GetMapping("/getCompanyData")
     public AjaxResult getCompanyData(Integer deptId){

+ 9 - 0
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -69,6 +69,15 @@ public class SysDept extends BaseEntity
     private String companyLogo;
     private String companyFullName;
     private String kyId;
+    private String usci;
+
+    public String getUsci() {
+        return usci;
+    }
+
+    public void setUsci(String usci) {
+        this.usci = usci;
+    }
 
     public String getKyId() {
         return kyId;

+ 5 - 1
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -26,12 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="companyLogo" column="company_logo" />
 		<result property="companyFullName" column="company_full_name" />
 		<result property="kyId" column="ky_id" />
+		<result property="usci" column="usci" />
 	</resultMap>
 
 	<sql id="selectDeptVo">
         select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
                d.del_flag, d.create_by, d.create_time,d.company_id,d.company_name,d.max_duration,sd.dept_name companyName,
-               d.company_logo ,d.company_full_name,d.ky_id
+               d.company_logo ,d.company_full_name,d.ky_id,d.usci
         from sys_dept d left join sys_dept sd on d.company_id = sd.dept_id
     </sql>
 
@@ -138,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="companyLogo != null ">company_logo,</if>
 			<if test="companyFullName != null ">company_full_name,</if>
 			<if test="kyId != null ">ky_id,</if>
+			<if test="usci != null ">usci,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -156,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="companyLogo != null ">#{companyLogo},</if>
 			<if test="companyFullName != null ">#{companyFullName},</if>
  		    <if test="kyId != null ">#{kyId},</if>
+ 		        <if test="usci != null ">#{usci},</if>
  			sysdate()
  		)
 	</insert>
@@ -178,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="companyLogo != null ">company_logo = #{companyLogo},</if>
 			<if test="companyFullName != null ">company_full_name = #{companyFullName},</if>
  		    <if test="kyId != null ">ky_id = #{kyId},</if>
+ 		    <if test="usci != null ">usci = #{usci},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}