Merge remote-tracking branch 'origin/master'

# Conflicts:
#	whepi-web/src/main/java/com/bofeng/wx/controller/ShopMatController.java
#	whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

whepi-web/src/main/java/com/bofeng/dao/QzTaskDao.java

@@ -20,7 +20,7 @@ public interface QzTaskDao extends BaseMapper<QzTask> {
 
   Integer updateStatusById(@Param("taskId") Long taskId, @Param("status") Integer status);
 
-  List<QzTask> queryQzTask(@Param("taskStatus")Integer taskStatus);
+  List<QzTask> queryQzTaskByStatus(@Param("taskStatus")Integer taskStatus);
   List<QzTask> queryQzTask(@Param("taskStatus") Integer taskStatus, @Param("taskTitle") String taskTitle,@Param("userId")Long userId);
 
   //当前用户名称

whepi-web/src/main/java/com/bofeng/service/QzTaskService.java

@@ -54,6 +54,9 @@ public class QzTaskService {
     return 1;
   }
 
+  public List<QzTask> queryQzTaskByStatus(Integer taskStatus) {
+    return qzTaskDao.queryQzTaskByStatus(taskStatus);
+  }
 
   public List<QzTask> queryQzTask(Integer taskStatus, String taskTitle, Long userId) {
     return qzTaskDao.queryQzTask(taskStatus, taskTitle, userId);

whepi-web/src/main/resources/mapper/QzTaskDao.xml

@@ -17,6 +17,10 @@
     update qz_task set task_status=#{status} where task_id=#{taskId}
   </update>
 
+    <select id="queryQzTaskByStatus" resultType="com.bofeng.entity.QzTask">
+        select * from qz_task where task_status=#{taskStatus}
+    </select>
+
     <select id="queryQzTask" resultType="com.bofeng.entity.QzTask">
         select * from qz_task
         <where>