From 81d156ce6ea9933fa12375b797e43dadf17576ea Mon Sep 17 00:00:00 2001
From: Administrator <2695469943@qq.com>
Date: Thu, 16 Aug 2018 10:37:20 +0800
Subject: [PATCH] =?UTF-8?q?2018/8/16=20zls=20=E4=BF=AE=E6=94=B9=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pro/bus/controller/PlanController.java    |  6 ++-
 .../java/com/pro/bus/mapper/PlanMapper.java   |  3 +-
 .../java/com/pro/bus/service/PlanService.java |  2 +-
 .../pro/bus/service/impl/PlanServiceImpl.java |  4 +-
 src/main/resources/mapper/bus/PlanMapper.xml  | 53 +++++++++----------
 src/main/web/WEB-INF/views/bus/plan.jsp       |  2 +-
 6 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/pro/bus/controller/PlanController.java b/src/main/java/com/pro/bus/controller/PlanController.java
index 5961d66..e2bd52e 100644
--- a/src/main/java/com/pro/bus/controller/PlanController.java
+++ b/src/main/java/com/pro/bus/controller/PlanController.java
@@ -147,7 +147,11 @@ return Result.successResult("删除成功");
     @RequestMapping(value = "/plan/status/{plan_status}")
     @ResponseBody
     public Result updatePlanStatus(@RequestBody Integer[] plan_ids,@PathVariable Integer plan_status){
-planService.updatePlanStatus(plan_ids,plan_status);
+//        Plan plan = new Plan();
+//        plan.setPlan_person(((User)(SecurityUtils.getSubject().getPrincipal())).getU_name());
+        String plan_person = ((User)SecurityUtils.getSubject().getPrincipal()).getU_name();
+
+        planService.updatePlanStatus(plan_ids,plan_status,plan_person);
 return Result.successResult("修改成功");
     }
 
diff --git a/src/main/java/com/pro/bus/mapper/PlanMapper.java b/src/main/java/com/pro/bus/mapper/PlanMapper.java
index 47989db..c3044b8 100644
--- a/src/main/java/com/pro/bus/mapper/PlanMapper.java
+++ b/src/main/java/com/pro/bus/mapper/PlanMapper.java
@@ -4,6 +4,7 @@ import com.pro.bus.entity.Plan;
 import com.pro.info.entity.Color;
 import com.pro.info.entity.Customer;
 import com.pro.info.entity.Standard;
+import org.apache.ibatis.annotations.Param;
 import org.mybatis.spring.annotation.MapperScan;
 
 import java.util.List;
@@ -18,6 +19,6 @@ public interface PlanMapper {
     public void addPlan(Plan plan);
     public Plan getPlanById(Integer plan_id);
     public void updatePlan(Plan plan);
-    public void updatePlanStatus(Integer[] plan_ids,Integer plan_status);
+    public void updatePlanStatus(@Param("plan_ids") Integer[] plan_ids, @Param("plan_status") Integer plan_status, @Param("plan_person")String plan_person);
 }
 
diff --git a/src/main/java/com/pro/bus/service/PlanService.java b/src/main/java/com/pro/bus/service/PlanService.java
index 2058a1a..2c2f809 100644
--- a/src/main/java/com/pro/bus/service/PlanService.java
+++ b/src/main/java/com/pro/bus/service/PlanService.java
@@ -17,7 +17,7 @@ public interface PlanService {
     public void addPlan(Plan plan);
     public Plan getPlanById(Integer plan_id);
     public void updatePlan(Plan plan);
-    public void updatePlanStatus(Integer[] plan_ids,Integer plan_status);
+    public void updatePlanStatus(Integer[] plan_ids,Integer plan_status,String plan_person);
     public void delete(Integer[] plan_ids);
 
 
diff --git a/src/main/java/com/pro/bus/service/impl/PlanServiceImpl.java b/src/main/java/com/pro/bus/service/impl/PlanServiceImpl.java
index 54e7845..1f4bdeb 100644
--- a/src/main/java/com/pro/bus/service/impl/PlanServiceImpl.java
+++ b/src/main/java/com/pro/bus/service/impl/PlanServiceImpl.java
@@ -71,8 +71,8 @@ private PlanMapper planMapper;
     }
 
     @Override
