修改bug 用户和新闻模块

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsController.java

@@ -84,6 +84,13 @@ public class NewsController {
         ExcelUtils.exportExcelToTarget(response, null, list, NewsExcel.class);
     }
 
+    /***
+     * 下线
+     * @param parmas
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author qushutong
+     * @date 2019/9/29 15:14
+     */
     @PostMapping("modifyOnLine")
     public Result modifyOnLine(@RequestBody Map<String, String> parmas) {
         boolean b = newsService.modifyOnLine(parmas);

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml

@@ -36,7 +36,7 @@
         AND en.NEWS_UP_DOWN_STATE = '0'
         AND en.DEL_FLAG = '0'
         ORDER BY
-            en.NEWS_RELEASE_START_TIME DESC
+            en.NEWS_RELEASE_START_TIME DESC,en.CREATED_TIME DESC
             LIMIT #{pageIndex},#{pageSize}
     </select>
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java

@@ -109,10 +109,11 @@ public class PartyMembersController {
     }
 
     @GetMapping("export")
+    @DataFilter(tableAlias = "pm", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<PartyMembersDTO> list = partyMembersService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, PartyMembersExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "党员管理", list, PartyMembersExcel.class);
     }
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java

@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.controller;
 
+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.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -108,8 +109,17 @@ public class UserController {
     @GetMapping("export")
     public void export( @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<UserDTO> list = userService.list(params);
-
+        String auditState = (String) params.get("auditState");
-        ExcelUtils.exportExcelToTarget(response, null, list, UserExcel.class);
+        // 状态(0-未审核，1-审核通过，2-审核未通过)
+        String fileName = null;
+        if(NumConstant.ZERO_STR.equals(auditState)){
+            fileName="未审核";
+        }else if(NumConstant.ONE_STR.equals(auditState)){
+            fileName="审核通过";
+        }else if(NumConstant.TWO_STR.equals(auditState)){
+            fileName="审核未通过";
+        }
+        ExcelUtils.exportExcelToTarget(response, fileName, list, UserExcel.class);
     }
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java

@@ -30,6 +30,8 @@ import java.util.Date;
  */
 @Data
 public class UserExcel {
+    @Excel(name = "提交时间", format = "yyyy-MM-dd HH:mm:ss")
+    private Date createdTime;
 
     @Excel(name = "真实姓名")
     private String realName;

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java

@@ -78,9 +78,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
 
     @Override
     public List<PartyMembersDTO> list(Map<String, Object> params) {
-        List<PartyMembersEntity> entityList = baseDao.selectList(getWrapper(params));
+        return baseDao.pageDIY(params);
-
-        return ConvertUtils.sourceToTarget(entityList, PartyMembersDTO.class);
     }
 
     private QueryWrapper<PartyMembersEntity> getWrapper(Map<String, Object> params){