申诉部分

VisualInspection/fwq/js/appeal_management/appeal_checked.js

@@ -17,7 +17,6 @@ function queryCheckedAppealTask() {
     var cols = [
         { width: 30, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
         { width: 100, text: '任务名称', type: 'string', flex: true, sort: 'down', field: 'name' },
-        { width: 80, text: '申诉人员', type: 'string', flex: true, colClass: '', field: 'checked_person_name' },
         { width: 80, text: '申诉部门', type: 'string', flex: true, sort: 'down', field: 'checked_dept_name' },
         { width: 80, text: '稽查人员', type: 'string', flex: true, hide: hide, field: 'checkman_name' },
         { width: 80, text: '复核人员', type: 'string', flex: true, hide: hide, field: 'recheckman_name' },

VisualInspection/fwq/js/appeal_management/appeal_list.js

@@ -56,6 +56,7 @@ function initAppealList() {
 function queryAppeal() {
     var t = getTimeByMonth($("#start_time").val());
 
+    alert(getMomentTimeFormat(t.starttime))
     var data = {
         "start_time": getMomentTimeFormat(t.starttime),
         "end_time": getMomentTimeFormat(t.endtime),
@@ -76,7 +77,6 @@ function queryAppeal() {
     var cols = [
         { width: 30, text: '序号', flex: true, colClass: 'text-center', field: 'num' },
         { width: 100, text: '任务名称', flex: true, colClass: '', field: 'name' },
-        { width: 80, text: '申诉人员', flex: true, colClass: '', field: 'checked_person_name' },
         { width: 100, text: '申诉部门', flex: true, colClass: '', sort: 'down', field: 'checked_dept_name' },
         { width: 80, text: '稽查人员', type: 'string', flex: true, hide: hide, field: 'checkman_name' },
         { width: 80, text: '复核人员', type: 'string', flex: true, hide: hide, field: 'recheckman_name' },
@@ -150,7 +150,6 @@ function queryUnAssignedTable() {
         // {width: 120, text: '上次稽查时间', type: 'string', flex: false, colClass: '',field:'start_time'},
         { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
         { width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down', field: 'name' },
-        { width: 80, text: '申诉人员', type: 'string', flex: true, field: 'checked_person_name' },
         { width: 160, text: '申诉部门', type: 'string', flex: true, sort: 'down', field: 'checked_dept_name' },
         { width: 80, text: '稽查人员', type: 'string', flex: true, hide: hide, field: 'checkman_name' },
         { width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down', field: 'check_period' },
@@ -229,7 +228,7 @@ function dispatchAppealTaskById(id) {
             "id": rowData.id,
             "check_status": 15
         }
-        no_return_common_service('/task/dispatchById', param, function(data) {
+        no_return_common_service('/f/task/dispatchById', param, function(data) {
             queryAppeal();
             layer.msg(data, {
                 time: 2000 //20s后自动关闭

VisualInspection/fwq/js/task/check.js

@@ -775,7 +775,7 @@ function zTreeOnClick(event, treeId, treeNode) {
         'content': treeNode.value,
         'check_item_id': treeNode.id,
         'checkman': $.checkTask.checkman,
-        'checked_person': $.checkTask.checked_person,
+        'checked_area': $.checkTask.area_id,
         'checked_dept': $.checkTask.checked_dept
     };
     no_return_common_service("/f/score/add", param, function(data) {

VisualInspection/fwq/view/task/taskDetail.html

@@ -197,7 +197,7 @@
             type: 'string',
             flex: true,
             colClass: '',
-            field: 'area_name'
+            field: 'checked_area_name'
         }, {
             width: 80,
             text: '备注',

VisualInspection/js/util/util.js

@@ -828,11 +828,11 @@ function trim(str) {
 
 function getTimeByMonth(time) {
     var t = time.replace("/", "-") + "";
-    var endtime = moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss");
-    var starttime = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
+    var endtime = moment(t + "-25 23:00:00", "YYYY-MM-DD HH:mm:ss");
+    var starttime = moment(moment(t + "-25 23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
     return { starttime: starttime, endtime: endtime };
 }
 
 function getMomentTimeFormat(t) {
-    return t.format("YYYY-MM-DD hh:mm:ss");
+    return t.format("YYYY-MM-DD HH:mm:ss");
 }

Visuallnspection_fjq/visuallnspection_fjq/pom.xml

@@ -281,7 +281,7 @@
         <repository>
             <id>xt-snapshots</id>
             <name>snapshots</name>
-            <url>http://git.topm.win:9506/nexus/content/repositories/snapshots</url>
+            <url>http://xt.wenhq.top:8084/nexus/content/repositories/snapshots</url>
         </repository>
     </repositories>
     <pluginRepositories>

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/mapper/master/ScoreMapper.xml

@@ -24,13 +24,13 @@
     </select>
 
     <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
-        SELECT *
+        SELECT *,(select name from area_info where id = checked_area) as checked_area_name
         FROM check_score
         WHERE id = #{id}
     </select>
     
     <select id="getScoreList" parameterType="com.xintong.visualinspection.bean.FwqScore" resultMap="BaseResultMap" >
-        SELECT *
+        SELECT *,(select name from area_info where id = checked_area) as checked_area_name
         FROM check_score
         WHERE 1=1
         	 <if test="task_id != null">AND task_id = #{task_id}</if>
@@ -42,7 +42,7 @@
     </select>
     
     <select id="getScoreListByTaskId" parameterType="java.lang.Long" resultMap="BaseResultMap" >
-        SELECT *
+        SELECT *,(select name from area_info where id = checked_area) as checked_area_name
         FROM check_score
         WHERE task_id = #{task_id}
     </select>

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

@@ -29,53 +29,66 @@
     </select>
 
     <select id="getall" parameterType="com.xintong.visualinspection.bean.FwqCheckTask" resultType="com.xintong.visualinspection.bean.FwqCheckTask">
-        select *,CONCAT(substr(start_time,1,16),'-',substr(end_time,12,5)) as check_period,(select name from area_info where id = area_id) as area_name from check_task where 1=1
-        <if test="period_id != null">AND period_id = #{period_id}</if>
-        <if test="checked_dept != null">AND checked_dept = #{checked_dept}</if>
-        <if test="start_time != null and end_time != null">AND start_time >= #{start_time} <![CDATA[ AND end_time < #{end_time}]]> </if>
-        <if test="check_status != null">AND check_status = #{check_status}</if>
-        <if test="checkman != null">AND checkman = #{checkman}</if>
-        <if test="area_id != null">AND area_id = #{area_id}</if>
+        select t.*,CONCAT(substr(t.start_time,1,16),'-',substr(t.end_time,12,5)) as check_period,(select name from area_info where id = t.area_id) as area_name
+        ,ca.appeal_result as appeal_result
+        from check_task t
+        left join check_appeal ca on t.id=ca.task_id
+        where 1=1
+        <if test="period_id != null">AND t.period_id = #{period_id}</if>
+        <if test="checked_dept != null">AND t.checked_dept = #{checked_dept}</if>
+        <if test="start_time != null and end_time != null">AND t.start_time >= #{start_time} <![CDATA[ AND t.end_time < #{end_time}]]> </if>
+        <choose>
+            <when test="check_status_end != null and check_status != null">
+                AND t.check_status &gt;= #{check_status} AND t.check_status &lt;= #{check_status_end}
+            </when>
+            <otherwise>
+                <if test="check_status != null"> AND t.check_status = #{check_status}</if>
+            </otherwise>
+        </choose>
+
+        <if test="checkman != null">AND t.checkman = #{checkman}</if>
+        <if test="area_id != null">AND t.area_id = #{area_id}</if>
         <if test="check_status_arr != null and check_status_arr.length > 0">AND
-            check_status in
+            t.check_status in
             <foreach collection="check_status_arr" item="status" index="index"
                      open="(" close=")" separator=",">
                 #{status}
             </foreach>
         </if>
-        <if test="area_id != null">AND area_id = #{area_id}</if>
+        <if test="area_id != null">AND t.area_id = #{area_id}</if>
         <if test="hasScore != null ">
 
             <!--有扣分-->
             <if test="hasScore == 1 ">
-                AND id in (select task_id from check_score where check_item_score>0 )
+                AND t.id in (select task_id from check_score where check_item_score>0 )
             </if>
             <!--无扣分-->
             <if test="hasScore == 2 ">
-                AND id not in (select task_id from check_score where check_item_score>0 )
+                AND t.id not in (select task_id from check_score where check_item_score>0 )
             </if>
 
         </if>
         <if test="invalidFrom == -1">AND
-            ( invalid_from = 0 OR invalid_from = 1)
+            ( t.invalid_from = 0 OR t.invalid_from = 1)
         </if>
 
         <if test="invalidFrom != null  and invalidFrom != -1">AND
-            invalid_from = #{invalidFrom}
+            t.invalid_from = #{invalidFrom}
         </if>
         <if test="dispatch_ids != null and dispatch_ids.length > 0">AND
-            id in
+            t.id in
             <foreach collection="dispatch_ids" item="dispatch_id" index="index"
                      open="(" close=")" separator=",">
                 #{dispatch_id}
             </foreach>
         </if>
-        ORDER BY start_time DESC
+        ORDER BY t.start_time DESC
     </select>
 
     <update id="updateStatus" parameterType="com.xintong.visualinspection.bean.FwqCheckTask" >
         update check_task set
         <if test="check_status != null">check_status = #{check_status},</if>
+        <if test="recheckman != null">recheckman = #{recheckman},</if>
         update_time=now()
         WHERE
         id = #{id}

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/impl/TaskServiceImpl.java

@@ -3,6 +3,7 @@ package com.xintong.visualinspection.visuallnspection_fjq.service.impl;
 /**
  * 文件名：TaskServiceImpl_F
  * 版本信息：日期：2017/4/7 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ *
  * @author wenhongquan
  * @date 2018/04/11
  */
@@ -44,42 +45,49 @@ public class TaskServiceImpl implements TaskService_F {
     private CommonService commonService;
 
     @Override
-    public Object getAllTask(Integer page,Integer size,FwqCheckTask fwqCheckTasktemp) {
-            if (!(page.equals(0) && size.equals(0))) {
-                PageHelper.startPage(page, size);
+    public Object getAllTask(Integer page, Integer size, FwqCheckTask fwqCheckTasktemp) {
+        if (!(page.equals(0) && size.equals(0))) {
+            PageHelper.startPage(page, size);
+        }
+        if(fwqCheckTasktemp.getCheck_status_arr()!=null){
+            fwqCheckTasktemp.setCheck_status(null);
+        }
+
+        List<FwqCheckTask> fwqCheckTaskList = fwqTaskDao.getall(fwqCheckTasktemp == null ? new FwqCheckTask() : fwqCheckTasktemp);
+
+        Map<Long, Organ> deptMap = commonService.getDeptMap();
+        Map<Long, User> userMap = commonService.getUserMap();
+        Map<String, Constant> codeMap = commonService.getCodeMap();
+
+        for (FwqCheckTask fwqCheckTask : fwqCheckTaskList
+                ) {
+            if (deptMap.get(fwqCheckTask.getChecked_dept()) != null) {
+                fwqCheckTask.setChecked_dept_name(deptMap.get(fwqCheckTask.getChecked_dept()).getOrganname());
+            }
+            if (userMap.get(fwqCheckTask.getCheckman()) != null) {
+                fwqCheckTask.setCheckman_name(userMap.get(fwqCheckTask.getCheckman()).getTruename());
+            }
+            if (fwqCheckTask.getCheckman() != null) {
+                fwqCheckTask.setCheckman_name(userMap.get(fwqCheckTask.getCheckman()).getTruename());
             }
-            List<FwqCheckTask> fwqCheckTaskList = fwqTaskDao.getall(fwqCheckTasktemp == null ? new FwqCheckTask() : fwqCheckTasktemp);
 
-            Map<Long, Organ> deptMap = commonService.getDeptMap();
-            Map<Long, User> userMap = commonService.getUserMap();
-            for (FwqCheckTask fwqCheckTask : fwqCheckTaskList
-                    ) {
+            if (fwqCheckTask.getChecked_dept() != null) {
                 if (deptMap.get(fwqCheckTask.getChecked_dept()) != null) {
                     fwqCheckTask.setChecked_dept_name(deptMap.get(fwqCheckTask.getChecked_dept()).getOrganname());
                 }
-                if (userMap.get(fwqCheckTask.getCheckman()) != null) {
-                    fwqCheckTask.setCheckman_name(userMap.get(fwqCheckTask.getCheckman()).getTruename());
-                }
-
-                    if(fwqCheckTask.getCheckman() != null){
-                        fwqCheckTask.setCheckman_name(CacheUtil.getUserTurenameFromMap(fwqCheckTask.getCheckman()));
-                    }
-
-                    if(fwqCheckTask.getChecked_dept() != null){
-                        if(CacheUtil.deptMap.get(fwqCheckTask.getChecked_dept())!=null){
-                            fwqCheckTask.setChecked_dept_name(CacheUtil.getOrgannameFromMap(fwqCheckTask.getChecked_dept()));
-                        }
-                    }
-                fwqCheckTask.setRecheckman_name(CacheUtil.getUserTurenameFromMap(fwqCheckTask.getRecheckman()));
-                fwqCheckTask.setMonitor_user_name(CacheUtil.getUserTurenameFromMap(fwqCheckTask.getMonitor_user_id()));
-                fwqCheckTask.setAppeal_result_name(CodeUtil.getCodeNameByFlagAndValue("appeal_result", t.getAppeal_result()+""));
-
             }
-
-            if (!(page.equals(0) && size.equals(0))) {
-                return new PageInfo<FwqCheckTask>(fwqCheckTaskList);
+            if(fwqCheckTask.getRecheckman()!=null){
+                fwqCheckTask.setRecheckman_name(userMap.get(fwqCheckTask.getRecheckman()).getTruename());
             }
-            return fwqCheckTaskList;
+            if(fwqCheckTask.getAppeal_result()!=null){
+                fwqCheckTask.setAppeal_result_name(codeMap.get("appeal_result" + "_" + fwqCheckTask.getAppeal_result() + "").getCode_name());
+            }
+        }
+
+        if (!(page.equals(0) && size.equals(0))) {
+            return new PageInfo<FwqCheckTask>(fwqCheckTaskList);
+        }
+        return fwqCheckTaskList;
     }
 
     @Override
@@ -91,15 +99,15 @@ public class TaskServiceImpl implements TaskService_F {
     public void updateStatus(FwqCheckTask fwqCheckTask) {
         fwqTaskDao.updateStatus(fwqCheckTask);
         //添加状态
-        if(fwqCheckTask.getCheck_status()!=null){
+        if (fwqCheckTask.getCheck_status() != null) {
             TaskStatus taskStatus = new TaskStatus();
             taskStatus.setCheck_status(fwqCheckTask.getCheck_status());
-            taskStatus.setCheck_status_name((commonService.getCodeMap().get("task_status_"+fwqCheckTask.getCheck_status())).getCode_name());
-            User u = commonService.getUserMap().get((long)fwqCheckTask.getUpdate_user());
-            if(u!=null){
+            taskStatus.setCheck_status_name((commonService.getCodeMap().get("task_status_" + fwqCheckTask.getCheck_status())).getCode_name());
+            User u = commonService.getUserMap().get((long) fwqCheckTask.getUpdate_user());
+            if (u != null) {
                 taskStatus.setUpdate_username(u.getTruename());
             }
-            taskStatus.setTask_id((long)fwqCheckTask.getId());
+            taskStatus.setTask_id((long) fwqCheckTask.getId());
             fwqTaskDao.insertStatus(taskStatus);
 
 
@@ -117,8 +125,8 @@ public class TaskServiceImpl implements TaskService_F {
         List<User> users = taskData_f.getUsers();
 
         CheckTaskPeriod p = commonService.getCheckTaskPeriod(checkAreaData.get(0).getStart_time().getTime(), checkAreaData.get(0).getEnd_time().getTime());
-        if(p==null) {
-           throw new Exception("所选任务超出当前稽查周期内！");
+        if (p == null) {
+            throw new Exception("所选任务超出当前稽查周期内！");
         }
 
         try {
@@ -155,19 +163,19 @@ public class TaskServiceImpl implements TaskService_F {
                     fwqTaskDao.addtask(t);
                     TaskStatus taskStatus = new TaskStatus();
                     taskStatus.setCheck_status(t.getCheck_status());
-                    taskStatus.setCheck_status_name((commonService.getCodeMap().get("task_status_"+t.getCheck_status())).getCode_name());
-                    User u = commonService.getUserMap().get((long)taskData_f.getUser_id());
-                    if(u!=null){
+                    taskStatus.setCheck_status_name((commonService.getCodeMap().get("task_status_" + t.getCheck_status())).getCode_name());
+                    User u = commonService.getUserMap().get((long) taskData_f.getUser_id());
+                    if (u != null) {
                         taskStatus.setUpdate_username(u.getTruename());
                     }
-                    taskStatus.setTask_id((long)t.getId());
+                    taskStatus.setTask_id((long) t.getId());
                     fwqTaskDao.insertStatus(taskStatus);
 
-                }catch (Exception e){
+                } catch (Exception e) {
                     logger.error(e.getMessage());
                 }
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error(e.getMessage());
         }
     }

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java

@@ -17,6 +17,8 @@ public class FwqCheckTask implements Serializable {
     private Integer id;
     private String name;
     private Integer check_status;
+    private Integer check_status_end;
+
     private Integer[] check_status_arr;
     private Integer area_id;
     private String area_name;
@@ -40,6 +42,7 @@ public class FwqCheckTask implements Serializable {
     private Integer rule_id;
     private String remark;
     private Long recheckman;
+    private String recheckman_name;
     private Integer period_id;
     private Integer invalid_from;