Merge branch 'ythcj_hunan' of http://47.92.108.28/yangliang/hnxtbaboot into ythcj_hunan

src/main/java/com/founder/khtj/controller/KhtjController.java

@@ -518,13 +518,14 @@ public class KhtjController {
     }
 
     @RequestMapping("/toSjtjDet")
-    public ModelAndView toSjtjDet(ModelAndView model, HttpServletRequest request, String unitCode, String startCcsj, String endCcsj, String slType, String unitgrade, String cot) {
+    public ModelAndView toSjtjDet(ModelAndView model, HttpServletRequest request, String unitCode, String startCcsj, String endCcsj, String slType, String unitgrade, String cot,String name) {
         model.addObject("unitCode", unitCode);
         model.addObject("startCcsj", startCcsj);
         model.addObject("endCcsj", endCcsj);
         model.addObject("slType", slType);
         model.addObject("unitgrade", unitgrade);
         model.addObject("cot", cot);
+        model.addObject("name", name);
         model.addObject("sjcjEsUrl", sjcjEsUrl);
         model.setViewName("khtj/sjlist");
         return model;

src/main/resources/application.properties

@@ -11,4 +11,5 @@ qganurl=http://zhyy.xzxt.nm/getGabZyInfoByJyaqMatj.action
 #qgzturl=http://localhost:7001/getZtryDetailByZjhm.action?zjhm=
 
 #手机采集统计页面es项目ip和端口
-sjcjEsUrl=http://localhost:8030
+#sjcjEsUrl=http://localhost:8030
+sjcjEsUrl=http://65.65.66.22:8030

src/main/resources/templates/khtj/sjlist.html

@@ -43,6 +43,7 @@
                 <input type="hidden" name="slType" id="slType" th:value="${slType}">
                 <input type="hidden" name="unitgrade" id="unitgrade" th:value="${unitgrade}">
                 <input type="hidden" name="cot" id="cot" th:value="${cot}">
+                <input type="hidden" name="name" id="name" th:value="${name}">
                 <input type="hidden" name="sjcjEsUrl" id="sjcjEsUrl" th:value="${sjcjEsUrl}">
             </form>
         </div>

src/main/resources/templates/khtj/sjxxtj.html

@@ -50,7 +50,7 @@
                         <td class="td_r">统计单位：</td>
                         <td>
                             <p class="datebox-h">
-                                <input type="text" style="height: 25px;" id="RCcdw" name="RCcdw" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_QGUNIT',method:'get',textField : 'text', valueField : 'id'"/>
+                                <input type="text" style="height: 25px;" id="RCcdw" name="RCcdw" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
                             </p>
                         </td>
                         <td class="td_r">统计时间：</td>
@@ -133,6 +133,7 @@
         $("#minccsj").val($("#minccsjStr").combobox("getValue"));
         $("#maxccsj").val($("#maxccsjStr").combobox("getValue"));
         var sjcjEsUrl = $("#sjcjEsUrl").val();
+        var nameCode = $("#RCcdw").combobox("getValue");
         $('#ryxxTable').datagrid({
             // url: "sjcjqktj",
             url:sjcjEsUrl+"/queryByTjdwAndTjsj",
@@ -144,9 +145,10 @@
                     title: "总应采数",field:"zycs",width:80,align:"center",rowspan:2,resizeable:false,halign:'center',
                     formatter:function(value,row,index){
                         if(row.name=="合计"){
-                            return value;
+                            // return value;
+                            return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+nameCode+"','"+row.unitgrade+"','zycs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"','"  + row.name + "')>"+value+"</a>";
                         }else {
-                            return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + row.code + "','" + row.unitgrade + "','zycs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "')>" + value + "</a>";
+                            return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + row.code + "','" + row.unitgrade + "','zycs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "','" + null + "')>" + value + "</a>";
                         }
                     }
                 },
@@ -154,9 +156,10 @@
                     title: "场所应采数",field:"ycs",width:80,align:"center",rowspan:2,resizeable:false,halign:'center',
                     formatter:function(value,row,index){
                         if(row.name=="合计"){
-                            return value;
+                            // return value;
+                            return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+nameCode+"','"+row.unitgrade+"','ycs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"','"  + row.name + "')>"+value+"</a>";
                         }else {
-                            return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + row.code + "','" + row.unitgrade + "','ycs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "')>" + value + "</a>";
+                            return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + row.code + "','" + row.unitgrade + "','ycs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "','" + null + "')>" + value + "</a>";
                         }
                     }
                 },
@@ -164,9 +167,10 @@
                     title: "有手机人数",field:"sjycs",width:80,align:"center",rowspan:2,resizeable:false,halign:'center',
                     formatter:function(value,row,index){
                         if(row.name=="合计"){
-                            return value;
+                            // return value;
+                            return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+nameCode+"','"+row.unitgrade+"','sjycs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"','"  + row.name + "')>"+value+"</a>";
                         }else {
-                            return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + row.code + "','" + row.unitgrade + "','sjycs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "')>" + value + "</a>";
+                            return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + row.code + "','" + row.unitgrade + "','sjycs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "','" + null + "')>" + value + "</a>";
                         }
                     }
                 },
@@ -181,9 +185,9 @@
                         formatter:function(value,row,index){
                             if(row.name=="合计"){
                                 //return value;
-                                return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','sjyxcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>";
+                                return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+nameCode+"','"+row.unitgrade+"','sjyxcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"','"  + row.name + "')>"+value+"</a>";
                             }else {
-                                return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','sjyxcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>";
+                                return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','sjyxcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"','"  + null + "')>"+value+"</a>";
                             }
                         }
                     },
@@ -192,9 +196,9 @@
                         formatter:function(value,row,index){
                             if(row.name=="合计"){
                                 //return value;
-                                return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + row.code + "','" + row.unitgrade + "','sjsxwcjs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "')>" + value + "</a>";
+                                return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + nameCode + "','" + row.unitgrade + "','sjsxwcjs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "','" + row.name+ "')>" + value + "</a>";
                             }else {
-                                return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + row.code + "','" + row.unitgrade + "','sjsxwcjs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "')>" + value + "</a>";
+                                return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + row.code + "','" + row.unitgrade + "','sjsxwcjs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "','" + null + "')>" + value + "</a>";
                             }
                         }
                     },
@@ -267,9 +271,9 @@
         });
     }
 
-    function showlist(unitcode,unitgrade,type,value,end,start){
+    function showlist(unitcode,unitgrade,type,value,end,start,name){
         if(value != 0){
-            param = "?unitCode="+unitcode+"&startCcsj="+start+"&endCcsj="+end+"&slType="+type+"&unitgrade="+unitgrade+"&cot="+value;
+            param = "?unitCode="+unitcode+"&startCcsj="+start+"&endCcsj="+end+"&slType="+type+"&unitgrade="+unitgrade+"&cot="+value+"&name="+name;
             var url = "toSjtjDet"+param;
             window.open(url);
         }else{