项目管理逻辑

src/main/java/com/ydtech/modules/task/dao/TaskProjectMapper.java

@@ -9,6 +9,8 @@ import com.ydtech.modules.task.entity.po.TaskProject;
 import com.ydtech.modules.task.entity.vo.TaskProjectVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author Administrator
  * @description 针对表【task_project】的数据库操作Mapper
@@ -17,6 +19,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface TaskProjectMapper extends BaseMapper<TaskProject> {
 
-    Page<TaskProject> selectProject(Page page, @Param("taskProjectVo") TaskProjectVo taskProjectVo);
+    List<TaskProject> selectProject(@Param("taskProjectVo") TaskProjectVo taskProjectVo);
 
 }

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
 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.dao.TaskProjectMapper;
 import com.ydtech.modules.task.entity.po.TaskProject;
@@ -14,6 +16,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author Administrator
@@ -35,7 +39,7 @@ public class TaskProjectServiceImpl extends ServiceImpl<TaskProjectMapper, TaskP
         tp.setCreator(BaseController.getUser().getId());
         tp.setProjectDesc(taskProject.getProjectDesc());
         tp.setCreateTime(new Date());
-        tp.setProjectStatus(1);
+        tp.setProjectStatus(0);//未指派项目
         save(tp);
         return HttpResult.ok("新增成功");
     }
@@ -48,6 +52,13 @@ public class TaskProjectServiceImpl extends ServiceImpl<TaskProjectMapper, TaskP
 
     @Override
     public HttpResult removeProject(TaskProject taskProject) {
+        if (taskProject.getTaskList().size() > 0) {
+            throw new SystemException("该项目下有任务进行,不可删除");
+        }
+        if (taskProject.getProjectStatus().equals(0) || taskProject.getProjectStatus().equals(3)) {
+            throw new SystemException("该项目状态不可删除");
+        }
+
         removeById(taskProject);
         return HttpResult.ok("删除成功");
     }
@@ -56,9 +67,12 @@ public class TaskProjectServiceImpl extends ServiceImpl<TaskProjectMapper, TaskP
         PageRequest pageRequest = new PageRequest();
         pageRequest.setPageNum(taskProjectVo.getPageNum());
         pageRequest.setPageSize(taskProjectVo.getPageSize());
-        Page page = PageRequest.buildPageRequest(pageRequest);
-        Page<TaskProject> iPage = taskProjectMapper.selectProject(page,taskProjectVo);
-        return iPage;
+        List<TaskProject> taskProjectList = taskProjectMapper.selectProject(taskProjectVo);
+        IPage ipage = PageRequest.buildPageRequest(pageRequest);
+        ipage.setRecords(taskProjectList.stream().skip((taskProjectVo.getPageNum() - 1) * taskProjectVo.getPageSize()).limit(taskProjectVo.getPageSize()).
+                collect(Collectors.toList()));
+        ipage.setTotal(taskProjectList.size());
+        return ipage;
     }
 }
 

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

@@ -107,13 +107,17 @@
         a.bank_number as "bankNumber",
         a.create_time as "createTime",
         a.type as "type",
-        a.creator as "creator"
+        a.creator as "creator",
+        a.bank_number_user_id as "bankNumberUserId"
         from  sys_user_bank_card_history a
         <where>
             1=1
             <if test="sysUserBankCardHistory.bankNumber !=null and  sysUserBankCardHistory.bankNumber  !=''">
                 and a.bank_number =#{sysUserBankCardHistory.bankNumber}
             </if>
+            <if test="sysUserBankCardHistory.bankNumberUserId !=null and  sysUserBankCardHistory.bankNumberUserId  !=''">
+                and a.bank_number_user_id =#{sysUserBankCardHistory.bankNumberUserId}
+            </if>
         </where>
         order by a.create_time asc
     </select>

src/main/resources/mapper/modules/task/TaskProjectMapper.xml

@@ -22,8 +22,6 @@
         <result property="projectId" column="project_id" jdbcType="VARCHAR"/>
         <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
         <result property="taskDesc" column="task_desc" jdbcType="VARCHAR"/>
-        <result property="taskStartTime" column="task_start_time" jdbcType="TIMESTAMP"/>
-        <result property="taskEmdTo" column="task_end_time" jdbcType="TIMESTAMP"/>
         <result property="taskStatus" column="task_status" jdbcType="VARCHAR"/>
         <result property="taskFirst" column="task_first" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>