Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/VisualInspection

VisualInspection/fwq/js/task/apply_task.js

@@ -1,3 +1,5 @@
+var cur_page;
+
 function initApplyPage() {
     // 仅选择日期
     $.jeDate("#start_time", {
@@ -8,6 +10,32 @@ function initApplyPage() {
 
     setSASelect("#fsList");
 
+    var store_params = $.zui.store.get('store_param_' + current_url);
+    var checked_dept = null;
+    if (store_params) {
+        checked_dept = store_params.checked_dept;
+        // $("#start_time").val(store_params.end_time.substr(0, 7));
+        $("#start_time").val(store_params.end_time.substr(0, 7));
+       if(store_params.invalidFrom == -2){
+            $("#check_zc").attr("checked", false);
+            $("#check_ss").attr("checked", false);
+       }else if(store_params.invalidFrom == 1){
+            $("#check_zc").attr("checked", false);
+            $("#check_ss").attr("checked", true);
+       }else if(store_params.invalidFrom == 0){
+        $("#check_zc").attr("checked", true);
+        $("#check_ss").attr("checked", false);
+       }else if(store_params.invalidFrom == -1){
+        $("#check_zc").attr("checked", true);
+        $("#check_ss").attr("checked", true);
+       }
+       console.log(store_params);
+       var pager = $.zui.store.get("pager");
+       console.log(pager);
+       cur_page = pager.p_cur;
+    } else {
+        $("#start_time").val(getCurrentTimeFormat());
+    }
 
     var page_params = $.zui.store.get("page_params");
     if (page_params && page_params.status) {
@@ -87,8 +115,12 @@ function queryUnexaminedTask() {
         'cols': cols,
         'checkable': checkable,
         'url': "/f/task/getall/",
-        'param': data
+        'param': data,
+        'pager': {
+            'p_cur': cur_page
+        }
     });
+    $.zui.store.set('store_param_' + current_url, data);
 }
 //进入稽查页面
 function showCheck(id) {
@@ -186,8 +218,18 @@ function refuseApply(taskId) {
 }
 
 function agreeApplyTaskPatch() {
+    var check_ss = $("#check_ss").prop("checked");
+    var check_zc = $("#check_zc").prop("checked");
+    var t = getTimeByMonth($("#start_time").val());
     var param = {
-        'apply_ids': $('#unexamined_datatable').mytable('getTableCheckedIds')
+        "start_time": new Date(t.starttime),
+        "end_time": new Date(t.endtime),
+        "checked_dept": $("#fsList").val(),
+        "invalidFrom": (check_ss && check_zc) ? -1 : (check_ss ? 1 : (check_zc ? 0 : -2))
+        // 'apply_ids': $('#unexamined_datatable').mytable('getTableCheckedIds')
     };
-    addOrUpdateItem4Common(param, '/f/checkApply/agreePatch', queryUnexaminedTask);
+    con=confirm("确定全部无效?");
+    if(con == true){
+        addOrUpdateItem4Common(param, '/f/checkApply/agreePatch', queryUnexaminedTask);
+    }
 }

VisualInspection/js/assess_management/assess_item.js

@@ -277,16 +277,16 @@ function delete_check_item(id ){
             zdataItem["children"] = addobj(m);
              zdataItem.open = true ;
              console.log(user.position_name);
-             if(user.position_name.indexOf('清障队稽查管理员') === 0){
-                 if(m.id == 291 || m.id == 305 || m.id == 306 || m.id == 307){
+             if(user.position_name.indexOf('收费站稽查管理员') === 0){
+                 if(m.id == 271 || m.id == 47 || m.id == 412 || m.id == 208 || m.id == 211){
                     zdata.push(zdataItem);
                  }
              }else if(user.position_name.indexOf('服务区稽查管理员') === 0){
                 if(m.id == 502){
                     zdata.push(zdataItem);
                  }
-             }else if(user.position_name.indexOf('收费站站长') === 0){
-                if(m.id == 47){
+             }else if(user.position_name.indexOf('清障队稽查管理员') === 0){
+                if(m.id == 836){
                     zdata.push(zdataItem);
                  }
              }else{

VisualInspection/qzd/js/task/check.js

@@ -5,7 +5,6 @@ var videoid;
 function dbclick() {
 
     if (isfullscreen) {
-        console.log(isfullscreen);
         if (layer_full) {
             layer.close(layer_full);
             videoPlayer.videoPlay();
@@ -130,11 +129,12 @@ function initCheck() {
             variable: 'player', //该属性必需设置，值等于下面的new chplayer()的对象
             //poster: 'pic/wdm.jpg', //封面图片
             autoplay: true,
+           // loaded:'loadedHandler',//监听播放器加载成功
             video: base_image_server_url + videoid //视频地址
            // video: "file:///H://N3J4803_00030220180708095248_1289.MP4"   //视频地址
         };
         videoPlayer = new ckplayer(videoObject);
-       // videoPlayer.addListener('time', timeHandler);
+        videoPlayer.addListener('time', timeHandler);
     }else {
            $(".nav-secondary").hide();
     }
@@ -168,7 +168,6 @@ function initCheck() {
 
 function onvideoselect(obj) {
     videoid = (obj.value);
-    console.log(videoid)
     var videoObject = {
         container: '.video', //“#”代表容器的ID，“.”或“”代表容器的class
         variable: 'player', //该属性必需设置，值等于下面的new chplayer()的对象
@@ -253,7 +252,6 @@ function getAreaCheckCount() {
     var url = base_server_url + "/q/task/getTasks/0/0";
     ajaxPost(url, param, function(response) {
         for (var i in userids) {
-            // console.log(response);
             var html = '<label id="' + userids[i] + '"></label>' + usernames[i] + '(次数:' +
                 '<a href="javascript:void(0)" onclick="showCheckDetailCount(\'' + userids[i] + '\')"><span class="label label-primary" id="">' + response[i].length + '</span></a>)';
             $("#checked_area").append(html);
@@ -410,7 +408,6 @@ function showEditCheckScore(id) {
     var list = new Array();
     var userids = $.checkTask.checked_users.split(",");
     var usernames = $.checkTask.checked_users_name.split(",");
-    console.log(rowData);
     var optStr = '';
     for (var i in userids) {
         if (userids[i] == rowData.checked_area)
@@ -468,7 +465,6 @@ function saveScoreEdit() {
     };
     editScoreId = null;
     $("#saveEditBtn").hide();
-    console.log(param);
     no_return_common_service("/q/score/update", param, function(data) {
         if (scoreLayer) layer.close(scoreLayer);
         //查询评分情况
@@ -692,13 +688,11 @@ var scoreLayer;
 function showScore() {
     scoreLayer = showPopup4Common('选择考核项', function(data) {
         var nodes = check_item_tree.getSelectedNodes()[0];
-        console.log(nodes);
         var data = {
             "content": nodes.value,
             "check_item_score": nodes.score,
             "checked_person_name": $.checkTask.checkman_name
         }
-        console.log(data);
     }, ['400px', '500px'], '#items-div', 'r');
     buildTree();
 }

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

@@ -6,6 +6,7 @@ import com.mysql.jdbc.StringUtils;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.CheckItem;
 import com.xintong.visualinspection.bean.CheckRule;
+import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.CheckRuleService;
 import com.xintong.visualinspection.service.ItemService;
 import com.xintong.visualinspection.util.CacheUtil;
@@ -15,7 +16,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,10 +44,29 @@ public class CheckRuleController extends BaseController {
      * @since  1.0.0
      */
     @RequestMapping(value = "/getAllRule/{page}/{size}")
-    public String getAllRules(@Valid @RequestBody CheckRule checkRule,@PathVariable Integer page,@PathVariable Integer size){
+    public String getAllRules(HttpServletRequest request,@Valid @RequestBody CheckRule checkRule, @PathVariable Integer page, @PathVariable Integer size){
+		User user = getCurrentUser(request);
     	PageHelper.startPage(page, size); 
     	List<CheckRule> crList = checkRuleService.getAllAndCountItem(checkRule);
-    	return super.returnSuccessResult(new PageInfo(crList));
+		List<CheckRule> aList = new ArrayList<>();
+    	for(CheckRule c :crList){
+            if(user.getPositionid() == 22){
+                if(c.getChecked_person_type().equals("3")){
+                     aList.add(c);
+				}
+			}else if(user.getPositionid() == 23){
+				if(c.getChecked_person_type().equals("2")){
+					aList.add(c);
+				}
+			}else if(user.getPositionid() == 24){
+				if(c.getChecked_person_type().equals("1")){
+					aList.add(c);
+				}
+			}else{
+            	aList.add(c);
+			}
+		}
+    	return super.returnSuccessResult(new PageInfo(aList));
     }
    
     /**

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/CheckApplyController_F.java

@@ -74,7 +74,7 @@ public class CheckApplyController_F extends BaseController {
     	task.setCheck_status(checkAppeal.getCheck_status());
     	task.setUpdate_user(new Long(u.getId()));
     	if(checkAppeal.isIsappeal()){
-    	    task.setInvalidFrom(1);
+    	    task.setInvalid_from(1);
         }
     	taskService.updateStatus(task);
     	return super.returnSuccessResult("添加成功");
@@ -128,9 +128,9 @@ public class CheckApplyController_F extends BaseController {
      */
     @RequestMapping(value = "/agreePatch")
     public String agreePatch(HttpServletRequest request,@Valid @RequestBody CheckApply_F checkAppeal){
-    	if(checkAppeal.getApply_ids()==null) {
-    		throw new BusinessException(20001); 
-    	}
+//    	if(checkAppeal.getApply_ids()==null) {
+//    		throw new BusinessException(20001);
+//    	}
     	User user = getCurrentUser(request);
     	List<CheckApply_F> checkApplyList = checkApplyService.getList(checkAppeal);
     	for(CheckApply_F ca :checkApplyList) {

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/controller/FileExcelController_F.java

@@ -113,7 +113,7 @@ public class FileExcelController_F extends BaseController {
     @RequestMapping(value = "/user/static/excel",method=RequestMethod.GET)
     public String getUserStatistic(HttpServletRequest req,HttpServletResponse resp,
                                    ServiceAreaStatistic obj){
-        statisticsService_f.getFwqStatistic(obj, req, resp);
+       // statisticsService_f.getFwqStatistic(obj, req, resp);
         return super.returnSuccessResult(null);
     }
 

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

@@ -31,6 +31,7 @@
         	<![CDATA[ AND ct.end_time < #{end_time}]]>
         </if>
         <if test="apply_dept != null">AND ca.apply_dept = #{apply_dept}</if>
+        <if test="checked_dept != null">AND ct.checked_dept = #{checked_dept}</if>
         <if test="apply_man != null">AND ct.checkman = #{apply_man}</if>
         <if test="apply_ids != null and apply_ids.length > 0">AND
        		ct.id in 
@@ -39,6 +40,13 @@
 	            #{apply_id}
 	        </foreach>
        	</if>
+        <if test="invalidFrom == -1">AND
+            ( ct.invalid_from = 0 OR ct.invalid_from = 1)
+        </if>
+
+        <if test="invalidFrom != null  and invalidFrom != -1">AND
+            ct.invalid_from = #{invalidFrom}
+        </if>
         ORDER BY ct.start_time DESC
     </select>
 

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

@@ -55,7 +55,6 @@
         check_dept_score
         SET
         <if test="score != null">score = #{score},</if>
-        <if test="scoreWxfw != null">score_wxfw = #{scoreWxfw},</if>
         <if test="integral != null">integral = #{integral},</if>
         id = id
         WHERE
@@ -64,9 +63,9 @@
     <sql id="insertc">
          INSERT INTO
         check_dept_score
-        (dept_id,period_id,score,score_wxfw,integral)
+        (dept_id,period_id,score,integral)
         VALUES
-        (#{dept_id}, #{period_id},#{score},#{scoreWxfw},#{integral})
+        (#{dept_id}, #{period_id},#{score},#{integral})
     </sql>
 
     <select id="selectdepts" parameterType="com.xintong.visualinspection.bean.FwqDeptStatistic" resultMap="BaseResultMap">

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

@@ -89,6 +89,7 @@
         update check_task set
         <if test="check_status != null">check_status = #{check_status},</if>
         <if test="recheckman != null">recheckman = #{recheckman},</if>
+        <if test="invalid_from != null">invalid_from = #{invalid_from},</if>
         update_time=now()
         WHERE
         id = #{id}

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/StatisticsService_F.java

@@ -2,12 +2,9 @@ package com.xintong.visualinspection.visuallnspection_fjq.service;
 
 import com.xintong.visualinspection.bean.FwqDeptStatistic;
 import com.xintong.visualinspection.bean.FwqStatisticsBean;
-import com.xintong.visualinspection.pojo.fwq.FwqStatisiticPojo;
-import com.xintong.visualinspection.pojo.fwq.ServiceAreaStatistic;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 public interface StatisticsService_F {
 
@@ -16,8 +13,4 @@ public interface StatisticsService_F {
     void getDeptStatisticExcel(FwqDeptStatistic fwqDeptStatistic, HttpServletRequest req, HttpServletResponse resp);
 
     void getFeeStationCheckItemScore(FwqStatisticsBean obj, HttpServletRequest req, HttpServletResponse resp);
-
-    List<FwqStatisiticPojo> getFwqStatistic(ServiceAreaStatistic obj);
-
-    void getFwqStatistic(ServiceAreaStatistic obj, HttpServletRequest req, HttpServletResponse resp);
 }

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

@@ -7,8 +7,6 @@ import com.xintong.visualinspection.bean.FwqDeptStatistic;
 import com.xintong.visualinspection.bean.FwqStatisticsBean;
 import com.xintong.visualinspection.bean.Item;
 import com.xintong.visualinspection.bean.Organ;
-import com.xintong.visualinspection.pojo.fwq.FwqStatisiticPojo;
-import com.xintong.visualinspection.pojo.fwq.ServiceAreaStatistic;
 import com.xintong.visualinspection.service.CommonService;
 import com.xintong.visualinspection.visuallnspection_fjq.dao.FwqCheckDeptStatisticsDao;
 import com.xintong.visualinspection.visuallnspection_fjq.dao.FwqStatisticsDao;
@@ -85,7 +83,7 @@ public class StatisticsService_FImpl implements StatisticsService_F {
         List<FwqStatisticsBean> onsite_beans = fwqStatisticsDao.getselectFeeStationOperationScoreDetail(obj);
 
         for (FwqStatisticsBean company_bean : company_beans) {
-            mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(15);
+            mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(company_bean.getChecked_num());
             mapStationInfos.get(company_bean.getDept_id()).setCompany_total_score(company_bean.getAll_check_score());
         }
         for (FwqStatisticsBean third_bean : third_beans) {
@@ -111,9 +109,11 @@ public class StatisticsService_FImpl implements StatisticsService_F {
             value.setOnsite_check_num(1);
             // 设置总平均扣分
             if (value.getCompany_check_num() > 0 || value.getThird_check_num() > 0) {
-                avg += value.getCompany_total_score() / 15.0 * 0.3 + value.getThird_total_score() * 0.4 + value.getOnsite_total_score() * 0.3;
+                avg += (value.getCompany_total_score() + value.getThird_total_score()) / 2.0 / (value.getCompany_check_num() + value.getThird_check_num());
+            }
+            if (value.getOnsite_check_num() > 0) {
+                avg += value.getOnsite_total_score() / 2.0 / value.getOnsite_check_num();
             }
-
             value.setCheck_total_avg(df.format(avg));
             // 设置平均得分
             Float score_avg = (1000 - Float.valueOf(df.format(avg)));
@@ -589,141 +589,6 @@ public class StatisticsService_FImpl implements StatisticsService_F {
         exportExcel("温馨服务检查情况统计表", "fwq_checked_item_info", map, resp);
     }
 
-    @Override
-    public List<FwqStatisiticPojo> getFwqStatistic(ServiceAreaStatistic obj) {
-
-        List<CheckTaskPeriod> checkTaskPeriods = commonService.getAllCheckTaskPeriod();
-        Map<Long, Organ> deptMap = commonService.getDeptMap();
-
-        for (CheckTaskPeriod p : checkTaskPeriods) {
-            if (obj.getStart_date() + 1 * 1000 * 60 * 60 == p.getEndtime().getTime()) {
-                obj.setStartperiod_id(p.getId());
-            }
-            if (obj.getEnd_date() + 1 * 1000 * 60 * 60 == p.getEndtime().getTime()) {
-                obj.setEndperiod_id(p.getId());
-            }
-        }
-        if (obj.getStart_date() > (checkTaskPeriods.get(checkTaskPeriods.size() - 1).getEndtime().getTime() - 1 * 1000 * 60 * 60)) {
-            return new ArrayList<>();
-        }
-        if (obj.getEnd_date() < (checkTaskPeriods.get(0).getEndtime().getTime() - 1 * 1000 * 60 * 60)) {
-            return new ArrayList<>();
-        }
-        if (obj.getStart_date() < (checkTaskPeriods.get(0).getEndtime().getTime() - 1 * 1000 * 60 * 60)) {
-            obj.setStartperiod_id(checkTaskPeriods.get(0).getId());
-        }
-        if (obj.getEnd_date() > (checkTaskPeriods.get(checkTaskPeriods.size() - 1).getEndtime().getTime() - 1 * 1000 * 60 * 60)) {
-            obj.setEndperiod_id(checkTaskPeriods.get(checkTaskPeriods.size() - 1).getId());
-        }
-
-        List<CheckTaskPeriod> temp_p = new ArrayList<>();
-        for (CheckTaskPeriod p : checkTaskPeriods) {
-            if (p.getId() >= obj.getStartperiod_id() && p.getId() <= obj.getEndperiod_id()) {
-                temp_p.add(p);
-            }
-        }
-
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM");
-        //获取满足条件的服务区
-        List<ServiceAreaStatistic> fwqStatistics = fwqStatisticsDao.selectlimituser(obj);
-
-        HashMap<Integer, List<ServiceAreaStatistic>> usm = new HashMap<>();
-
-        for (ServiceAreaStatistic c : fwqStatistics
-                ) {
-            List<ServiceAreaStatistic> s = usm.get(c.getDept_id());
-            if (s == null) {
-                s = new ArrayList<>();
-            }
-            s.add(c);
-            usm.put(c.getDept_id(), s);
-            for (CheckTaskPeriod p : checkTaskPeriods) {
-                if (c.getPeriod_id().equals(p.getId())) {
-                    c.setP_str(simpleDateFormat.format(p.getEndtime()));
-                }
-            }
-        }
-
-        List<FwqStatisiticPojo> fwq_ids = new ArrayList<>();
-
-        //判断是否连续
-        for (Integer k : usm.keySet()) {
-            List<ServiceAreaStatistic> user_temp = new ArrayList<>();
-            boolean isM = false;
-
-            List<ServiceAreaStatistic> pp = new ArrayList<>();
-            //获取得分
-            List<ServiceAreaStatistic> ll = usm.get(k);
-            int count = 0;
-            for (CheckTaskPeriod p : temp_p) {
-                boolean isfond = false;
-                for (ServiceAreaStatistic s : ll) {
-                    if (s.getPeriod_id().equals(p.getId())) {
-                        isfond = true;
-                        pp.add(s);
-                        break;
-                    }
-                }
-                if (isfond) {
-                    count++;
-                    if (count >= obj.getLimitnumber()) {
-                        isM = true;
-                        user_temp.addAll(pp);
-                        pp.clear();
-                    }
-                } else {
-                    if (count >= obj.getLimitnumber()) {
-                        isM = true;
-                        user_temp.addAll(pp);
-                    }
-                    count = 0;
-                    pp.clear();
-                }
-            }
-
-            if (isM) {
-                FwqStatisiticPojo p = new FwqStatisiticPojo();
-                p.setDept_id(k.longValue());
-                p.setDept(deptMap.get(k.longValue()).getOrganname());
-                p.setFwqStatistics(user_temp);
-                fwq_ids.add(p);
-            }
-        }
-
-        for (FwqStatisiticPojo s:fwq_ids ) {
-            String dat = "";
-            for (ServiceAreaStatistic statistic : s.getFwqStatistics()) {
-                dat += statistic.getP_str() + "月、";
-            }
-            dat = dat.substring(0, dat.length() - 1);
-            s.setDes(dat);
-        }
-
-        return fwq_ids;
-    }
-
-    @Override
-    public void getFwqStatistic(ServiceAreaStatistic obj, HttpServletRequest req, HttpServletResponse resp) {
-        List<FwqStatisiticPojo> list = this.getFwqStatistic(obj);
-        SimpleDateFormat d = new SimpleDateFormat("yyyy/MM");
-        String name = "";
-        if ("2".equals(obj.getSctype())) {
-            name = "综合得分";
-        } else if ("1".equals(obj.getSctype())) {
-            name = "温馨服务得分";
-        }
-        List<Integer> temp = new ArrayList<>();
-        for (int i = 1; i <= list.size(); i++) {
-            temp.add(i);
-        }
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("list", temp);
-        map.put("datas", list);
-        map.put("title", "服务区" + name + "连续月统计" + "(" + d.format(obj.getStart_date()) + "---" + d.format(obj.getEnd_date()) + ")");
-        exportExcel("服务区连续月统计", "fwq_user_statistic", map, resp);
-    }
-
     private void exportExcel(String fileName, String excelTemplateName, Map<String, Object> map,
                              HttpServletResponse resp) {
         String path = "./" + fileName + ".xls";

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

@@ -58,4 +58,8 @@ public class CheckApply_F implements Serializable {
     private Integer count;
 
     private boolean isappeal;
+
+    private Long checked_dept;
+
+    private Integer invalidFrom;
 }