账户余额查询不能用姓名查问题

src/main/java/com/ydtech/modules/admin/model/vo/SysUserAccountVo.java

@@ -69,7 +69,9 @@ public class SysUserAccountVo {
 
 
     @ApiModelProperty(value = "用户姓名")
-    private String  userName;
+    private String userName;
+
+    private String name;
 
     @ApiModelProperty(value = "部门id")
     private String  deptId;

src/main/java/com/ydtech/modules/task/controller/TaskController.java

@@ -51,30 +51,6 @@ public class TaskController extends BaseController {
     @Autowired
     SysUserLinkDeptInternalAgentService sysUserLinkDeptInternalAgentService;
 
-    @ApiOperation("新增任务项目")
-    @PostMapping("/addProject")
-    public HttpResult addProject(@RequestBody TaskProject taskProject){
-        return taskProjectService.addProject(taskProject);
-    }
-
-    @ApiOperation("修改任务项目")
-    @PostMapping("/updateProject")
-    public HttpResult updateProject(@RequestBody TaskProject taskProject){
-        return taskProjectService.updateProject(taskProject);
-    }
-
-    @ApiOperation("删除任务项目")
-    @PostMapping("/removeProject")
-    public HttpResult removeProject(@RequestBody TaskProject taskProject){
-        return taskProjectService.removeProject(taskProject);
-    }
-
-    @ApiOperation("查询任务项目列表")
-    @PostMapping("/selectProject")
-    public HttpResult selectProject(@RequestBody TaskProjectVo taskProjectVo){
-        return HttpResult.ok("",taskProjectService.selectProject(taskProjectVo));
-    }
-
 
     @GetMapping("/getBackLineUser")
     @ApiOperation("获取后线用户")

src/main/java/com/ydtech/modules/task/controller/TaskProjectController.java

@@ -39,8 +39,8 @@ public class TaskProjectController extends BaseController {
 
     @ApiOperation("新增任务项目")
     @PostMapping("/addProject")
-    public HttpResult addProject(@RequestBody TaskProject taskProject){
-        return taskProjectService.addProject(taskProject);
+    public HttpResult addProject(@RequestBody TaskProjectVo taskProjectVo){
+        return taskProjectService.addProject(taskProjectVo);
     }
 
     @ApiOperation("修改任务项目")
@@ -51,8 +51,8 @@ public class TaskProjectController extends BaseController {
 
     @ApiOperation("删除任务项目")
     @PostMapping("/removeProject")
-    public HttpResult removeProject(@RequestBody TaskProject taskProject){
-        return taskProjectService.removeProject(taskProject);
+    public HttpResult removeProject(@RequestBody TaskProjectVo taskProjectVo){
+        return taskProjectService.removeProject(taskProjectVo);
     }
 
     @ApiOperation("查询任务项目列表")

src/main/java/com/ydtech/modules/task/service/TaskProjectService.java

@@ -10,11 +10,11 @@ import com.ydtech.modules.task.entity.po.TaskProject;
 import com.ydtech.modules.task.entity.po.TaskTask;
 
 public interface TaskProjectService extends IService<TaskProject> {
-    HttpResult addProject(TaskProject taskProject);
+    HttpResult addProject(TaskProjectVo taskProjectVo);
 
     HttpResult updateProject(TaskProject taskProject);
 
-    HttpResult removeProject(TaskProject taskProject);
+    HttpResult removeProject(TaskProjectVo taskProjectVo);
 
     IPage<TaskProject> selectProject(TaskProjectVo taskProjectVo);
 }

src/main/java/com/ydtech/modules/task/service/impl/TaskProjectServiceImpl.java

@@ -8,8 +8,10 @@ import com.ydtech.core.page.PageRequest;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.task.constants.ProjectStatus;
 import com.ydtech.modules.task.dao.TaskProjectMapper;
 import com.ydtech.modules.task.entity.po.TaskProject;
+import com.ydtech.modules.task.entity.po.TaskTask;
 import com.ydtech.modules.task.entity.vo.TaskProjectVo;
 import com.ydtech.modules.task.service.TaskProjectService;
 import org.springframework.stereotype.Service;
@@ -21,7 +23,7 @@ import java.util.stream.Collectors;
 
 /**
  * @author Administrator
- * @description 针对表【task_file】的数据库操作Service实现
+ * @description 针对表【task_project】的数据库操作Service实现
  * @createDate 2023-03-09 14:45:58
  */
 @Service
@@ -32,15 +34,15 @@ public class TaskProjectServiceImpl extends ServiceImpl<TaskProjectMapper, TaskP
     private TaskProjectMapper taskProjectMapper;
 
     @Override
-    public HttpResult addProject(TaskProject taskProject) {
-        TaskProject tp = new TaskProject();
-        tp.setProjectName(taskProject.getProjectName());
-        tp.setProjectType(taskProject.getProjectType());
-        tp.setCreator(BaseController.getUser().getId());
-        tp.setProjectDesc(taskProject.getProjectDesc());
-        tp.setCreateTime(new Date());
-        tp.setProjectStatus(0);//未指派项目
-        save(tp);
+    public HttpResult addProject(TaskProjectVo taskProjectVo) {
+        TaskProject taskProject = new TaskProject();
+        taskProject.setProjectName(taskProjectVo.getProjectName());
+        taskProject.setProjectType(taskProjectVo.getProjectType());
+        taskProject.setCreator(BaseController.getUser().getId());
+        taskProject.setProjectDesc(taskProjectVo.getProjectDesc());
+        taskProject.setCreateTime(new Date());
+        taskProject.setProjectStatus(0);//未指派项目
+        save(taskProject);
         return HttpResult.ok("新增成功");
     }
 
@@ -51,11 +53,16 @@ public class TaskProjectServiceImpl extends ServiceImpl<TaskProjectMapper, TaskP
     }
 
     @Override
-    public HttpResult removeProject(TaskProject taskProject) {
-        if (taskProject.getTaskList().size() > 0) {
+    public HttpResult removeProject(TaskProjectVo taskProjectVo) {
+        TaskProject taskProject = getById(taskProjectVo.getId());
+        if (taskProject == null) {
+            throw new SystemException("找不到项目");
+        }
+        List<TaskTask> taskList = taskProject.getTaskList();
+        if (taskList != null && !taskList.isEmpty()) {
             throw new SystemException("该项目下有任务进行,不可删除");
         }
-        if (taskProject.getProjectStatus().equals(0) || taskProject.getProjectStatus().equals(3)) {
+        if (taskProject.getProjectStatus() != ProjectStatus.STATUS_0.getCode()) {
             throw new SystemException("该项目状态不可删除");
         }
 

src/main/resources/mapper/modules/admin/SysUserAccountMapper.xml

@@ -143,6 +143,9 @@
             <if test="sysUserAccountVo.userId != null and sysUserAccountVo.userId != ''">
                 and a.user_id = #{sysUserAccountVo.userId}
             </if>
+            <if test="sysUserAccountVo.name != null and sysUserAccountVo.name != ''">
+                and b.name = #{sysUserAccountVo.name}
+            </if>
             <if test="sysUserAccountVo.deptId != null and sysUserAccountVo.deptId != ''">
                 and b.dept_id like concat(#{sysUserAccountVo.deptId}, '%')
             </if>