收费人员排班

VisualInspection/js/assess_management/assess_way_edit.js

@@ -322,9 +322,9 @@ function delete_check_item(id ){
          for (var i = 0; i < data.subCheckItem.length; i++) {
              var m = data.subCheckItem[i];
              var zdataItem = {};
-              if(m.score != null){
-                 continue;
-              }
+            //   if(m.score != null){
+            //      continue;
+            //   }
              zdataItem["id"] = m.id;
              zdataItem["value"] = m.id;
              zdataItem["pId"] = data.id;
@@ -332,7 +332,7 @@ function delete_check_item(id ){
              zdataItem["icon"] = "";
              zdataItem["name"] = m.name;
              zdataItem["children"] = addobj(m);
-             zdataItem.open = true ;
+             zdataItem.open = false ;
              zdata.push(zdataItem);
          }
          return zdata;

VisualInspection/js/config.js

@@ -1,6 +1,6 @@
-var base_ui_url = "http://192.168.68.126:8081/";
-var base_server_url = "http://192.168.68.126:8089/";
+// var base_ui_url = "http://192.168.68.126:8081/";
+// var base_server_url = "http://192.168.68.126:8089/";
 var base_image_server_url = "http://192.168.68.126:8080/";
 
-// var base_ui_url = "http://localhost:8080/";
-// var base_server_url = "http://localhost:8089/";
+var base_ui_url = "http://localhost:8080/";
+var base_server_url = "http://localhost:8089/";

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -152,6 +152,30 @@
             }
         }
 
