添加申诉结果检索

VisualInspection/js/appeal_management/appeal_checked.js

@@ -10,7 +10,9 @@ function queryCheckedAppealTask(){
         "checked_dept": $("#fsList").val(),
         // "status_search_type":1,
         "check_status_arr":[14,15,16],
-        "position_id":$("#jobSelect").val()
+        "position_id":$("#jobSelect").val(),
+        "checked_person": $("#feePersonList").val(),
+        "appeal_result": $("#appealResultSelect").val()
     }
     var hide = false;
     
@@ -25,6 +27,7 @@ function queryCheckedAppealTask(){
                 {width: 80, text: '稽查人员', type: 'string', flex: true, hide: hide,field: 'checkman_name'},
                 {width: 80, text: '复核人员', type: 'string', flex: true, hide: hide,field: 'recheckman_name'},
                 {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},
+                {width: 80, text: '申诉结果', type: 'string', flex: true,field:'appeal_result_name'},
                 // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
                 {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
                     oper:[

VisualInspection/js/appeal_management/appeal_list.js

@@ -35,9 +35,11 @@ function initQueryParams() {
     var store_params = $.zui.store.get('store_param_'+current_url);
     var checked_dept = null;
     var position_id = null;
+    var checked_person = null;
     if(store_params) {
         checked_dept = store_params.checked_dept;
         position_id = store_params.position_id;
+        checked_person = store_params.checked_person;
         $("#start_time").val(store_params.start_time.substr(0,11));
         $("#end_time").val(store_params.end_time.substr(0,11));
         // $("#hasScoreList").val(store_params.hasScore);
@@ -50,11 +52,21 @@ function initQueryParams() {
         $("#fsList").attr('disabled','disabled');
     }
     setJobSelect("#jobSelect",position_id);
+
+    setFeePersonSelect("#feePersonList",checked_person,checked_dept);
+
+    $('#fsList').change(function(){ 
+        setFeePersonSelect("#feePersonList",null,$("#fsList").val());
+    }) 
     //获取页面参数
     var page_params = $.zui.store.get("page_params");
     if(page_params && page_params.status) {
         cur_status = page_params.status;
     }
+
+    if(cur_status==14 || cur_status==15 || cur_status==16){
+        $("#appealResultDiv").show();     
+    }
 }
 //初始化表行按钮
 function initTableRowBtn() {
@@ -83,13 +95,20 @@ function queryAppeal(){
         "end_time": end_time,
         "checked_dept":  $("#fsList").val(),
         "check_status": cur_status,
-        "position_id":$("#jobSelect").val()
+        "position_id":$("#jobSelect").val(),
+        "checked_person": $("#feePersonList").val(),
+        "appeal_result": $("#appealResultSelect").val()
     }
     var hide = false;
     if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA) || roleContains('STATION')) {
         hide = true;
     }
     
+    var appeal_result_hide=true;
+    if(cur_status==14 || cur_status==15 || cur_status==16){
+        appeal_result_hide = false;   
+    }
+
     var cols = [
             {width: 30, text: '序号', flex: true, colClass: 'text-center',field:'num'},
             {width: 100, text: '任务名称', flex: true,colClass: '',field:'name'},
@@ -98,6 +117,7 @@ function queryAppeal(){
             {width: 80, text: '稽查人员', type: 'string', flex: true, hide:hide,field:'checkman_name'},
             {width: 80, text: '复核人员', type: 'string', flex: true, hide:hide,field:'recheckman_name'},
             {width: 120, text: '稽查时间段', type: 'string', flex: true, colClass: '',field:'check_period'},
+            {width: 80, text: '申诉结果', type: 'string', flex: true, hide:appeal_result_hide,field:'appeal_result_name'},
             // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field:'check_status_name'},
         ];
     var colFunc = {width: 120, text: '操作', type: 'string', flex: true, field: 'id'};   

VisualInspection/js/appeal_management/appeal_submited.js

@@ -11,7 +11,8 @@ function querySubmitedAppealTask(){
         "status_search_type":2,
         "check_status":11,
         "check_status_end":14,
-        "position_id":$("#jobSelect").val()
+        "position_id":$("#jobSelect").val(),
+        "checked_person": $("#feePersonList").val()
     }
     var hide = false;
     if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA) || roleContains('STATION')) {

VisualInspection/js/mytask/task_list.js

@@ -72,7 +72,7 @@ function initQueryParams() {
     $("#checkPersonDiv").show();
 
     if(cur_status==4 || cur_status==5 || cur_status==6){
-        $("#hasScoreDiv").show();       
+        $("#hasScoreDiv").show();     
     }
 
 }

VisualInspection/view/appeal_management/appeal_checked.html

@@ -15,6 +15,13 @@
                     <select class="form-control" id="fsList">
                     </select>
                 </div>
+                <div id="checkPersonDiv" class="form-group col-sm-2">
+                    <label for="exampleInputAccount1" class="col-sm-5">考核人</label>
+                    <div class="col-sm-7">
+                        <select class="form-control" id="feePersonList">
+                        </select>
+                    </div>
+                </div>
                 <div class="col-sm-2">
                     <button class="btn btn-primary " type="button" onclick="queryCheckedAppealTask()">查询</button>
                 </div>
@@ -25,6 +32,16 @@
                     <select class="form-control" id="jobSelect">
                     </select>
                 </div>
+                <div id="appealResultDiv" class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="col-sm-5">申诉结果</label>
+                    <div class="col-sm-4">
+                        <select class="form-control" id="appealResultSelect">
+                            <option value="">全部</option>
+                            <option value="1">成功</option>
+                            <option value="2">失败</option>
+                        </select>
+                    </div>
+                </div>
             </div>
         </form>
     </div>
@@ -64,9 +81,11 @@
         var store_params = $.zui.store.get('store_param_'+current_url);
         var checked_dept = null;
         var position_id = null;
+        var checked_person = null;
         if(store_params) {
             checked_dept = store_params.checked_dept;
             position_id = store_params.position_id;
+            checked_person = store_params.checked_person;
             $("#start_time").val(store_params.start_time.substr(0,11));
             $("#end_time").val(store_params.end_time.substr(0,11));
             // $("#hasScoreList").val(store_params.hasScore);
@@ -79,6 +98,11 @@
             $("#fsList").attr('disabled','disabled');
         }
         setJobSelect("#jobSelect",position_id);
+        setFeePersonSelect("#feePersonList",checked_person,checked_dept);
+
+        $('#fsList').change(function(){ 
+            setFeePersonSelect("#feePersonList",null,$("#fsList").val());
+        }) 
         queryCheckedAppealTask();
     });
 </script>

VisualInspection/view/appeal_management/appeal_list.html

@@ -17,15 +17,34 @@
                             <option value="">全部</option>
                         </select>
                     </div>
+                    <div id="checkPersonDiv" class="form-group col-sm-2">
+                        <label for="exampleInputAccount1" class="col-sm-5">考核人</label>
+                        <div class="col-sm-7">
+                            <select class="form-control" id="feePersonList">
+                            </select>
+                        </div>
+                    </div>
                     <div class="col-sm-2">
                         <button class="btn btn-primary " type="button" id="conditional_query" onclick="queryAppeal()">查询</button>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label for="exampleInputAccount1" class="col-sm-1">职位</label>
-                    <div class="col-sm-2" style="width:200px;">
-                        <select class="form-control" id="jobSelect">
-                        </select>
+                    <div class="form-group col-sm-3">
+                        <label for="exampleInputAccount1" class="col-sm-4">职位</label>
+                        <div class="col-sm-7">
+                            <select class="form-control" id="jobSelect">
+                            </select>
+                        </div>
+                    </div>
+                    <div id="appealResultDiv" class="form-group col-sm-3" style="display:none;">
+                        <label for="exampleInputAccount1" class="col-sm-5">申诉结果</label>
+                        <div class="col-sm-4">
+                            <select class="form-control" id="appealResultSelect">
+                                <option value="">全部</option>
+                                <option value="1">成功</option>
+                                <option value="2">失败</option>
+                            </select>
+                        </div>
                     </div>
                 </div>
             </form>

VisualInspection/view/appeal_management/appeal_submited.html

@@ -15,6 +15,13 @@
                     <select class="form-control" id="fsList">
                     </select>
                 </div>
+                <div id="checkPersonDiv" class="form-group col-sm-2">
+                    <label for="exampleInputAccount1" class="col-sm-5">考核人</label>
+                    <div class="col-sm-7">
+                        <select class="form-control" id="feePersonList">
+                        </select>
+                    </div>
+                </div>
                 <div class="col-sm-2">
                     <button class="btn btn-primary " type="button" onclick="querySubmitedAppealTask()">查询</button>
                 </div>
@@ -64,9 +71,11 @@
         var store_params = $.zui.store.get('store_param_'+current_url);
         var checked_dept = null;
         var position_id = null;
+        var checked_person = null;
         if(store_params) {
             checked_dept = store_params.checked_dept;
             position_id = store_params.position_id;
+            checked_person = store_params.checked_person;
             $("#start_time").val(store_params.start_time.substr(0,11));
             $("#end_time").val(store_params.end_time.substr(0,11));
             // $("#hasScoreList").val(store_params.hasScore);
@@ -79,6 +88,11 @@
             $("#fsList").attr('disabled','disabled');
         }
         setJobSelect("#jobSelect",position_id);
+        setFeePersonSelect("#feePersonList",checked_person,checked_dept);
+
+        $('#fsList').change(function(){ 
+            setFeePersonSelect("#feePersonList",null,$("#fsList").val());
+        }) 
         querySubmitedAppealTask();
     });
 </script>

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

