--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ebook/EbookMainBodyRelation.java

@@ -22,4 +22,7 @@ public class EbookMainBodyRelation {
 	private String objectId;
 	@ApiModelProperty("年份id")
 	private String yearId;
+	@ApiModelProperty("年份")
+	private String year;
+	
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebook/EbookMainBodyController.java

@@ -17,6 +17,7 @@ import com.zrqx.core.form.resource.bg.ebook.QueryEbookMainBodyForm;
 import com.zrqx.core.form.resource.bg.ebook.SaveUpdateEbookMainBodyForm;
 import com.zrqx.core.form.resource.bg.ebook.UpdateEbookMainBodyForm;
 import com.zrqx.core.model.resource.ebook.EbookMainBody;
+import com.zrqx.core.model.resource.ebook.EbookMainBodyRelation;
 import com.zrqx.core.model.resource.year.PeriodsLibrary;
 import com.zrqx.core.model.resource.year.YearLibrary;
 import com.zrqx.core.util.bean.BeanUtils;
@@ -26,6 +27,7 @@ import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.ebook.EbookMainBodyListVO;
 import com.zrqx.core.vo.resource.ebook.EbookMainBodyVO;
 import com.zrqx.core.vo.resource.year.EbookYearListVO;
+import com.zrqx.resource.bg.service.ebook.EbookMainBodyRelationService;
 import com.zrqx.resource.bg.service.ebook.EbookMainBodyService;
 import com.zrqx.resource.bg.service.year.PeriodsLibraryService;
 import com.zrqx.resource.bg.service.year.YearLibraryService;
@@ -43,6 +45,8 @@ public class EbookMainBodyController {
 	private YearLibraryService yearLibraryService;
 	@Autowired
 	private PeriodsLibraryService periodsLibraryService;
+	@Autowired
+	private EbookMainBodyRelationService ebookMainBodyRelationService;
 	
 	
 	@ApiOperation("保存杂志主体")
@@ -67,6 +71,12 @@ public class EbookMainBodyController {
 		Example example = new Example(EbookMainBody.class);
 		example.createCriteria().andIn("id", ids);
 		ebookMainBodyService.deleteByExample(example);
+		//删除当前对象与年份的关系
+		for (String str : ids) {
+			EbookMainBodyRelation relation = new  EbookMainBodyRelation();
+			relation.setObjectId(str);
+			ebookMainBodyRelationService.delete(relation);
+		}
 		return CallBack.success();
 	}
 
@@ -80,7 +90,16 @@ public class EbookMainBodyController {
 	public CallBack<EbookMainBodyVO> echo(@PathVariable String oid) {
 		EbookMainBodyVO vo = new EbookMainBodyVO();
 		EbookMainBody body = ebookMainBodyService.selectByPrimaryKey(oid);
+		/*Example example = new Example(EbookMainBodyRelation.class);
+		example.createCriteria().andEqualTo("objectId", oid);
+		List<EbookMainBodyRelation> relation = ebookMainBodyRelationService.selectByExample(example);*/
+		String[] split = body.getPeriodsNumber().split(",");
+		for (String str : split) {
+			YearLibrary yearLibrary = yearLibraryService.selectByPrimaryKey(str);
+			vo.setPeriodsNumber(yearLibrary.getName());
+		}
 		BeanUtils.copyProperties(body, vo);
+		
 		return CallBack.success(vo);
 	}
 	@ApiOperation(value = "批量修改状态", notes = "批量修改状态")