Quellcode durchsuchen

所有导出修改,导入修改名称修改

anderx vor 2 Jahren
Ursprung
Commit
cd29de582f

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ProjectTaskController.java

@@ -215,6 +215,7 @@ public class ProjectTaskController extends BaseController {
     @ApiOperation("导出项目打卡列表")
     @Log(title = "项目日志管理", businessType = BusinessType.EXPORT)
     public void listRecordExport(HttpServletResponse response, ProjectStaffRecordInput in){
+        in.setPageSize(999999);
         List<ProjectStaffRecordOut> list=projectStaffRecordService.listRecord(in);
         ExcelUtil<ProjectStaffRecordOut> util = new ExcelUtil<>(ProjectStaffRecordOut.class);
         util.exportExcel(response, list, "项目研发日志列表");
@@ -332,6 +333,7 @@ public class ProjectTaskController extends BaseController {
     @Log(title = "项目管理", businessType = BusinessType.EXPORT)
     public void export(HttpServletResponse response,ProjectListInput in)
     {
+        in.setPageSize(999999);
         List<ProjectTaskListOut> list=projectTaskService.list(in);
         ExcelUtil<ProjectTaskListOut> util = new ExcelUtil<>(ProjectTaskListOut.class);
         util.exportExcel(response, list, "项目列表");

+ 1 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -71,6 +71,7 @@ public class SysUserController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysUser user)
     {
+        user.setPageSize(999999);
         List<SysUser> list = userService.selectUserList(user);
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.exportExcel(response, list, "用户数据");

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectTaskServiceImpl.java

@@ -165,8 +165,9 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
                     p.setId(projectTask.getId());
                     if(StringUtils.isNotBlank(p.getStaffName())) {
                         addStaffAndDelete( p);
+                        projectTaskMapper.updateStaffName(p.getId());
                     }
-                    if (p.getAdminName()!=null){
+                    if (p.getAdminName()!=null&&!projectTask.getAdminName().equals(p.getAdminName())){
                         SysUser sysUser = userMapper.selectByNikeName(p.getAdminName(),company);
                         if (sysUser == null) {
                             throw new ServiceException(String.format("负责人[%s]不存在", p.getAdminName()));
@@ -179,7 +180,6 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
                         p.setAdminName(sysUser.getNickName());
                     }
                     projectTaskMapper.updateByPrimaryKeySelective(p);
-                    projectTaskMapper.updateStaffName(p.getId());
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、项目: " + projectTask.getName() + " 更新成功");
                 }