@@ -88,6 +88,8 @@ public class Task{
     private Integer period_id;
     //申诉结果
     private Integer appeal_result;
+    //申诉结果
+    private String appeal_result_name;
     //申诉id
     private Long appeal_id;
     

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

@@ -23,7 +23,7 @@
         <result column="class_type" property="class_type" jdbcType="INTEGER" />
         <result column="period_id" property="period_id" jdbcType="INTEGER" />
         <result column="monitor_user_id" property="monitor_user_id" jdbcType="INTEGER" />
-        
+        <result column="appeal_result" property="appeal_result" jdbcType="INTEGER" />
     </resultMap>
     <resultMap id="taskStatusMap" type="com.xintong.visualinspection.bean.TaskStatus">
         <id property="id" column="ID"/>
@@ -63,8 +63,10 @@
     <select id="getList" parameterType="com.xintong.visualinspection.bean.Task" resultMap="BaseResultMap" >
         SELECT t.*,
         		CONCAT(substr(t.start_time,1,16),'-',substr(t.end_time,12,5)) as check_period,
-              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=t.check_status) as check_status_name
+              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=t.check_status) as check_status_name,
+        	 ca.appeal_result as appeal_result
         FROM check_task t left join t_sys_users u on t.checked_person=u.id
+        	 left join check_appeal ca on t.id=ca.task_id
         WHERE 1=1
         	<if test="check_status != null">AND t.check_status = #{check_status}</if>
         	<if test="check_status_end != null">AND t.check_status &lt;= #{check_status_end}</if>
