shudonghui преди 1 година
родител
ревизия
44805f0c62

+ 20 - 2
sop-business/src/main/java/com/qmth/sop/business/bean/result/SysDingGroupResult.java

@@ -2,6 +2,7 @@ package com.qmth.sop.business.bean.result;
 
 import com.qmth.sop.business.entity.SysDingGroup;
 import com.qmth.sop.business.entity.SysDingObj;
+import com.qmth.sop.common.enums.ServiceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -13,7 +14,7 @@ import java.util.List;
  * 考勤组表
  * </p>
  *
- * @author wangliang
+ * @author dhshu
  * @since 2023-08-01
  */
 
@@ -24,11 +25,15 @@ public class SysDingGroupResult extends SysDingGroup implements Serializable {
     @ApiModelProperty(value = "服务单元")
     private String service;
 
-
+    @ApiModelProperty(value = "创建人")
+    private String createName;
 
     @ApiModelProperty(value = "供应商")
     private Long supplier;
 
+    @ApiModelProperty(value = "服务单元状态")
+    private ServiceStatusEnum status;
+
     @ApiModelProperty(value = "适用考勤对象")
     private List<SysDingGroupRoleResult> dingObjs= new ArrayList<>();
 
@@ -59,6 +64,19 @@ public class SysDingGroupResult extends SysDingGroup implements Serializable {
     }
 
 
+    public String getCreateName() {
+        return createName;
+    }
 
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
 
+    public ServiceStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(ServiceStatusEnum status) {
+        this.status = status;
+    }
 }

+ 2 - 1
sop-business/src/main/resources/mapper/SysDingGroupMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.qmth.sop.business.mapper.SysDingGroupMapper">
 
     <select id="query" resultType="com.qmth.sop.business.bean.result.SysDingGroupResult">
-        select a.*,s.name supplier,t.name service from sys_ding_group a
+        select a.*,s.name supplier,t.name service,u.real_name create_name,t.status from sys_ding_group a
+        left join sys_user u on u.id = a.create_id
         left join sys_supplier s on s.id = a.supplier_id
         left join t_b_service t on t.id = a.service_id
         <where>