修改分页 修改创建时间倒叙

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersProjectServiceImpl.java

@@ -47,11 +47,12 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
     public TableDataInfo list(SmileVPSParam param) {
         try {
             TableDataInfo rspData = new TableDataInfo();
-            PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//            PageHelper.startPage(param.getPageNum(), param.getPageSize());
             LambdaQueryWrapper<SmileVolunteersProject> wrappers = Wrappers.lambdaQuery(SmileVolunteersProject.class);
             if (param.getTitle() != null && !param.getTitle().equals("")) {
                 wrappers.like(SmileVolunteersProject::getTitle, param.getTitle());
             }
+            wrappers.orderByDesc(SmileVolunteersProject::getCreatedAt);
             List<SmileVolunteersProject> data = volunteersProjectMapper.selectList(wrappers);
             rspData.setCode(0);
             rspData.setRows(data);
@@ -65,6 +66,12 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
 
     @Override
     public AjaxResult insertData(SmileVPParam param) {
+        LambdaQueryWrapper<SmileVolunteersProject> wrappers = Wrappers.lambdaQuery(SmileVolunteersProject.class);
+        wrappers.eq(SmileVolunteersProject::getTitle, param.getTitle());
+        List<SmileVolunteersProject> dataList = volunteersProjectMapper.selectList(wrappers);
+        if (dataList.size() > 0) {
+            AjaxResult.error("活动名称重复");
+        }
         param.setProjectId(IDGenerator.nextTimeId2());
         LocalDateTime now = LocalDateTime.now();
         List<SmileVolunteersTeam> teamList = new ArrayList<>();
@@ -138,8 +145,8 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
         SmileVolunteersProject smileVolunteersProject = SmileVolunteersProject.getNew();
         smileVolunteersProject.setProjectId(source.getProjectId());
         smileVolunteersProject.setTitle(source.getTitle());
-        smileVolunteersProject.setTimeStart(LocalDateTime.parse(source.getTimeStart()+" 00:00:00",DTF_YMD_HMS));
-        smileVolunteersProject.setTimeEnd(LocalDateTime.parse(source.getTimeEnd()+" 00:00:00",DTF_YMD_HMS));
+        smileVolunteersProject.setTimeStart(LocalDateTime.parse(source.getTimeStart() + " 00:00:00", DTF_YMD_HMS));
+        smileVolunteersProject.setTimeEnd(LocalDateTime.parse(source.getTimeEnd() + " 00:00:00", DTF_YMD_HMS));
         smileVolunteersProject.setAddress(source.getAddress());
         smileVolunteersProject.setIntroduce(source.getIntroduce());
         smileVolunteersProject.setImg(source.getImg());

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersTeamServiceImpl.java

@@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -36,11 +37,12 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT
     public TableDataInfo list(SmileVTSParam param) {
         try {
             TableDataInfo rspData = new TableDataInfo();
-            PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//            PageHelper.startPage(param.getPageNum(), param.getPageSize());
             LambdaQueryWrapper<SmileVolunteersTeam> wrappers = Wrappers.lambdaQuery(SmileVolunteersTeam.class);
             if (param.getTitle() != null && !param.getTitle().equals("")) {
                 wrappers.like(SmileVolunteersTeam::getName, param.getTitle());
             }
+            wrappers.orderByDesc(SmileVolunteersTeam::getCreatedAt);
             List<SmileVolunteersTeam> data = volunteersTeamMapper.selectList(wrappers);
             rspData.setCode(0);
             rspData.setRows(data);
@@ -54,6 +56,12 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT
 
     @Override
     public AjaxResult insertData(SmileVolunteersTeam bean) {
+        LambdaQueryWrapper<SmileVolunteersTeam> wrappers = Wrappers.lambdaQuery(SmileVolunteersTeam.class);
+        wrappers.eq(SmileVolunteersTeam::getName, bean.getName());
+        List<SmileVolunteersTeam> dataList = volunteersTeamMapper.selectList(wrappers);
+        if(dataList.size()>0){
+            AjaxResult.error("职责组名称重复");
+        }
         bean.setTeamId(IDGenerator.nextTimeId2());
         int count = volunteersTeamMapper.insert(bean);
         if (count > 0) {
@@ -73,6 +81,7 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT
                 return AjaxResult.error("职责组名称重复不可修改");
             }
         }
+        bean.setUpdatedAt(LocalDateTime.now());
         int count = volunteersTeamMapper.update(bean, Wrappers.lambdaQuery(SmileVolunteersTeam.class).eq(SmileVolunteersTeam::getTeamId, bean.getTeamId()));
         if (count > 0) {
             redisUtils.setTeam(bean.getTeamId(), bean);