金蝶科目代码

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

@@ -112,6 +112,17 @@ public class SysDept extends BaseEntity {
      */
     private Integer nature;
 
+    /**
+     * 金蝶科目代码
+     */
+    private String jdSubjectCode;
+    /**
+     * 金蝶科目名称
+     */
+    private String jdSubjectName;
+
+    //=================
+
     public Long getDeptId() {
         return deptId;
     }
@@ -262,6 +273,22 @@ public class SysDept extends BaseEntity {
         this.nature = nature;
     }
 
+    public String getJdSubjectCode() {
+        return jdSubjectCode;
+    }
+
+    public void setJdSubjectCode(String jdSubjectCode) {
+        this.jdSubjectCode = jdSubjectCode;
+    }
+
+    public String getJdSubjectName() {
+        return jdSubjectName;
+    }
+
+    public void setJdSubjectName(String jdSubjectName) {
+        this.jdSubjectName = jdSubjectName;
+    }
+
     @Override
     public String toString() {
         return "SysDept{" +

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -205,9 +205,35 @@ public class SysUser extends BaseEntity {
      */
     private Integer identity;
 
+    /**
+     * 金蝶科目代码
+     */
+    private String jdSubjectCode;
+    /**
+     * 金蝶科目名称
+     */
+    private String jdSubjectName;
+
 
     //==================================================
 
+
+    public String getJdSubjectCode() {
+        return jdSubjectCode;
+    }
+
+    public void setJdSubjectCode(String jdSubjectCode) {
+        this.jdSubjectCode = jdSubjectCode;
+    }
+
+    public String getJdSubjectName() {
+        return jdSubjectName;
+    }
+
+    public void setJdSubjectName(String jdSubjectName) {
+        this.jdSubjectName = jdSubjectName;
+    }
+
     @TableField(exist = false)
     private List<SysUserIdentity> identityList;
 

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateTime" column="update_time"/>
 		<result property="tenantId" column="tenant_id"/>
 		<result property="jstDistributor" column="jst_distributor"/>
+		<result property="jdSubjectCode" column="jd_subject_code"/>
+		<result property="jdSubjectName" column="jd_subject_name"/>
 	</resultMap>
 
 	<sql id="selectDeptVo">
@@ -43,7 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   d.tenant_id,
 			   d.type,
 			   d.jst_distributor,
-			   d.nature
+			   d.nature,
+			   d.jd_subject_code,
+			   d.jd_subject_name
 		from sys_dept d
 	</sql>
     
@@ -98,7 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   d.phone,
 			   d.email,
 			   d.status,
-			   (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
+			   (select dept_name from sys_dept where dept_id = d.parent_id) parent_name,
+			   d.jd_subject_code,d.jd_subject_name
 		from sys_dept d
 		where d.dept_id = #{deptId}
 	</select>
@@ -141,7 +146,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="tenantId != null and tenantId != ''">tenant_id,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
 		<if test="nature != null">nature,</if>
-        create_time,
+		<if test="jdSubjectCode != null">jd_subject_code,</if>
+		<if test="jdSubjectName != null">jd_subject_name,</if>
+		create_time,
 		jst_distributor
 		)values(
         <if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -158,6 +165,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="tenantId != null and tenantId != ''">#{tenantId},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
 		<if test="nature != null">#{nature},</if>
+		<if test="jdSubjectCode != null">#{jd_subject_code},</if>
+		<if test="jdSubjectName != null">#{jd_subject_name},</if>
 		sysdate(),
 		#{jstDistributor}
         )
@@ -178,6 +187,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status = #{status},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="nature != null">#{nature},</if>
+			<if test="jdSubjectCode != null">#{jd_subject_code},</if>
+			<if test="jdSubjectName != null">#{jd_subject_name},</if>
 			update_time = sysdate(),
 			jst_distributor = #{jstDistributor}
 		</set>

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -37,6 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="purchaseRange"     column="purchase_range"	  />
 		<result property="saleLv"     column="sale_lv"	  />
 		<result property="identity"     column="identity"	  />
+		<result property="jdSubjectCode"     column="jd_subject_code"	  />
+		<result property="jdSubjectName"     column="jd_subject_name"	  />
 		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
 	</resultMap>
@@ -86,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   u.company_id as ofCompanyId,
 			   u.company_set,
 			   u.account_name,u.account_bank,u.account_number,u.purchase_range,u.sale_lv,u.identity,
+			   u.jd_subject_code,u.jd_subject_name,
 			   d.dept_id,
 			   d.parent_id,
 			   d.ancestors,
@@ -112,7 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		u.user_id, u.dept_id, u.nick_name, u.nick_name_en, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
 		u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader_id,
 		d.director_id, d.type,u.job_number,u.user_type,u.tenant_id,u.user_code,u.company_id,u.company_set,
-		u.account_name,u.account_bank,u.account_number,u.purchase_range,u.sale_lv,u.identity
+		u.account_name,u.account_bank,u.account_number,u.purchase_range,u.sale_lv,u.identity,
+		u.jd_subject_code,u.jd_subject_name
 		from
 		sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -347,6 +351,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="purchaseRange != null and purchaseRange != ''">purchase_range,</if>
 		<if test="saleLv != null">sale_lv,</if>
 		<if test="identity != null">identity,</if>
+		<if test="jdSubjectCode != null">jd_subject_code,</if>
+		<if test="jdSubjectName != null">jd_subject_name,</if>
 		create_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
@@ -374,6 +380,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="purchaseRange != null and purchaseRange != ''">#{purchaseRange},</if>
 		<if test="saleLv != null">#{saleLv},</if>
 		<if test="identity != null">#{identity},</if>
+		<if test="jdSubjectCode != null">#{jdSubjectCode},</if>
+		<if test="jdSubjectName != null">#{jdSubjectName},</if>
 		sysdate()
         )
     </insert>
@@ -409,6 +417,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="purchaseRange != null">purchase_range = #{purchaseRange},</if>
 			<if test="saleLv != null">sale_lv = #{saleLv},</if>
 			<if test="identity != null">identity = #{identity},</if>
+
+			<if test="jdSubjectCode != null">jd_subject_code = #{jdSubjectCode},</if>
+			<if test="jdSubjectName != null">jd_subject_name = #{jdSubjectName},</if>
 			update_time = sysdate()
         </set>
         where user_id = #{userId}