fix bug 40864 资料网员--列表负责人不回显

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java

@@ -11,8 +11,12 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.Result;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
+import com.jero.common.util.oConvertUtils;
 import com.jero.contract.entity.PayIncomeContract;
 import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.member.entity.PayMemberProject;
@@ -52,12 +56,14 @@ import com.jero.common.aspect.annotation.AutoLog;
 public class PayMemberProjectController extends JeroController<PayMemberProject, IPayMemberProjectService> {
 	@Resource
 	private IPayMemberProjectService memberProjectService;
-	@Autowired
+	@Resource
 	private IPayIncomeContractService payIncomeContractService;
 	@Resource
 	private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
 	@Resource
 	private IPayMemberProjectSubitemService memberProjectSubitemService;
+	@Resource
+	private ISysBaseAPI sysBaseAPI;
 
 	
 	/**
@@ -73,6 +79,12 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
 		QueryWrapper<PayMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, req.getParameterMap());
 		Page<PayMemberProject> page = new Page<>(pageNo, pageSize);
 		IPage<PayMemberProject> memberProjectPage = memberProjectService.getPage(page, queryWrapper);
+		for (PayMemberProject memberProject : memberProjectPage.getRecords()) {
+			LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId());
+			List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
+			String departName = departNamesByUsername.get(0);
+			memberProject.setDirectorName(user.getRealname() + "(" + departName + ")");
+		}
 		return Result.OK(memberProjectPage);
 	}
 
@@ -236,7 +248,24 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
 	@RequiresPermissions("memberProject:export")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMemberProject payMemberProject) {
-        return super.exportXls(request, payMemberProject, PayMemberProject.class, "会员项目表");
+		 QueryWrapper<PayMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, request.getParameterMap());
+        List<PayMemberProject> pageList = memberProjectService.list(queryWrapper);
+        // 过滤选中数据
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+        }
+        if (pageList.isEmpty()) {
+            throw new JeroBootException("没有数据");
+        }
+		for (PayMemberProject memberProject : pageList) {
+			LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId());
+			List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
+			String departName = departNamesByUsername.get(0);
+			memberProject.setDirectorName(user.getRealname() + "(" + departName + ")");
+		}
+		return super.exportListXls(pageList, PayMemberProject.class, "会员项目表");
     }
 
     /**

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java

@@ -90,6 +90,13 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
         }
         Page<PayMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
         IPage<PayMemberProjectSubitem> pageList = memberProjectSubitemService.queryPageListCompany(page, queryWrapper);
+        for (PayMemberProjectSubitem memberProjectSubitem : pageList.getRecords()) {
+            //DirectorName存的是id
+            LoginUser user = sysBaseAPI.getUserById(memberProjectSubitem.getDirectorName());
+            List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
+            String departName = departNamesByUsername.get(0);
+            memberProjectSubitem.setDirectorName(user.getRealname() + "(" + departName + ")");
+        }
         return Result.OK(pageList);
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java

@@ -93,7 +93,6 @@ public class PayMemberProject implements Serializable {
     /**
      * 负责人id
      */
-    @Excel(name = "负责人名称", width = 15,dictTable = "sys_user",dicText = "username",dicCode = "id")
     @ApiModelProperty(value = "负责人id")
     @NotBlank(message = "负责人不能为空")
     private String directorId;
@@ -101,6 +100,7 @@ public class PayMemberProject implements Serializable {
     /**
      * 负责人名称
      */
+    @Excel(name = "负责人名称", width = 15)
     @ApiModelProperty(value = "负责人名称")
     private String directorName;
 

jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java

@@ -265,4 +265,10 @@ public class PayMemberProjectSubitem implements Serializable {
     @TableField(exist = false)
     private String particularYear;
 
+    /**
+     * 负责人名称
+     */
+    @TableField(exist = false)
+    private String directorName;
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml

@@ -31,10 +31,11 @@
         <result column="mail" property="mail" />
         <result column="project_name" property="projectName" />
         <result column="particular_year" property="particularYear"/>
+        <result column="director_name" property="directorName" />
     </resultMap>
 
     <select id="queryPageListCompany" resultMap="MemberProjectSubitemResultMap">
-        select pmps.*,pmp.project_name,pmp.particular_year from pay_member_project_subitem pmps
+        select pmps.*,pmp.project_name,pmp.particular_year,pmp.director_id as director_name from pay_member_project_subitem pmps
         left join pay_member_project pmp on pmps.project_id = pmp.id
         ${ew.customSqlSegment}
     </select>