业委会求助合并代码

whepi-ui/templates/yeweihui/home.ftl

@@ -42,6 +42,8 @@
     var taskList = ${taskList!'[]'};
 var statisticsOrderList =${rbList!'[]'};
 (function ($) {
+
+
     $(function(){
         $('.weui-navbar__item').on('click', function () {
             $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');

whepi-ui/templates/yeweihui/qiuzhu.js

@@ -65,7 +65,9 @@ function makeUI(tasks) {
   let tasks3 = [];
 
   for (let i = 0; i < tasks.length; i++) {
+
     let task = tasks[i];
+
     if (task.taskStatus == 1) {
       tasks1.push(task);
     }

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

@@ -12,11 +12,13 @@ import java.util.List;
 @Repository
 public interface QzTaskDao extends BaseMapper<QzTask> {
 
-    List<QzTask> selectAll();
+  List<QzTask> selectAll();
 
     QzTask queryByTaskId(Long taskId);
 
     List<QzTask> queryByHouseNumber(@Param("houseNumber") String houseNumber, @Param("status") Integer status);
 
     Integer updateStatusById(@Param("taskId") Long taskId, @Param("status") Integer status);
+
+    List<QzTask> queryQzTask();
 }

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

@@ -5,8 +5,12 @@ import com.bofeng.entity.QzTaskReply;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface QzTaskReplyDao extends BaseMapper<QzTaskReply> {
 
+  List<QzTaskReply> taskQuery();
+
 }

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

@@ -9,6 +9,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Service
 @Transactional(readOnly = true)
 public class QzTaskReplyService {
@@ -19,6 +21,11 @@ public class QzTaskReplyService {
     @Autowired
     private QzTaskDao qzTaskDao;
 
+    public List<QzTaskReply> taskQuery() {
+        return qzTaskReplyDao.taskQuery();
+
+    }
+
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Integer insertQzTaskReply(QzTaskReply qzTaskReply) {
 
@@ -28,4 +35,5 @@ public class QzTaskReplyService {
 
         return qzTaskReplyDao.insert(qzTaskReply);
     }
+
 }

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

@@ -1,7 +1,10 @@
 package com.bofeng.service;
 
+import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.bofeng.dao.QzTaskDao;
 import com.bofeng.entity.QzTask;
+import lombok.var;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,4 +29,28 @@ public class QzTaskService {
     public QzTask queryByTaskId (Long taskId) {
         return qzTaskDao.queryByTaskId(taskId);
     }
+
+  //求助的新增
+  public int addHelp(String taskTitle,String taskTarget,String remark) {
+    var qzTak=new QzTask();
+    qzTak.setTaskId(IdWorker.getId());
+    qzTak.setTaskTitle(taskTitle);
+    qzTak.setRemark(remark);
+    qzTak.setTaskTarget(taskTarget);
+    qzTak.setTaskStatus(1);
+
+    /*long userId = Long.parseLong(JwtHelper.getUserId());
+    qzTak.setUserId(userId);
+    qzTak.setUserCreate(userId);*/
+    qzTak.setTimeCreate(new DateTime());
+   /* qzTak.setUserUpdate(userId);*/
+    qzTak.setTimeUpdate(new DateTime());
+    return qzTaskDao.insert(qzTak);
+  }
+
+
+
+  public List<QzTask> queryQzTask(){
+    return qzTaskDao.queryQzTask();
+  }
 }

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -42,8 +42,9 @@ public class YeWeiHuiController {
         queryParam.put("statistics", "M");
 
         List<QzTask> taskList = qzTaskService.selectAll();
-
+        List<SysUptownHouse> rbList = rbService.selectAll();
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
+        model.put("rbList", YvanUtil.toJsonPretty(rbList));
 
         return new ModelAndView("/yeweihui/home.ftl", model);
     }

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bofeng.dao.QzTaskDao">
-  <select id="selectAll" resultType="com.bofeng.entity.QzTask">
+    <select id="selectAll" resultType="com.bofeng.entity.QzTask">
     select * from qz_task
   </select>
 
@@ -17,4 +17,8 @@
     update qz_task set task_status=#{status} where task_id=#{taskId}
   </update>
 
+    <select id="queryQzTask" resultType="com.bofeng.entity.QzTask">
+    select * from qz_task order by time_update desc
+    </select>
+
 </mapper>