--no commit message

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

@@ -30,9 +30,34 @@ public interface WorkManagementMapper extends BaseMapper<WorkManagement>{
 	 * @date 2020年7月15日 下午2:33:32
 	 */
 	@Select("<script>"
-		    + " "
+		    + " select name,company,phone,case when companytype = 1 then '单项作品' else '系列作品' end companytype,"
+		    + " serieschinesename,workstatus,case when workstatus = 1 then '已上架' else '已下架' end status_zh  "
+		    + " from res_work_management be LEFT JOIN res_work_management_diy_type bdt ON be.id = bdt.workId  "
+		    + " where 1=1"
+			+ "<if test='form.type==1'>"
+			+ " AND name like concat( #{form.text},'%') "
+			+ "</if>"
+			+ "<if test='form.type==2'>"
+			+ " AND name like concat( #{form.text},'%') "
+			+ "</if>"
+			+ "<if test='form.type==3'>"
+			+ " AND company  like concat(#{form.text},'%') "
+			+ "</if>"
+			+ "<if test='form.type==4'>"
+			+ " AND phone like concat(#{form.text},'%') "
+			+ "</if>"
+			+ "<if test='"+ NOTBLANK +"(form.companytype)' >"  
+		    + " and companytype = #{form.companytype} "
+			+ "</if>" 
+			+ "<if test='"+ NOTBLANK +"(form.workstatus)' >"  
+		    + " and workstatus = #{form.workstatus} "
+			+ "</if>" 
+			+ "<if test='"+ NOTBLANK +"(form.diyTypeCode)' >"  
+		    + " and bdt.code like concat(#{form.diyTypeCode},'%') "
+			+ "</if>" 
+		    + " ORDER BY uploadTime desc"
 			+ "</script>")
-	List<WorkmanagementListVo> page(WorkmanagementForm form);
+	List<WorkmanagementListVo> page(@Param("form")WorkmanagementForm form);
 	@Select("<script>"
 			+ "SELECT "
 			+ " bb.id,bb.name,bb.author,bb.isbn, "