tijiao

VisualInspection/fwq/js/appeal_management/appeal_list.js

@@ -54,7 +54,7 @@ function initAppealList() {
 }
 
 function queryAppeal() {
-    var t = getTimeByMonth(GV("#start_time"));
+    var t = getTimeByMonth($("#start_time").val());
 
     var data = {
         "start_time": getMomentTimeFormat(t.starttime),

VisualInspection/fwq/js/appeal_management/appeal_submited.js

@@ -1,6 +1,6 @@
 // var page_size=10;
 function querySubmitedAppealTask() {
-    var t = getTimeByMonth(GV("#start_time"));
+    var t = getTimeByMonth($("#start_time").val());
     var data = {
         "start_time": getMomentTimeFormat(t.starttime),
         "end_time": getMomentTimeFormat(t.endtime),
@@ -16,7 +16,7 @@ function querySubmitedAppealTask() {
     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, colClass: '', field: 'area_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: 120, text: '稽查时间段', type: 'string', flex: true, sort: 'down', field: 'check_period' },

VisualInspection/fwq/view/appeal_management/appealDetail.html

@@ -1,7 +1,7 @@
 <div class="container-fluid ">
     <form class="form-horizontal" style="margin-top:10px;">
         <input type="hidden" class="form-control" id="apply_id" disabled="disabled" placeholder="">
-       
+
         <div class="form-group">
             <label class="col-md-2">申诉原因：</label>
             <div class="col-md-10">
@@ -20,52 +20,59 @@
     </form>
 </div>
 <script>
-    var file_src="";
+    var file_src = "";
     $('#uploaderExample').uploader({
-        autoUpload: true,            // 当选择文件后立即自动进行上传操作
-        url: base_image_server_url +'fileServer/file/upload',  // 文件上传提交地址
-        filters:{
-            mime_types: [
-                {title: '图片', extensions: 'jpg,gif,png'},
-                {title: '图标', extensions: 'ico'},
-                {title: '视频', extensions: 'mp4,avi'},
-                {title: '文档', extensions: 'doc,docx'}
-            ],
+        autoUpload: true, // 当选择文件后立即自动进行上传操作
+        url: base_image_server_url + 'fileServer/file/upload', // 文件上传提交地址
+        filters: {
+            mime_types: [{
+                title: '图片',
+                extensions: 'jpg,gif,png'
+            }, {
+                title: '图标',
+                extensions: 'ico'
+            }, {
+                title: '视频',
+                extensions: 'mp4,avi'
+            }, {
+                title: '文档',
+                extensions: 'doc,docx'
+            }],
             // 不允许上传重复文件
             prevent_duplicates: true
         },
-        onFileUploaded: function(file, responseObject){
-            var datas = eval('('+responseObject.response+')');
-            file_src += datas.result_data.path+",";
+        onFileUploaded: function(file, responseObject) {
+            var datas = eval('(' + responseObject.response + ')');
+            file_src += datas.result_data.path + ",";
         },
-        onFilesRemoved:function(files) {
+        onFilesRemoved: function(files) {
             // alert(files);
         }
     });
- $(document).ready(function() {
-    //  initUpLoad();
- });
+    $(document).ready(function() {
+        //  initUpLoad();
+    });
 
- function saveAppeal(){
-    if(file_src.substr(file_src.length-1,1)==",") file_src = file_src.substr(0,file_src.length-1);
-    if($("#add_appeal_reason").val()=="" || $("#add_appeal_reason").val()==null){
-        layer.alert("原因不能为空！");
-        return;
-    }
-    if($("#add_appeal_reason").val() && $("#add_appeal_reason").val().length>2000){
-        layer.alert("原因长度不能超过2000字！");
-        return;
-    }
-    var param = {
-        "task_id": $.checkTask.id,
-        "appeal_reason": $("#add_appeal_reason").val(),
-        "file_src":file_src
-    }
-    no_return_common_service("/checkAppeal/add/", param, function (data) {
-        layer.msg("申诉提交成功", {
-            time: 2000//20s后自动关闭
+    function saveAppeal() {
+        if (file_src.substr(file_src.length - 1, 1) == ",") file_src = file_src.substr(0, file_src.length - 1);
+        if ($("#add_appeal_reason").val() == "" || $("#add_appeal_reason").val() == null) {
+            layer.alert("原因不能为空！");
+            return;
+        }
+        if ($("#add_appeal_reason").val() && $("#add_appeal_reason").val().length > 2000) {
+            layer.alert("原因长度不能超过2000字！");
+            return;
+        }
+        var param = {
+            "task_id": $.checkTask.id,
+            "appeal_reason": $("#add_appeal_reason").val(),
+            "file_src": file_src
+        }
+        no_return_common_service("/f/checkAppeal/add/", param, function(data) {
+            layer.msg("申诉提交成功", {
+                time: 2000 //20s后自动关闭
+            });
+            redirectLastPage();
         });
-        redirectLastPage();
-    });
- }
- </script>
+    }
+</script>

VisualInspection/fwq/view/task/taskDetail.html

@@ -144,8 +144,6 @@
         $.zui.store.set("task_detail_btn_" + ROLE_JICHA_ADMIN + "_11", ["#assignBtn"]);
         $.zui.store.set("task_detail_btn_" + ROLE_FWQ_ADMIN + "_5", ["#confirmBtn", "#appealBtn"]);
         $.zui.store.set("task_detail_btn_" + ROLE_FWQ_ADMIN + "_15", ["#confirmAppealBtn"]);
-        $.zui.store.set("task_detail_btn_" + ROLE_FWQ_AGENT + "_5", ["#confirmBtn", "#appealBtn"]);
-        $.zui.store.set("task_detail_btn_" + ROLE_FWQ_AGENT + "_15", ["#confirmAppealBtn"]);
     }
 
     function checkAuth() {
@@ -153,7 +151,6 @@
         showBtn(ROLE_JICHA, $.checkTask.check_status);
         showBtn(ROLE_JICHA_ADMIN, $.checkTask.check_status);
         showBtn(ROLE_FWQ_ADMIN, $.checkTask.check_status);
-        showBtn(ROLE_FWQ_AGENT, $.checkTask.check_status);
     }
 
     function showBtn(role, status) {

VisualInspection_server/pom.xml

@@ -308,7 +308,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>

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

@@ -154,8 +154,8 @@ public class CheckAppealController_F extends BaseController {
     	}else if(AuthorUtil.hasRole(user, Constants.ROLE_JICHA)){
     		task.setRecheckman(new Long(user.getId()));
     	}
-    	List<FwqCheckTask> taskList = (List<FwqCheckTask>) taskService.getAllTask(0,0,task);
+        Object  taskList =  taskService.getAllTask(page,size,task);
     	if(taskList==null) return super.returnSuccessResult(new PageInfo(new ArrayList()));
-    	return super.returnSuccessResult(new PageInfo(taskList));
+    	return super.returnSuccessResult(taskList);
     }
 }

VisualInspection_server/src/main/resources/application.properties

@@ -4,7 +4,7 @@ context.listener.classes=com.xintong.SystemInit
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -14,7 +14,7 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 ## \u7528\u6237\u6570\u636E\u6E90\u914D\u7F6E
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url=jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+cluster.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root

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

@@ -29,7 +29,7 @@
     </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 from check_task where 1=1
+        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>

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

@@ -17,6 +17,7 @@ import com.xintong.visualinspection.pojo.fwq.TaskData_F;
 import com.xintong.visualinspection.service.CommonService;
 import com.xintong.visualinspection.service.TaskService_F;
 import com.xintong.visualinspection.util.CacheUtil;
+import com.xintong.visualinspection.util.CodeUtil;
 import com.xintong.visualinspection.util.Constants;
 import com.xintong.visualinspection.visuallnspection_fjq.dao.FwqTaskDao;
 import org.slf4j.LoggerFactory;
@@ -59,6 +60,20 @@ public class TaskServiceImpl implements TaskService_F {
                 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))) {

Visuallnspection_fjq/visuallnspection_fjq/src/main/resources/application.properties

@@ -26,7 +26,7 @@ dubbo.consumer.check=false
 
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection_2?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection_2?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection_2?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root

Visuallnspection_fjq/visuallnspectioninteface/.idea/compiler.xml

@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <resourceExtensions />
     <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Maven default annotation processors profile" enabled="true">
+      <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
         <module name="visuallnspectioninteface" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="visuallnspectioninteface" target="1.6" />
-    </bytecodeTargetLevel>
   </component>
 </project>

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

@@ -19,6 +19,7 @@ public class FwqCheckTask implements Serializable {
     private Integer check_status;
     private Integer[] check_status_arr;
     private Integer area_id;
+    private String area_name;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date create_time;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -28,11 +28,11 @@ public class FwqStatisticsBo implements Serializable {
 
     private int check_all_score = 0;
 
-    private List<String> checked_socre_name = new ArrayList<>();
+    private List<String> checked_socre_name = new ArrayList<String>();
 
-    private List<Integer> checked_score = new ArrayList<>();
+    private List<Integer> checked_score = new ArrayList<Integer>();
 
-    private List<Integer> emp_item_score = new ArrayList<>();
+    private List<Integer> emp_item_score = new ArrayList<Integer>();
 
     private String check_score_avg;