Ver código fonte

机构负责人显示问题处理

hxl13994548489 2 anos atrás
pai
commit
79e506e0d0

+ 3 - 3
src/main/java/com/ydtech/modules/admin/model/dto/DeptBalanceDto.java

@@ -21,7 +21,7 @@ public class DeptBalanceDto implements Serializable {
     private String deptName;
 
     @ApiModelProperty(value = "机构负责人")
-    private String deptLeader;
+    private String userName;
 
     @ApiModelProperty(value = "机构地址")
     private String deptAddress;
@@ -58,9 +58,9 @@ public class DeptBalanceDto implements Serializable {
     public DeptBalanceDto() {
     }
 
-    public DeptBalanceDto(String deptName, String deptLeader, String deptAddress, BigDecimal deptManagementFee, BigDecimal totalIncome, BigDecimal withdrawn, BigDecimal notWithdrawn, String comLevel) {
+    public DeptBalanceDto(String deptName, String userName, String deptAddress, BigDecimal deptManagementFee, BigDecimal totalIncome, BigDecimal withdrawn, BigDecimal notWithdrawn, String comLevel) {
         this.deptName = deptName;
-        this.deptLeader = deptLeader;
+        this.userName = userName;
         this.deptAddress = deptAddress;
         this.deptManagementFee = deptManagementFee;
         this.totalIncome = totalIncome;

+ 2 - 1
src/main/resources/mapper/modules/admin/SysAgencyLeaderMapper.xml

@@ -41,10 +41,11 @@
     <select id="queryPage" resultType="com.ydtech.modules.admin.model.dto.DeptBalanceDto">
         select
             sal.user_id AS "userId",
-            sal.user_name AS "deptLeader",
+            sal.user_name AS "userName",
             sd.address AS "deptAddress",
             sd.comlevel AS "comlevel",
             sal.dept_id AS deptId,
+            sal.dept_name AS deptName,
             sal.proportional AS "proportional",
             sal.create_time AS "createTime",
             sal.update_time AS "updateTime"