志愿者 - banner管理，页面重构，及志愿者排行定时任务，查询字段修改

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java

@@ -14,6 +14,7 @@ public interface NumConstant {
     int TWO = 2;
     int THREE = 3;
     int FOUR = 4;
+    int FIVE = 5;
     int SIX = 6;
 
     int ONE_NEG = -1;

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java

@@ -98,5 +98,8 @@ public class ActBannerDTO implements Serializable {
      */
     private Date createdTime;
 
-
+    /**
-}
+     * banner排序
+     */
+    private String sort;
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java

@@ -46,7 +46,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("actbanner")
 public class ActBannerController {
-    
+
     @Autowired
     private ActBannerService actBannerService;
 
@@ -78,8 +78,7 @@ public class ActBannerController {
     public Result save(@RequestBody ActBannerDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        actBannerService.save(dto);
+        return actBannerService.save(dto);
-        return new Result();
     }
 
     @PutMapping
@@ -104,4 +103,4 @@ public class ActBannerController {
         ExcelUtils.exportExcelToTarget(response, null, list, ActBannerExcel.class);
     }
 
-}
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java

@@ -67,12 +67,22 @@ public interface ActBannerDao extends BaseDao<ActBannerEntity> {
      */
     void updateBannerByActId(String actId);
 
-    /** 
+    /**
-     * @Description: 手机端banner查询，根据创建时间 正序排列 
+     * @Description: 手机端banner查询，根据创建时间 正序排列
-     * @Param: [params] 
+     * @Param: [params]
-     * @return: java.util.List<com.elink.esua.epdc.modules.activity.entity.ActBannerEntity> 
+     * @return: java.util.List<com.elink.esua.epdc.modules.activity.entity.ActBannerEntity>
-     * @Author: zy 
+     * @Author: zy
-     * @Date: 2020-02-08 
+     * @Date: 2020-02-08
-     */ 
+     */
     List<ActBannerDTO> getAppActBannerlist(Map<String, Object> params);
-}
+
+    /**
+     * 获取已经上架的banner数量
+     *
+     * @param
+     * @return int
+     * @Author zhangyong
+     * @Date 16:47 2020-05-25
+     **/
+    int getBannerStatusNumber();
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java

@@ -87,4 +87,8 @@ public class ActBannerEntity extends BaseEpdcEntity {
      */
 	private Long deptId;
 
-}
+	/**
+	 * banner排序
+	 */
+	private String sort;
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java

@@ -77,7 +77,7 @@ public interface ActBannerService extends BaseService<ActBannerEntity> {
      * @author generator
      * @date 2019-12-19
      */
-    void save(ActBannerDTO dto);
+    Result save(ActBannerDTO dto);
 
     /**
      * 默认更新
@@ -130,4 +130,4 @@ public interface ActBannerService extends BaseService<ActBannerEntity> {
      * @since 2020/2/6 21:22
      */
     void takeOffBannerByActId(String actId);
-}
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -101,10 +102,13 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
         updateEntity.setStatusTime(new Date());
         // 上架
         if (ActStateConstant.ACT_BANNER_STATUS_UNDERCARRIAGE.equals(entity.getStatus())) {
-            // 上架前banner表处理
+            // 上架的banner数量不能超过5条
-            this.takeOffOtherBanners();
+            if (NumConstant.FIVE > baseDao.getBannerStatusNumber()) {
-            updateEntity.setStatus(ActStateConstant.ACT_BANNER_STATUS_GROUNDING);
+                updateEntity.setStatus(ActStateConstant.ACT_BANNER_STATUS_GROUNDING);
-            updateById(updateEntity);
+                updateById(updateEntity);
+            } else {
+                return new Result().error("Banner上架数量不能超过5条");
+            }
         // 下架
         } else if (ActStateConstant.ACT_BANNER_STATUS_GROUNDING.equals(entity.getStatus())) {
             updateEntity.setStatus(ActStateConstant.ACT_BANNER_STATUS_UNDERCARRIAGE);
@@ -115,9 +119,15 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(ActBannerDTO dto) {
+    public Result save(ActBannerDTO dto) {
         ActBannerEntity entity = ConvertUtils.sourceToTarget(dto, ActBannerEntity.class);
-        insert(entity);
+        // 上架的banner数量不能超过5条
+        if (NumConstant.FIVE > baseDao.getBannerStatusNumber()) {
+            insert(entity);
+        } else {
+            return new Result().error("Banner上架数量不能超过5条");
+        }
+        return new Result();
     }
 
     @Override

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml

@@ -21,6 +21,7 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="sort" column="SORT"/>
     </resultMap>
     <select id="getActBannerlist" resultMap="actBannerMap">
         SELECT
@@ -40,19 +41,19 @@
         banner.CREATED_BY,
         banner.CREATED_TIME,
         banner.UPDATED_BY,
-        banner.UPDATED_TIME
+        banner.UPDATED_TIME,
+        banner.SORT
         FROM
         epdc_act_banner banner
         WHERE
         banner.DEL_FLAG = '0'
-        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            AND DATE_FORMAT( banner.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
-        </if>
         <if test="status != null and status != ''">
             AND banner.STATUS = #{status}
         </if>
         ORDER BY
-        banner.CREATED_TIME DESC
+        banner.`STATUS` DESC,
+        banner.SORT,
+        banner.STATUS_TIME DESC
     </select>
 
     <select id="getBannerInfo" resultType="com.elink.esua.epdc.activity.ActBannerDTO">
@@ -109,4 +110,12 @@
         ORDER BY
         banner.CREATED_TIME DESC
     </select>
-</mapper>
+
+    <select id="getBannerStatusNumber" resultType="int">
+        SELECT
+          COUNT(1)
+        FROM epdc_act_banner b
+        WHERE b.DEL_FLAG = 0
+        AND b.`STATUS` = 1
+    </select>
+</mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -178,8 +178,8 @@
                 DATE_FORMAT(NOW(),'%Y-%m-%d') generate_date,
                 vi.ID volunteer_id,
                 vi.USER_ID,
-                eu.FACE_IMG,
+                vi.VOLUNTEER_FACE_IMG as FACE_IMG,
-                eu.NICKNAME,
+                vi.VOLUNTEER_NICKNAME as NICKNAME,
                 eu.PARTY_FLAG,
                 vi.KINDNESS_TIME,
                 vi.PARTICIPATION_NUM