+        $("#save_user_class").click(function(){
+            var dutyList = [];
+            var work_date = $("#save_user_class").data("work_date");
+
+            for(var j=1;j<4;j++){
+                var cache = $(".tr-"+j).data("cache");
+
+                for(var i=0;i<lans;i++){
+                    var obj = { "work_date":work_date,"dept_id":cache.dept_id,"user_id": $(".tr-"+j+" td select").eq(i).val() , "class_type":j,"team_id":cache.team_id,"start_time":work_date, "end_time":work_date,"lane":i+1 };
+                    dutyList.push(obj);
+                }
+
+            }
+
+            post_common_service( "userClass/addList",dutyList,function(data){
+               tip("添加成功");
+                $('#add_fee_station').modal('hide');
+            },function(error){
+                return "" ;
+            })
+
+        
+        })
+
         $('#calendar').calendar().on("clickEvent.zui.calendar", function(event) {
             // console.log(event。event.id);
             if(event.event.id == -1){
@@ -159,6 +183,7 @@
                 $('#add_fee_station').modal();
                 $(".modal-title").html("收费站排班表-"+event.event.start.format("yyyy-MM-dd"));
 
+                $("#save_user_class").data("work_date",event.event.start.format("yyyy-MM-dd 00:00:00"));
 
                  var data = {
                     "dept_id": user_dept_id ,
@@ -180,11 +205,12 @@
 
                     for(var i=0;i<data.length;i++){
                         if(data[i].class_type == 1){
+                            $(".tr-1").data("cache",data[i]);
                             $(".tr-1").append("<td>早班 6:00 - 12:00</td>");
                             var selectv = "<select class='form-control'>"
+                                    // console.log(data[i]);
                             for(var j=0;j<data[i].users.length;j++){
                                     var obj = data[i].users[j];
-                                    console.log(obj);
                                     selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
                             }
                             selectv += "</select>";
@@ -193,7 +219,7 @@
                             }
                         }else if(data[i].class_type == 2){
                              $(".tr-2").append("<td>中班 12:00 - 20:00</td>");
-
+                              $(".tr-2").data("cache",data[i]);
                             var selectv2 = "<select class='form-control'>"
                             for(var j=0;j<data[i].users.length;j++){
                                  if(data[i].users[j]!=null)
@@ -206,7 +232,7 @@
                             }
                         }else if(data[i].class_type == 3){
                             $(".tr-3").append("<td>晚班 20:00 - 6:00</td>");
-
+                             $(".tr-3").data("cache",data[i]);
                             var selectv3 = "<select class='form-control'>"
                             for(var j=0;j<data[i].users.length;j++){
                                  if(data[i].users[j]!=null)

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -102,7 +102,7 @@
                     <div class="form-group">
                         <div class="col-sm-12">
                             <button  style="float:right;margin-right:10px;" class="btn btn close_btn">关闭</button>
-                            <button type="submit" style="float:right;margin-right:10px;" id="save_term_class" class="btn btn-info">生成今日排班</button>
+                            <button type="submit" style="float:right;margin-right:10px;" id="save_user_class" class="btn btn-info">生成今日排班</button>
                         </div>
                     </div>
                 </div>

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/UserClass.java

@@ -0,0 +1,49 @@
+package com.xintong.visualinspection.bean;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.NotEmpty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * 文件名：ScoreDeducting
+ * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Data
+public class UserClass {
+    //编号
+    private Long id;
+    //上班日期
+    @NotNull
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date work_date;
+    //上班时间
+    @NotNull
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date start_time;
+    //下班时间
+    @NotNull
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date end_time;
+    //班组id
+    private Long team_id;
+    //人员ids
+    private Long user_id;
+    //部门id
+    private Long dept_id;
+    //班次类型（早、中、晚、全天）
+    private Integer class_type;
+    
+    private Integer lane;
+    
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/UserClassController.java

@@ -0,0 +1,39 @@
+package com.xintong.visualinspection.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xintong.system.err.BusinessException;
+import com.xintong.visualinspection.bean.TeamClass;
+import com.xintong.visualinspection.bean.UserClass;
+import com.xintong.visualinspection.service.UserClassService;
+
+/**
+ * 文件名：TestController
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@RestController
+@RequestMapping("/userClass")
+public class UserClassController extends BaseController {
+
+	@Autowired
+	UserClassService userClassService ;
+	
+	/**
+     * 通过id获取班次
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/addList")
+    public String getClassById(@RequestBody List<UserClass> list){
+    	userClassService.insertList(list);
+    	return super.returnSuccessResult("添加成功");
+    }
+    
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/UserClassDao.java

@@ -0,0 +1,19 @@
+package com.xintong.visualinspection.dao.master;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.xintong.visualinspection.bean.CheckItem;
+import com.xintong.visualinspection.bean.UserClass;
+
+/**
+ * 文件名：UserInfoDao
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Mapper
+public interface UserClassDao  {
+    public List<CheckItem> selectList(UserClass userClass);
+    public void insert(UserClass userClass);
+    public void delete(UserClass userClass);
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/UserClassMapper.xml

@@ -0,0 +1,15 @@
+<?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.xintong.visualinspection.dao.master.UserClassDao" >
+   
+   
+   <insert id="insert" parameterType="com.xintong.visualinspection.bean.UserClass">
+   		INSERT INTO
+        sys_user_class
+        (work_date,dept_id,user_id,class_type,team_id,start_time,end_time,lane)
+        VALUES
+        (#{work_date},#{dept_id},#{user_id},#{class_type},#{team_id},#{start_time},#{end_time},#{lane})
+   </insert>
+   
+   
+</mapper>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/UserClassService.java

@@ -0,0 +1,25 @@
+package com.xintong.visualinspection.service;
+
+import java.util.List;
+
+import com.xintong.visualinspection.bean.CheckRule;
+import com.xintong.visualinspection.bean.Constant;
+import com.xintong.visualinspection.bean.UserClass;
+
+/**
+ * 
+ *
+ * ConstantService
+ * 
+ * tiger
+ * tiger
+ * 2017年5月4日 上午10:41:40
+ * 
+ * @version 1.0.0
+ *
+ */
+public interface UserClassService {
+    public void insertList(List<UserClass> list);
+    public void updateList(List<UserClass> list);
+    public void selectList(UserClass obj);
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/UserClassServiceImpl.java

@@ -0,0 +1,48 @@
+package com.xintong.visualinspection.service.impl;
+
+import java.util.List;
+
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xintong.visualinspection.bean.UserClass;
+import com.xintong.visualinspection.dao.master.UserClassDao;
+import com.xintong.visualinspection.service.BaseService;
+import com.xintong.visualinspection.service.UserClassService;
+
+/**
+ * 文件名：UserServiceImpl
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Service
+public class UserClassServiceImpl extends BaseService implements UserClassService {
+
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(UserClassServiceImpl.class);
+
+    @Autowired
+    UserClassDao userClassDao ;
+    
+	@Override
+	public void insertList(List<UserClass> list) {
+		// TODO Auto-generated method stub
+		for(int i=0;i<list.size();i++){
+			userClassDao.insert(list.get(i));
+		}
+	}
+
+	@Override
+	public void updateList(List<UserClass> list) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void selectList(UserClass obj) {
+		// TODO Auto-generated method stub
+		
+	}
+
+
+   
+}