Browse Source

关联用户name

xda 3 years ago
parent
commit
6ad9a031ac

+ 5 - 1
src/main/java/com/winhc/repal/controller/RepalGroupController.java

@@ -5,6 +5,7 @@ import com.winhc.common.enums.CodeMsg;
 import com.winhc.repal.model.dto.InitGroupDTO;
 import com.winhc.repal.service.RepalGroupService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Author: xda
  * @Date: 2022/5/6 13:34
  */
-@Api(tags = "款宝组织")
+@Api(tags = "款宝组织")
 @RestController
 @RequestMapping(value = "/group")
 public class RepalGroupController {
@@ -25,11 +26,14 @@ public class RepalGroupController {
     private RepalGroupService repalGroupService;
 
 
+    @ApiOperation("初始化管理员和组织")
     @RequestMapping(value = "/init", method = RequestMethod.POST)
     public BeanResponse<Boolean> initGroup(@RequestBody InitGroupDTO dto) {
         return BeanResponse.success(CodeMsg.SUCCESS, repalGroupService.initGroup(dto));
     }
 
+    //@ApiOperation("")
+
 
 
 }

+ 2 - 1
src/main/resources/mapper/RepalResponsiblePersonMapper.xml

@@ -3,8 +3,9 @@
 <mapper namespace="com.winhc.repal.repository.RepalResponsiblePersonMapper">
 
     <select id="getResponsiblePersonNameList" parameterType="java.lang.Long" resultType="com.winhc.repal.model.vo.ResponsiblePersonNameVO">
-        SELECT rPerson.REPAL_BILL_ID AS repalBillId, userExt.USER_NAME AS userName, userExt.USER_ID AS userId FROM REPAL_RESPONSIBLE_PERSON AS rPerson
+        SELECT rPerson.REPAL_BILL_ID AS repalBillId, groupMember.MEMBER_USER_NAME AS userName, userExt.USER_ID AS userId FROM REPAL_RESPONSIBLE_PERSON AS rPerson
         LEFT JOIN USER_EXT AS userExt ON rPerson.USER_ID = userExt.USER_ID
+        LEFT JOIN REPAL_GROUP_MEMBER AS groupMember ON userExt.USER_ID = groupMember.USER_ID
         WHERE rPerson.REPAL_BILL_ID IN
         <foreach item="item" index="index" collection="billIdList" open="(" close=")" separator=",">
             #{item}