-    public void updatePlanStatus(Integer[] plan_ids, Integer plan_status) {
-        planMapper.updatePlanStatus(plan_ids,plan_status);
+    public void updatePlanStatus(Integer[] plan_ids, Integer plan_status,String plan_person) {
+        planMapper.updatePlanStatus(plan_ids,plan_status,plan_person);
 
     }
 
diff --git a/src/main/resources/mapper/bus/PlanMapper.xml b/src/main/resources/mapper/bus/PlanMapper.xml
index b00f214..00d78c7 100644
--- a/src/main/resources/mapper/bus/PlanMapper.xml
+++ b/src/main/resources/mapper/bus/PlanMapper.xml
@@ -3,25 +3,24 @@
 
 <mapper namespace="com.pro.bus.mapper.PlanMapper">
     <select id="getPlan" resultType="com.pro.bus.entity.Plan">
-SELECT
-bus_plan.plan_id,
-bus_plan.plan_xh,
-bus_plan.plan_month,
-bus_plan.plan_num,
-bus_plan.plan_type,
-info_standard.standard_name,
-info_customer.cus_name,
-info_color.co_name,
-bus_plan.plan_date,
-bus_plan.plan_person,
-bus_plan.plan_status
-FROM
-bus_plan
-INNER JOIN info_color ON bus_plan.co_id = info_color.co_id
-INNER JOIN info_customer ON bus_plan.cus_id = info_customer.cus_id
-INNER JOIN info_standard ON bus_plan.standard_id = info_standard.standard_id
-<where> info_color.co_status='55' AND info_customer.cus_status='55' AND info_standard.standard_status='55'
-
+        SELECT
+        bus_plan.plan_id,
+        bus_plan.plan_xh,
+        bus_plan.plan_month,
+        bus_plan.plan_num,
+        bus_plan.plan_type,
+        info_standard.standard_name,
+        info_customer.cus_name,
+        info_color.co_name,
+        bus_plan.plan_date,
+        bus_plan.plan_person,
+        bus_plan.plan_status
+        FROM
+        bus_plan
+        INNER JOIN info_color ON bus_plan.co_id = info_color.co_id
+        INNER JOIN info_customer ON bus_plan.cus_id = info_customer.cus_id
+        INNER JOIN info_standard ON bus_plan.standard_id = info_standard.standard_id
+        <where>info_color.co_status='55' AND info_customer.cus_status='55' AND info_standard.standard_status='55'
 
        <if test="plan_status != null  ">
            and plan_status=#{plan_status}
@@ -39,7 +38,8 @@ INNER JOIN info_standard ON bus_plan.standard_id = info_standard.standard_id
         and co_name like concat('%',#{co_name},'%')
     </if>
 </where>
-        ORDER BY plan_date DESC
+        ORDER BY plan_status ASC,plan_date desc
+
     </select>
 
     <delete id="deleteById">
@@ -110,20 +110,17 @@ insert into bus_plan values(#{plan_id},#{standard_id},#{cus_id},#{co_id},#{plan_
         where
         plan_id=#{plan_id}
     </update>
-    <update id="updatePlanStatus">
+    <update id="updatePlanStatus" parameterType="com.pro.bus.entity.Plan">
         update bus_plan
         set
-        plan_status=#{param2},
-        plan_date=date(now())
+        plan_status=#{plan_status},
+        plan_date=date(now()),
+        plan_person=#{plan_person}
 
         <where>
-            1 &lt;&gt; 1 or
-            <foreach collection="param1" item="plan_id" close="" open="" separator="or">
+            <foreach collection="plan_ids" item="plan_id" close="" open="" separator="or">
                 plan_id=#{plan_id}
-
             </foreach>
-
         </where>
-
     </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/web/WEB-INF/views/bus/plan.jsp b/src/main/web/WEB-INF/views/bus/plan.jsp
index d79b492..fbb3bc4 100644
--- a/src/main/web/WEB-INF/views/bus/plan.jsp
+++ b/src/main/web/WEB-INF/views/bus/plan.jsp
@@ -703,7 +703,7 @@
             ,type: 'month'
         });
     });
-    //函数：改变多个客户信息状态
+    //函数：改变多个计划信息状态
     function changeMultiCusStatus(title,text,plan_status,table,cusTable){
         var checkStatus = table.checkStatus('demo'); //基础参数id对应的值
         console.log(checkStatus.data) //获取选中行的数据(数组)
-- 
Gitee