--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/workmanagement/WorkmanagementController.java

@@ -154,13 +154,6 @@ public class WorkmanagementController {
 			example.createCriteria().andEqualTo("workWorkId", workManagementWork.getId()).andEqualTo("imgtype","1");
 			List<WorkManagementImg> img = workManagementImgService.selectByExample(example);
 			List<WorkImgVo> imgvoList = new ArrayList<WorkImgVo>();
-			for (WorkManagementImg imgs : img) {
-				WorkImgVo imgvo = new WorkImgVo();
-				imgvo.setUrl(imgs.getCover());
-				imgvoList.add(imgvo);
-			}
-			//赋值缩略图
-			workvo.setSimg(imgvoList);
 			
 			example = workManagementImgService.createExample();
 			example.createCriteria().andEqualTo("workWorkId", workManagementWork.getId()).andEqualTo("imgtype","2");

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/workmanagement/WorkManagementMapper.java

@@ -34,7 +34,7 @@ public interface WorkManagementMapper extends BaseMapper<WorkManagement>{
 	@Select("<script>"
 		    + " select DISTINCT be.id,( select GROUP_CONCAT(typename) from res_diy_type a where a.code in (select db.code from  res_work_management_diy_type db where be.id = db.workId)) diyType,name,company,phone,case when companytype = 1 then '单项作品' else '系列作品' end companytype,"
 		    + " serieschinesename,workstatus,case when workstatus = 1 then '上线' else '下线' end status_zh,"
-		    + " (select cover from res_work_management_img b where imgtype ='1' and b.workWorkId = (select id from res_work_management_work a where a.workId = be.id and imgsort = 1 ) LIMIT 1) cover   "
+		    + " (select cover from res_work_management_img b where imgtype ='2' and b.workWorkId = (select id from res_work_management_work a where a.workId = be.id and imgsort = 1 ) LIMIT 1) cover   "
 		    + " from res_work_management be LEFT JOIN res_work_management_diy_type bdt ON be.id = bdt.workId  "
 		    + " where 1=1"
 		    + "<if test='"+ NOTBLANK +"(form.text)' >"  
@@ -58,10 +58,16 @@ public interface WorkManagementMapper extends BaseMapper<WorkManagement>{
 		    + " and workstatus = #{form.workstatus} "
 			+ "</if>" 
 			+ "<if test='form.diyTypeCode != null and form.diyTypeCode.size > 0'>"  
-			+ "and bdt.code  in "
-			+ " <foreach collection=\"form.diyTypeCode\" index=\"index\" item=\"diyTypeCode\" open=\"(\" separator=\",\" close=\")\">" 
-			+ "#{diyTypeCode}" 
-			+ "</foreach>" 
+			
+			+ " <foreach collection=\"form.diyTypeCode\" index=\"index\" item=\"diyTypeCode\" >" 
+			+ "<if test='index==0' >" 
+			+ "and (bdt.code  like concat (#{diyTypeCode},'%')   " 
+			+ "</if>"
+			+ "<if test='index!=0' >" 
+			+ "or bdt.code  like  concat (#{diyTypeCode},'%')" 
+			+ "</if>"
+			+ "</foreach>"
+			+ ")"
 			+ "</if>" 
 		    + " ORDER BY uploadTime desc"
 			+ "</script>")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/workmanagement/WorkManagementServiceImpl.java

@@ -149,17 +149,8 @@ public class WorkManagementServiceImpl extends BaseServiceImpl<WorkManagement, S
 					int j = i;
 					workManagementWork.setImgsort(j + 1);
 					workManagementWorkService.insert(workManagementWork);
-					// 缩略图
-					List<WorkImgVo> ListImg = form.getWorkAbbImageList().get(i).getSimg();
-					for (WorkImgVo img : ListImg) {
-						WorkManagementImg workManagementImg = new WorkManagementImg();
-						workManagementImg.setCover(img.getUrl());
-						workManagementImg.setWorkWorkId(workManagementWork.getId());
-						workManagementImg.setImgtype(1);
-						workManagementImgService.insert(workManagementImg);
-					}
 					// 正常图
-					ListImg = form.getWorkAbbImageList().get(i).getImg();
+					List<WorkImgVo> ListImg= form.getWorkAbbImageList().get(i).getImg();
 					for (WorkImgVo img : ListImg) {
 						WorkManagementImg workManagementImg = new WorkManagementImg();
 						workManagementImg.setCover(img.getUrl());
@@ -187,17 +178,8 @@ public class WorkManagementServiceImpl extends BaseServiceImpl<WorkManagement, S
 					workManagementWork.setImgsort(i + 1);
 					workManagementWorkService.insert(workManagementWork);
 
-					// 缩略图
-					List<WorkImgVo> ListImg = form.getWorkImageList().get(i).getSimg();
-					for (WorkImgVo img : ListImg) {
-						WorkManagementImg workManagementImg = new WorkManagementImg();
-						workManagementImg.setCover(img.getUrl());
-						workManagementImg.setWorkWorkId(workManagementWork.getId());
-						workManagementImg.setImgtype(1);
-						workManagementImgService.insert(workManagementImg);
-					}
-					// 正常图
-					ListImg = form.getWorkImageList().get(i).getImg();
+					//正常图
+					List<WorkImgVo> ListImg = form.getWorkImageList().get(i).getImg();
 					for (WorkImgVo img : ListImg) {
 						WorkManagementImg workManagementImg = new WorkManagementImg();
 						workManagementImg.setCover(img.getUrl());

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/workmanagement/FgWorkManagementMapper.java

@@ -34,7 +34,7 @@ public interface FgWorkManagementMapper extends BaseMapper<WorkManagement>{
 	@Select("<script>"
 		    + " select DISTINCT be.id,name,companytype,"
 		    + " serieschinesename,"
-		    + " (select cover from res_work_management_img b where imgtype ='1' and b.workWorkId = (select id from res_work_management_work a where a.workId = be.id and imgsort = 1 ) LIMIT 1) cover   "
+		    + " (select cover from res_work_management_img b where imgtype ='2' and b.workWorkId = (select id from res_work_management_work a where a.workId = be.id and imgsort = 1 ) LIMIT 1) cover   "
 		    + " from res_work_management be LEFT JOIN res_work_management_diy_type bdt ON be.id = bdt.workId  "
 		    + " where 1=1   and be.workStatus = 1"