Merge remote-tracking branch 'origin/master'

src/main/java/com/founder/interservice/regionalanalysis/controller/RegionalAnalysisController.java

@@ -460,28 +460,28 @@ public class RegionalAnalysisController {
                     }
                     switch (taskVO.getState()){
                         case "QUEUEING":
-                            taskVO.setState("等候中");
+                            taskVO.setState("任务等待中");
                             break;
                         case "STARTING":
-                            taskVO.setState("开始运行");
+                            taskVO.setState("任务开始");
                             break;
                         case "RUNNING":
-                            taskVO.setState("运行中");
+                            taskVO.setState("任务进行中");
                             break;
                         case "FINISHED":
-                            taskVO.setState("标识号调取完成");
+                            taskVO.setState("任务已完成");
                             break;
                         case "TIMEOUT":
-                            taskVO.setState("计算超时");
+                            taskVO.setState("任务超时");
                             break;
                         case "END":
-                            taskVO.setState("比对碰撞已完成");
+                            taskVO.setState("任务比对完成");
                             break;
                         case "ERROR":
-                            taskVO.setState("执行错误");
+                            taskVO.setState("任务异常");
                             break;
                         case "default":
-                            taskVO.setState("运行中");
+                            taskVO.setState("任务等待中");
                             break;
                     }
                     taskVO.setQyCount(regionalAnalysisService.quertRegionalCountByTaskId(taskVO.getTaskId()));
@@ -594,6 +594,8 @@ public class RegionalAnalysisController {
                     if (null == zjhm || "".equals(zjhm)) {
                         tsaf.setName("--");
                         tsaf.setZjlx("--");
+                        tsaf.setSex("--");
+                        tsaf.setBirthday("--");
                         tsaf.setZjhm("非本市户籍人员");
                     }
                     if (tsaf.getAge() == null || "".equals(tsaf.getAge())) {

src/main/java/com/founder/interservice/spatiotemporalBackTrack/controller/SpatiotemporalBackTrackController.java

@@ -277,7 +277,7 @@ public class SpatiotemporalBackTrackController {
         }
         //进度
         String progress = "";
-        if (null != prosessTag) {
+        if (null != prosessTag && !"".equals(prosessTag)) {
             if("1".equals(prosessTag)){
                 progress = "100%";
             }else if("0".equals(prosessTag)){

src/main/resources/static/js/qypzjgxsNew.js

@@ -57,14 +57,17 @@ function doClearFl(){
     });
 }
 var table_title =[
-    {title:"标识号",field:"objectValue",align:'center',width:'24%',formatter:function(val,row,index){
+    {title:"标识号",field:"objectValue",align:'center',width:'22%',formatter:function(val,row,index){
         return getBshYchy(row);}},
-    {title:"标识号类型",field:"objectTypeName",align:'center',width:'12%'},
-    {title:"所属区域",field:"regionlist",align:'center',width:'12%'},
-    {title:"姓名",field:"name",align:'center',width:'12%',formatter:function(val,row,index){
+    {title:"标识号类型",field:"objectTypeName",align:'center',width:'10%'},
+    {title:"所属区域",field:"regionlist",align:'center',width:'10%'},
+    {title:"姓名",field:"name",align:'center',width:'8%',formatter:function(val,row,index){
         return getRybq(row);}},
-    {title:"证件类型",field:"zjlx",align:'center',width:'20%'},
-    {title:"证件号码",field:"zjhm",align:'center',width:'20%',formatter:function(val,row,index){
+    {title:"性别",field:"sex",align:'center',width:'10%',formatter:function(val,row,index){
+        return getXbmc(row);}},
+    {title:"出生日期",field:"birthday",align:'center',width:'12%'},
+    {title:"证件类型",field:"zjlx",align:'center',width:'10%'},
+    {title:"证件号码",field:"zjhm",align:'center',width:'18%',formatter:function(val,row,index){
         return getSfzhYchy(row);
     }}
 ];
@@ -268,6 +271,8 @@ function doQueryqk(){
         } else {
             srcurl = rows[k].zp;
         }
+        //处理性别
+        var sexValue = getXbmc(rows[k]);
         html+='<div class="currResult">' +
             '            <p class="currResultPImg">' +
             '               <img src="' + srcurl + '">' +
@@ -293,6 +298,12 @@ function doQueryqk(){
             '                <span id="" class="navSpan noLinkSpan singleColumns" title="'+rows[k].zjhm+'">'+rows[k].zjhm+'</span>\n' +
             '                <span class="navSpan rtitleSpan noLinkSpan">年龄：</span>\n' +
             '                <span id="" class="navSpan noLinkSpan singleColumns" title="'+rows[k].age+'">'+rows[k].age+'</span>\n' +
+            '                <span class="navSpan rtitleSpan noLinkSpan">性别：</span>\n' +
+            '                <span id="" class="navSpan noLinkSpan singleColumns" title="'+sexValue+'">'+sexValue+'</span>\n' +
+            '                <span class="navSpan rtitleSpan noLinkSpan">出生日期：</span>\n' +
+            '                <span id="" class="navSpan noLinkSpan singleColumns" title="'+rows[k].birthday+'">'+rows[k].birthday+'</span>\n' +
+            '            </p>\n' +
+            '            <p class="currResultP">\n' +
             '                <span class="navSpan rtitleSpan noLinkSpan">现住址地址：</span>\n' +
             '                <span id="" class="navSpan noLinkSpan singleColumns" title="'+rows[k].xzzDzmc+'">'+rows[k].xzzDzmc+'</span>\n' +
             '                <span class="navSpan rtitleSpan noLinkSpan">出生地地址：</span>\n' +
@@ -628,6 +639,24 @@ function goSlide(thisObj){
     }
 }
 
+//获取性别
+function getXbmc(rows){
+    var sex = rows.sex;
+    var sexStr = "";
+    if (sex == "" || sex == null || sex == undefined || sex == "0"){
+        sexStr = "未知的性别";
+    } else if (sex == "1"){
+        sexStr = "男";
+    } else if (sex == "2"){
+        sexStr = "女";
+    } else if (sex == "9"){
+        sexStr = "未说明的性别";
+    } else {
+        sexStr = sex;
+    }
+    return sexStr;
+}
+