@@ -75,6 +77,7 @@
         	<if test="recheckman != null">AND t.recheckman = #{recheckman}</if>
         	<if test="checked_person != null">AND t.checked_person = #{checked_person}</if>
         	<if test="position_id != null">AND u.positionid = #{position_id}</if>
+        	<if test="appeal_result != null">AND ca.appeal_result = #{appeal_result}</if>
         	<if test="hasScore == 1">AND 
         		t.id in (select task_id from check_score)
         	</if>
@@ -93,8 +96,10 @@
     <select id="getListInStatus" parameterType="com.xintong.visualinspection.bean.Task" resultMap="BaseResultMap" >
         SELECT t.*,
         		CONCAT(substr(t.start_time,1,16),'-',substr(t.end_time,12,5)) as check_period,
-              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=t.check_status) as check_status_name
+              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=t.check_status) as check_status_name,
+        	  ca.appeal_result as appeal_result
         FROM check_task t left join t_sys_users u on t.checked_person=u.id
+        	 left join check_appeal ca on t.id=ca.task_id
         WHERE 1=1
        		<if test="check_status_arr != null and check_status_arr.length > 0">AND
         		t.check_status in 
@@ -110,6 +115,7 @@
         	<if test="recheckman != null">AND t.recheckman = #{recheckman}</if>
         	<if test="checked_person != null">AND t.checked_person = #{checked_person}</if>
         	<if test="position_id != null">AND u.positionid = #{position_id}</if>
+        	<if test="appeal_result != null">AND ca.appeal_result = #{appeal_result}</if>
         	<if test="hasScore == 1">AND 
         		t.id in (select task_id from check_score)
         	</if>
@@ -127,8 +133,10 @@
     <select id="getListByChecked" parameterType="com.xintong.visualinspection.bean.Task" resultMap="BaseResultMap" >
         SELECT t.*,
         	  CONCAT(substr(t.start_time,1,16),'-',substr(t.end_time,11,6)) as check_period,
-              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=t.check_status) as check_status_name
+              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=t.check_status) as check_status_name,
+        	 ca.appeal_result as appeal_result
         FROM check_task  t left join t_sys_users u on t.checked_person=u.id
+        	  left join check_appeal ca on t.id=ca.task_id
         WHERE 1=1
         	<if test="check_status != null">AND t.check_status &gt;= #{check_status}</if>
         	<if test="start_time != null">AND t.start_time &gt;= #{start_time}</if>
@@ -138,6 +146,7 @@
         	<if test="recheckman != null">AND t.recheckman = #{recheckman}</if>
         	<if test="period_id != null">AND t.period_id = #{period_id}</if>
         	<if test="checked_person != null">AND t.checked_person = #{checked_person}</if>
+        	<if test="appeal_result != null">AND ca.appeal_result = #{appeal_result}</if>
     </select>
 
 	<select id="getListBySubmited" parameterType="com.xintong.visualinspection.bean.Task" resultMap="BaseResultMap" >

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

@@ -18,6 +18,7 @@ import com.xintong.visualinspection.dao.master.TaskDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.TaskService;
 import com.xintong.visualinspection.util.CacheUtil;
+import com.xintong.visualinspection.util.CodeUtil;
 
 /**
  * 文件名：UserServiceImpl
@@ -83,6 +84,8 @@ public class TaskServiceImpl extends BaseService implements TaskService {
 				}
 			}
 			t.setRecheckman_name(CacheUtil.getUserTurenameFromMap(t.getRecheckman()));
+			
+			t.setAppeal_result_name(CodeUtil.getCodeNameByFlagAndValue("appeal_result", t.getAppeal_result()+""));
 		}
 		return taskList;
 	}

VisualInspection_server/src/main/java/com/xintong/visualinspection/util/CodeUtil.java

@@ -17,4 +17,12 @@ public class CodeUtil {
 		String key = flag;
 		return  CacheUtil.codeFlagMap.get(key);
 	}
+	
+	public static String getCodeNameByFlagAndValue(String flag, String value){
+		if(flag == null) return null;
+		String key = flag+"_"+value;
+		Constant c =  CacheUtil.codeMap.get(key);
+		if(c!=null) return c.getCode_name();
+		return null;
+	}
 }