添加清排障稽查类型

VisualInspection/js/config.js

@@ -18,8 +18,8 @@ function getserveraddr() {
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
         return "http://server_release_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
-        return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
-        // return "http://localhost:8089/"
+        // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
+        return "http://localhost:8089/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8089/"
     } else {

VisualInspection/js/other_check/other_check.js

@@ -74,6 +74,7 @@ var al_data = [];
             $("#add_btn").data("tree_flag",0);
         })
         queryTable();
+        setCheckTypeSelect('#select-check-type','');
     }
 
      //关闭弹窗
@@ -93,6 +94,7 @@ var al_data = [];
         var check_score = $("#check_score").val();
         var check_time = $("#month_date2").val();
         var check_num = $("#check_num").val();
+        var wrecker_check_type = $("#select-check-type").val();
         if(idUpdate){
             if($("#editImage").attr("file_src") != ''){
                 var src  = $("#editImage").attr("file_src").split(",");
@@ -138,8 +140,10 @@ var al_data = [];
             "file_ids":file_ids,
             "check_time":check_time,
             "check_time_name":check_time_name,
-            "check_num":check_num
+            "check_num":check_num,
+            "wrecker_check_type":wrecker_check_type
         }
+        console.log(data);
         if(idUpdate){
             post_common_service("checkOther/update", data, function(data){
                 file_src = "";
@@ -227,14 +231,19 @@ function updateCheckTeam(id){
         "id":id
     }
     post_common_service("checkOther/getCheckById", data, function(data){
-        $("#select-dept").val(data.dept_id);
-        $("#select-personal").val(data.user_id);
+        var select_road = $(".div-roadManage select").val();
+        var feeList = getOrganList(select_road);
+        setFeeSelectValue(feeList, "#select-dept", data.dept_id);
+        setPersonal(data.user_id);
+        // $("#select-dept").val(data.dept_id);
+        // $("#select-personal").val(data.user_id);
         $("#check_item_select input").val(data.check_item_name);
         $("#remark").val(data.remark);
         $("#check_score").val(data.check_score);
         var time = data.check_time;
         $("#month_date2").val(data.check_time);
         $("#check_num").val(data.check_num);
+        setCheckTypeSelect('#select-check-type',data.wrecker_check_type);
         $("#editImage").empty();
         if(data.file_ids !=null && data.file_ids != ""){
             var ids = data.file_ids.split(",");
@@ -366,7 +375,7 @@ function refreshUploader(){
      /**
      * 部门人员下拉框
      */
-    function setPersonal() {
+    function setPersonal(selectUserId) {
         var select_road = $("#select-dept").val();
         var sec = document.getElementById('select-personal');
         var tempStr = ''
@@ -383,8 +392,10 @@ function refreshUploader(){
                 var userId;
                 if (hasRole("ROLE_STATION")) {
                     userId = getCurrentUser().id;
+                }else{
+                    userId = selectUserId;
                 }
-                console.log(data);
+                // console.log(data);
                 for (var i = 0; i < data.length; i++) {
                     // for (var j = 33; j <= 53; j++) {
                         // if (select_road == j) {
@@ -630,4 +641,18 @@ function refreshUploader(){
     }
 }
 
-var map =  {} ;
+var map =  {} ;
+
+function setCheckTypeSelect(div, selectId) {
+    post_common_service("/constant/getConstantByFlag", {code_flag: "wrecker_group_check_type"}, function(data) {
+        var optStr = '';
+        for (var i in data) {
+            if (data[i].code_value == selectId)
+                optStr += '<option value="' + data[i].code_value + '" selected="selected">' + data[i].code_name + '</option>';
+            else
+                optStr += '<option value="' + data[i].code_value + '">' + data[i].code_name + '</option>';
+        }
+        $(div).html('');
+        $(div).html(optStr);
+    });
+}

VisualInspection/view/other_check/toubleshoot_check.html

@@ -74,7 +74,7 @@
                     </ul>
                 </div>
             </div>
-             <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
                 <div style="width:80px;float:left;">
                     <span style="line-height:32px;">扣分描述</span>
                 </div>
@@ -92,6 +92,14 @@
             </div>
             <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
                 <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">稽查类型</span>
+                </div>
+                <div style="width:260px;float:left;">
+                    <select class="form-control" id="select-check-type"></select>
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
                     <span style="line-height:32px;">附件上传</span>
                 </div>
                 <div style="width:260px;float:left;">

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

@@ -50,4 +50,6 @@ public class CheckOther {
     private String username;
     // 扣分类型名
     private String check_item_name;
+    // 清障检查类型
+    private Integer wrecker_check_type;
 }

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

@@ -5,16 +5,16 @@
 	<insert id="insert" parameterType="com.xintong.visualinspection.bean.CheckOther">
 		INSERT INTO
 		other_check
-		(dept_id,user_id,check_person_id,check_score,check_item_id,remark,check_type,file_ids,check_num,check_time,check_time_name,update_time)
+		(dept_id,user_id,check_person_id,check_score,check_item_id,remark,check_type,file_ids,check_num,check_time,check_time_name,update_time,wrecker_check_type)
 		VALUES
-		(#{dept_id},#{user_id},#{check_person_id},#{check_score},#{check_item_id},#{remark},#{check_type},#{file_ids},#{check_num},#{check_time},#{check_time_name},now())
+		(#{dept_id},#{user_id},#{check_person_id},#{check_score},#{check_item_id},#{remark},#{check_type},#{file_ids},#{check_num},#{check_time},#{check_time_name},now(),#{wrecker_check_type})
 	</insert>
 	
 	<select id="getCheckByDeptId" parameterType="com.xintong.visualinspection.bean.CheckOther"
 	resultType="com.xintong.visualinspection.bean.CheckOther" >
        SELECT
 		o.id,o.dept_id,o.user_id,o.check_person_id,o.check_score,o.check_item_id,o.remark,o.check_type,o.file_ids,o.check_num,o.check_time,
-		o.check_time_name,o.delete_flag,o.update_time , t.ORGANNAME organname,u.TRUENAME  username,c.name check_item_name
+		o.check_time_name,o.delete_flag,o.update_time , t.ORGANNAME organname,u.TRUENAME  username,c.name check_item_name, o.wrecker_check_type
 		FROM
 			(SELECT * FROM other_check
 			where 1=1 and check_type = #{check_type}
@@ -27,7 +27,7 @@
     </select>
     <select id="getCheckById" parameterType="java.lang.Long" resultType="com.xintong.visualinspection.bean.CheckOther" >
         SELECT o.id,o.dept_id,o.user_id,o.check_person_id,o.check_score,o.check_item_id,o.remark,o.check_type,o.file_ids,o.check_num,o.check_time,
-		o.check_time_name,o.delete_flag,o.update_time,c.name check_item_name
+		o.check_time_name,o.delete_flag,o.update_time,c.name check_item_name, o.wrecker_check_type
         FROM other_check o
         LEFT JOIN check_item c ON o.check_item_id = c.id
         WHERE o.id = #{id}
@@ -47,6 +47,7 @@
         <if test="file_ids != null">,file_ids = #{file_ids}</if>
         <if test="check_time != null">,check_time = #{check_time}</if>
         <if test="check_num != null">,check_num = #{check_num}</if>
+        <if test="wrecker_check_type != null">,wrecker_check_type = #{wrecker_check_type}</if>
         WHERE
         id = #{id}
     </update>