1.新闻消息发布后台功能

2.志愿者任务置顶功能

common/src/main/java/com/jpsoft/employment/modules/base/entity/NewsInfo.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+
+import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -49,5 +51,14 @@ public class NewsInfo {
 	
 			@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+
+
+	@Transient
+	@ApiModelProperty(value = "创建人名称")
+	private String createByN;
+
+	@Transient
+	@ApiModelProperty(value = "类型翻译")
+	private String typeN;
 	
 		}

common/src/main/resources/mapper/base/NewsInfo.xml

@@ -89,8 +89,12 @@
 			select * from base_news_info
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			del_flag = false
+			<if test="searchParams.title != null">
+				and title_ like #{searchParams.title}
+			</if>
+			<if test="searchParams.type != null">
+				and type_ = #{searchParams.type}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

web/src/main/java/com/jpsoft/employment/modules/base/controller/NewsInfoController.java

@@ -6,6 +6,9 @@ import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.base.entity.NewsInfo;
 import com.jpsoft.employment.modules.base.service.NewsInfoService;
+import com.jpsoft.employment.modules.sys.entity.User;
+import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
+import com.jpsoft.employment.modules.sys.service.UserService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -18,13 +21,18 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/newsInfo")
+@RequestMapping("/base/newsInfo")
 public class NewsInfoController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
     private NewsInfoService newsInfoService;
-	
+
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
+    @Autowired
+    private UserService userService;
 	
 	@ApiOperation(value="创建空记录")
     @GetMapping("create")
@@ -195,7 +203,7 @@ public class NewsInfoController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String title,String type,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -209,19 +217,65 @@ public class NewsInfoController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(title)) {
+            searchParams.put("title","%" + title + "%");
         }
 
+        if (StringUtils.isNotEmpty(type)) {
+            searchParams.put("type",type);
+        }
 
         Page<NewsInfo> page = newsInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
+        for (NewsInfo newsInfo:page) {
+            String typeN = dataDictionaryService.findNameByCatalogNameAndValue("新闻类型", newsInfo.getType());
+            if (StringUtils.isNotEmpty(typeN)) {
+                newsInfo.setTypeN(typeN);
+            }
+
+            User user = userService.get(newsInfo.getCreateBy());
+            if(user!=null){
+                newsInfo.setCreateByN(user.getRealName());
+            }
+        }
+
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
 
         return msgResult;
     }
+
+
+    @ApiOperation(value="更改状态")
+    @PostMapping("changeStatus")
+    public MessageResult<NewsInfo> changeStatus(String id,boolean status,@RequestAttribute String subject){
+        MessageResult<NewsInfo> msgResult = new MessageResult<>();
+
+        try {
+            NewsInfo newsInfo = newsInfoService.get(id);
+            newsInfo.setIsTop(status);
+            newsInfo.setUpdateBy(subject);
+            newsInfo.setUpdateTime(new Date());
+
+            int affectCount = newsInfoService.update(newsInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库修改失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

web/src/main/java/com/jpsoft/employment/modules/base/controller/NewsRegUserController.java

@@ -18,7 +18,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/newsRegUser")
+@RequestMapping("/base/newsRegUser")
 public class NewsRegUserController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

web/src/main/java/com/jpsoft/employment/modules/base/controller/VolunteerTasksController.java

@@ -50,6 +50,9 @@ public class VolunteerTasksController {
             volunteerTasks.setCreateBy(subject);
             volunteerTasks.setCreateTime(new Date());
             volunteerTasks.setIsShelves(true);//默认上架
+            if(volunteerTasks.getIsTop()==null){
+                volunteerTasks.setIsTop(false);
+            }
 
             int affectCount = volunteerTasksService.insert(volunteerTasks);
 
@@ -256,4 +259,35 @@ public class VolunteerTasksController {
 
         return msgResult;
     }
+
+
+    @ApiOperation(value="更改置顶状态")
+    @PostMapping("changeIsTop")
+    public MessageResult<VolunteerTasks> changeIsTop(String id,boolean isTop,@RequestAttribute String subject){
+        MessageResult<VolunteerTasks> msgResult = new MessageResult<>();
+
+        try {
+            VolunteerTasks volunteerTasks = volunteerTasksService.get(id);
+            volunteerTasks.setIsTop(isTop);
+            volunteerTasks.setUpdateBy(subject);
+            volunteerTasks.setUpdateTime(new Date());
+
+            int affectCount = volunteerTasksService.update(volunteerTasks);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库修改失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }