hlf 1 سال پیش
والد
کامیت
5b5c64688b

+ 19 - 7
ims-service/ims-eval/src/main/java/com/ims/eval/controller/NoticeManagementController.java

@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -121,17 +122,28 @@ public class NoticeManagementController {
 	/**
 	 * 修改状态
 	 *
-	 * @param id           主键
-	 * @param releaseState 状态(未发布或已发布)
+	 * @param ids          多主键
+	 * @param releaseState 状态(未发布或已发布或草稿
 	 * @return 结果
 	 */
 	@PostMapping(value = "/modifiedState")
-	public R modifiedState(@RequestParam(value = "id") String id,
+	public R modifiedState(@RequestParam(value = "ids") String ids,
 						   @RequestParam(value = "releaseState") String releaseState) {
-		EvaluationNotice evaluationNotice = new EvaluationNotice();
-		evaluationNotice.setId(id);
-		evaluationNotice.setReleaseState(releaseState);
-		boolean b = evaluationNoticeService.updateById(evaluationNotice);
+		boolean b = false;
+		if (ids.length() > 0) {
+			String[] strings = ids.split(",");
+			for (String id : strings) {
+				EvaluationNotice evaluationNotice = new EvaluationNotice();
+				evaluationNotice.setId(id);
+				if ("已发布".equals(releaseState)) {
+					evaluationNotice.setReleaseDate(new Date());
+				} else {
+					evaluationNotice.setReleaseDate(null);
+				}
+				evaluationNotice.setReleaseState(releaseState);
+				b = evaluationNoticeService.updateById(evaluationNotice);
+			}
+		}
 		if (b) {
 			return R.ok().data(b);
 		} else {

+ 1 - 1
ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationNotice.java

@@ -39,7 +39,7 @@ public class EvaluationNotice extends Model {
 	//发布人名称
 	private String releasePeopleName;
 	//发布时间
-	private String releaseDate;
+	private Date releaseDate;
 	//发布状态
 	private String releaseState;
 	//上传附件

+ 1 - 1
ims-service/ims-eval/src/main/resources/mappers/EvaluationNoticeMapper.xml

@@ -54,7 +54,7 @@
                 AND notice_title like CONCAT('%',#{noticeTitle},'%')
             </if>
         </where>
-        order by serial_number asc
+        order by create_time desc, serial_number asc
     </select>
 
 </mapper>