Merge remote-tracking branch 'origin/ythcj_hunan' into ythcj_hunan

src/main/java/com/founder/controller/TbXwRycjController.java

@@ -2141,8 +2141,8 @@ public class TbXwRycjController {
     @RequestMapping("/exportExcelToRyxx")
     @ResponseBody
     public AutoTbStRy exportRyxx(String rybh, String szzwbh, String xm, String zjhm, String fcsrqStr, String ecsrqStr,
-                                 String xbdm, String hjdzXzqhdm, String lrdwdw, String flrsjStr, String elrsjStr,
-                                 String jcjg, String r_sjlxdh, String RRx, String dnabh, HttpServletRequest request, String type, HttpServletResponse response) {
+                                 String xbdm, String hjdzXzqhdm, String lrdwdw, String flrsjStr, String elrsjStr,String swyw,String hmyw,String zjyw,String sjzt,String sjly,
+                                 String jcjg,String ajlbdm, String r_sjlxdh, String RRx, String dnabh, HttpServletRequest request, String type, HttpServletResponse response) {
 
         //判断是不是为undefined
         if (fcsrqStr.trim().equals("undefined")){
@@ -2168,6 +2168,13 @@ public class TbXwRycjController {
         xyrxx.setR_sjlxdh(r_sjlxdh);
         xyrxx.setRRx(RRx);
         xyrxx.setDnabh(dnabh);
+        xyrxx.setAjlbdm(ajlbdm);
+        xyrxx.setSwyw(swyw);
+        xyrxx.setHmyw(hmyw);
+        xyrxx.setZjyw(zjyw);
+        xyrxx.setSjzt(sjzt);
+        xyrxx.setSjly(sjly);
+
         User user = (User) request.getSession().getAttribute("User");
         if (xyrxx.getXxdjdwGajgjgdm() == null || "".equals(xyrxx.getXxdjdwGajgjgdm())) {
             String grade = user.getGrade();
@@ -2204,7 +2211,7 @@ public class TbXwRycjController {
             content[i][0] = ryxx.getRybh();
             content[i][1] = ryxx.getXm();
             content[i][2] = ryxx.getXbdm();
-            content[i][3] = ryxx.getZjhm();
+            content[i][3] = ryxx.getGmsfhm();
             content[i][4] = ryxx.getSzzwbh();
             if (ryxx.getZwcjsj() != null) {
                 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -2215,26 +2222,24 @@ public class TbXwRycjController {
             }
             content[i][6] = ryxx.getLxdm();
             content[i][7] = ryxx.getZwcjdwdm();
+
             if (ryxx.getSzzwbh() == null || "".equals(ryxx.getSzzwbh())) {
-                content[i][8] = "未采集";
-            } else if (ryxx.getSzzwbh() != "" && "".equals(ryxx.getJcjg())) {
-                content[i][8] = "已采集";
-            } else if (ryxx.getSzzwbh() != "" && "0".equals(ryxx.getJcjg())) {
-                content[i][8] = "合格";
-            } else if (ryxx.getSzzwbh() != "" && "1".equals(ryxx.getJcjg())) {
-                content[i][8] = "不合格";
+                content[i][8] = "×";
+            }else if (ryxx.getSzzwbh() != null && "0".equals(ryxx.getJcjg())) {
+                content[i][8] = "√";
+            } else if (ryxx.getSzzwbh() != null && !"0".equals(ryxx.getJcjg())) {
+                content[i][8] = "红√";
             } else {
-                content[i][8] = "已采集";
+                content[i][8] = "×";
             }
             if (ryxx.getZmzpxxbh() == null || ryxx.getCmzpxxbh() == null || ryxx.getYcmzpxxbh() == null || "".equals(ryxx.getZmzpxxbh()) || "".equals(ryxx.getCmzpxxbh()) || "".equals(ryxx.getYcmzpxxbh())) {
-                content[i][9] = "未采集";
-            } else if ("".equals(ryxx.getRRx())) {
-                content[i][9] = "已采集";
+                content[i][9] = "×";
             } else if ("1-1-1".equals(ryxx.getRRx())) {
-                content[i][9] = "合格";
+                content[i][9] = "√";
             } else {
-                content[i][9] = "不合格";
+                content[i][9] = "红√";
             }
+
             if (ryxx.getHm() == null || "".equals(ryxx.getHm()) || Integer.valueOf(ryxx.getHm()).intValue() <= 0) {
                 content[i][10] = "×";
             } else {
@@ -2250,11 +2255,16 @@ public class TbXwRycjController {
             } else {
                 content[i][12] = "√";
             }
-            if (ryxx.getSjjbxx() == null || "".equals(ryxx.getSjjbxx()) || Integer.valueOf(ryxx.getSjjbxx()).intValue() <= 0 || ryxx.getSjlxrxx() == null || "".equals(ryxx.getSjlxrxx()) || Integer.valueOf(ryxx.getSjlxrxx()).intValue() <= 0) {
+
+            if ( (ryxx.getSjjbxx() == null || "".equals(ryxx.getSjjbxx()) || Integer.valueOf(ryxx.getSjjbxx()).intValue() <= 0) && ( ryxx.getSjlxrxx() == null || "".equals(ryxx.getSjlxrxx()) || Integer.valueOf(ryxx.getSjlxrxx()).intValue() <= 0)
+                    && ( ryxx.getSjthjl() == null || "".equals(ryxx.getSjthjl()) || Integer.valueOf(ryxx.getSjthjl()).intValue() <= 0)  && ( ryxx.getSjdxjl() == null || "".equals(ryxx.getSjdxjl()) || Integer.valueOf(ryxx.getSjdxjl()).intValue() <= 0)) {
                 content[i][13] = "×";
-            } else {
+            } else if(Integer.valueOf(ryxx.getSjjbxx()).intValue() > 0 && Integer.valueOf(ryxx.getSjlxrxx()).intValue() > 0 && Integer.valueOf(ryxx.getSjthjl()).intValue() > 0 && Integer.valueOf(ryxx.getSjdxjl()).intValue() > 0){
                 content[i][13] = "√";
+            } else {
+                content[i][13] = "红√";
             }
+
             if (ryxx.getYhk() == null || "".equals(ryxx.getYhk()) || Integer.valueOf(ryxx.getYhk()).intValue() <= 0) {
                 content[i][14] = "×";
             } else {
@@ -2291,7 +2301,7 @@ public class TbXwRycjController {
         }
 
         //创建HSSFWorkbook
-        HSSFWorkbook wb = ExportExcels.getHSSFWorkbook(sheetName, title, content, null);
+        HSSFWorkbook wb = ExportExcels.getColorHSSFWorkbook(sheetName, title, content, null);
 
         //响应到客户端
         try {

src/main/java/com/founder/test/ExportZipRyxx.java

@@ -3,6 +3,7 @@ package com.founder.test;
 import cn.hutool.core.io.IoUtil;
 import com.founder.domain.User;
 import com.founder.model.*;
+import com.founder.module.redis.service.IDicItemService;
 import com.founder.ryswtz.service.RyxxService;
 import com.founder.service.IHmCjService;
 import com.founder.service.ITbRyRyzpService;
@@ -46,6 +47,8 @@ public class ExportZipRyxx {
     private TbPhSjInfoService sjInfoService;//手机相关信息
     @Autowired
     private IHmCjService hmCjService;
+    @Autowired
+    private IDicItemService dicItemService;
     private Map<String, Object> map;
 
     public static void main(String[] args) {
@@ -271,6 +274,22 @@ public class ExportZipRyxx {
         if (xyrC.getCsrqQsrq() != null && !"".equals(xyrC.getCsrqQsrq())) {
             xyrC.setCsrqQsrqStr(df.format(xyrC.getCsrqQsrq()));
         }
+        if(xyrC.getXbdm()!= null && !"".equals(xyrC.getXbdm())){
+            xyrC.setXbdm( dicItemService.queryNameByCode(xyrC.getXbdm(),"CODE_XB"));
+        }
+        if(xyrC.getCyzjdm()!= null && !"".equals(xyrC.getCyzjdm())){
+            xyrC.setCyzjdm( dicItemService.queryNameByCode(xyrC.getCyzjdm(),"CODE_ZJ"));
+        }
+        if(xyrC.getCyzjdm()!= null && !"".equals(xyrC.getCyzjdm())){
+            xyrC.setCyzjdm( dicItemService.queryNameByCode(xyrC.getCyzjdm(),"CODE_ZJ"));
+        }
+        if(xyrC.getAjlbdm()!= null && !"".equals(xyrC.getAjlbdm())){
+            xyrC.setAjlbdm( dicItemService.queryNameByCode(xyrC.getAjlbdm(),"CODE_AJLB"));
+        }
+        if(xyrC.getZwcjdwdm()!= null && !"".equals(xyrC.getZwcjdwdm())){
+            xyrC.setZwcjdwdm( dicItemService.queryNameByCode(xyrC.getZwcjdwdm(),"CODE_UNIT"));
+        }
+
         if (xyrC.getZhsj() != null && !"".equals(xyrC.getZhsj())) {
             xyrC.setZhsjStr(df.format(xyrC.getZhsj()));
         }

src/main/java/com/founder/utils/ExportExcels.java

@@ -5,6 +5,8 @@ import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.ss.usermodel.Font;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
@@ -57,6 +59,69 @@ public class ExportExcels {
         return wb;
     }
 
+    public static HSSFWorkbook getColorHSSFWorkbook(String sheetName,String []title,String [][]values, HSSFWorkbook wb){
+
+        // 第一步，创建一个HSSFWorkbook，对应一个Excel文件
+        if(wb == null){
+            wb = new HSSFWorkbook();
+        }
+
+        // 第二步，在workbook中添加一个sheet,对应Excel文件中的sheet
+        HSSFSheet sheet = wb.createSheet(sheetName);
+
+        // 第三步，在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制
+        HSSFRow row = sheet.createRow(0);
+
+        // 第四步，创建单元格，并设置值表头 设置表头居中
+        HSSFCellStyle style = wb.createCellStyle();
+        style.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 创建一个居中格式
+
+        HSSFCellStyle cellStyle = wb.createCellStyle();
+        Font font =  wb.createFont();
+        font.setColor(HSSFColor.RED.index);
+        cellStyle.setFont(font);  //红色字体样式
+
+        HSSFCellStyle cellStyle2 = wb.createCellStyle();
+        Font font1 =  wb.createFont();
+        font1.setColor(HSSFColor.GREEN.index);
+        cellStyle2.setFont(font1);  //绿色字体样式
+        //声明列对象
+        HSSFCell cell = null;
+
+        //创建标题
+        for(int i=0;i<title.length;i++){
+            cell = row.createCell(i);
+            cell.setCellValue(title[i]);
+            cell.setCellStyle(style);
+        }
+
+        //创建内容
+        for(int i=0;i<values.length;i++){
+            row = sheet.createRow(i + 1);
+            for(int j=0;j<values[i].length;j++){
+                if("红√".equals(values[i][j])){
+                    cell=row.createCell(j);
+                    cell.setCellValue("√");
+                    cell.setCellStyle(cellStyle);
+                }else if("√".equals(values[i][j])){
+                    //将内容按顺序赋给对应的列对象
+                    cell=row.createCell(j);
+                    cell.setCellValue("√");
+                    cell.setCellStyle(cellStyle2);
+                }else if("×".equals(values[i][j])){
+                    //将内容按顺序赋给对应的列对象
+                    cell=row.createCell(j);
+                    cell.setCellValue("×");
+                    cell.setCellStyle(cellStyle);
+                }else {
+                    row.createCell(j).setCellValue(values[i][j]);
+                }
+            }
+        }
+        return wb;
+    }
+
+
     //发送响应流方法
     public static void setResponseHeader(HttpServletResponse response, String fileName) {
         try {

src/main/resources/mapper/AutoTbXwRycjSqlMap.xml

@@ -251,6 +251,29 @@
             and (select count(1) from tb_ph_thjl s where s.xyrbh=TB_RY_RYCJ.rybh)>0
             and (select count(1) from tb_ph_dxjl s where s.xyrbh=TB_RY_RYCJ.rybh)>0
         </if>
+        <if test="entity.sjzt != null and entity.sjzt != '' and entity.sjzt=='5'.toString() ">
+            and TB_RY_RYCJ.SJBS='1'
+            and (select count(1) from tb_ph_fzxyrsjgl s where s.xyrbh=TB_RY_RYCJ.rybh) =0
+            and (select count(1) from tb_ph_lxrxx s where s.xyrbh=TB_RY_RYCJ.rybh)=0
+            and (select count(1) from tb_ph_thjl s where s.xyrbh=TB_RY_RYCJ.rybh)=0
+            and (select count(1) from tb_ph_dxjl s where s.xyrbh=TB_RY_RYCJ.rybh)=0
+        </if>
+        <if test="entity.sjzt != null and entity.sjzt != '' and entity.sjzt=='6'.toString() ">
+            and TB_RY_RYCJ.SJBS='1'
+            and (
+            (select count(1) from tb_ph_fzxyrsjgl s where s.xyrbh=TB_RY_RYCJ.rybh) >0
+            or (select count(1) from tb_ph_lxrxx s where s.xyrbh=TB_RY_RYCJ.rybh)>0
+            or (select count(1) from tb_ph_thjl s where s.xyrbh=TB_RY_RYCJ.rybh)>0
+            or (select count(1) from tb_ph_dxjl s where s.xyrbh=TB_RY_RYCJ.rybh)>0)
+        </if>
+        <if test="entity.sjzt != null and entity.sjzt != '' and entity.sjzt=='7'.toString() ">
+            and TB_RY_RYCJ.SJBS='1'
+            and (select count(1) from tb_ph_fzxyrsjgl s where s.xyrbh=TB_RY_RYCJ.rybh)>0
+            and (select count(1) from tb_ph_lxrxx s where s.xyrbh=TB_RY_RYCJ.rybh)>0
+            and (select count(1) from tb_ph_thjl s where s.xyrbh=TB_RY_RYCJ.rybh)>0
+            and (select count(1) from tb_ph_dxjl s where s.xyrbh=TB_RY_RYCJ.rybh)>0
+        </if>
+
         <include refid="queryWhere"/>
     </select>
 
@@ -351,6 +374,15 @@
         <if test="entity.sjzt != null and entity.sjzt != '' and entity.sjzt=='4'.toString() ">
             and d.SJJBXX>0 and d.SJLXRXX>0 and d.SJTHJL>0 and d.SJDXJL>0
         </if>
+        <if test="entity.sjzt != null and entity.sjzt != '' and entity.sjzt=='5'.toString() ">
+            and d.SJBS = '1' and d.SJJBXX=0 and d.SJLXRXX=0 and d.SJTHJL=0 and d.SJDXJL=0
+        </if>
+        <if test="entity.sjzt != null and entity.sjzt != '' and entity.sjzt=='6'.toString() ">
+            and d.SJBS = '1' and (d.SJJBXX>0 or d.SJLXRXX>0 or d.SJTHJL>0 or d.SJDXJL>0)
+        </if>
+        <if test="entity.sjzt != null and entity.sjzt != '' and entity.sjzt=='7'.toString() ">
+            and d.SJBS = '1'  and d.SJJBXX>0 and d.SJLXRXX>0 and d.SJTHJL>0 and d.SJDXJL>0
+        </if>
         )a
         <![CDATA[ WHERE ROWNUM <= #{ end } ) t
         WHERE r > #{ begin } ]]>

src/main/resources/static/easyui-window/css/easyui.css

@@ -1473,7 +1473,7 @@ body {
   -moz-border-radius: 5px;
   -o-border-radius: 5px;
   -ms-border-radius: 5px;
-  background: #fff; }
+  background:#66afe9; }
   .window .window-header {
     background: transparent;
     border: 0;
@@ -1600,7 +1600,7 @@ body {
 .dialog-button {
   padding: 5px;
   text-align: center;
-  background: #fff; }
+  background: #66afe9; }
   .dialog-button .l-btn {
     margin-left: 5px; }
 

src/main/resources/templates/cjqx/frame.html

 <!DOCTYPE html>
-<html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
 
 	<head>
 		<meta charset="UTF-8">
@@ -67,23 +67,23 @@
 					<!--<li>
                         <a href="javascript:void(0)" onclick="menuCAClick('newSheb',this,'page20001')"><i class="iconfont icon-zuzhijiagou left"></i><font>设备信息注册</font></a>
                        </li>-->
-                    <li>
+                    <li id="H10E0301">
                         <a href="javascript:void(0)" onclick="menuCAClick('sbxxform',this,'page10001')"><i class="iconfont icon-tongxunlu left"></i><font>我的设备信息</font></a>
                        </li>
-                    <li>
+                    <li id="H10E0302">
                         <a href="javascript:void(0)" onclick="menuCAClick('sbspglform',this,'page20001')"><i class="iconfont icon-quanxian left"></i><font>设备审批管理</font></a>
                        </li>
                 <!--	<li>
                         <a href="javascript:void(0)" onclick="menuCAClick('sbdaglform',this,'page50001')"><i class="iconfont icon-liuchengshuoming left"></i><font>设备档案管理</font></a>
                        </li>
                        -->
-		        	<li>
+		        	<li id="H10E0303">
 		                <a href="javascript:void(0)" onclick="menuCAClick('sbjkglform',this,'page30001')"><i class="iconfont icon-kehu left"></i><font>设备监控管理</font></a>
 		           	</li>
 					<!--<li>
 						<a href="javascript:void(0)" onclick="menuCAClick('newShebcs',this,'page50001')"><i class="iconfont icon-kehu left"></i><font>新增设备厂商</font></a>
 					</li>-->
-					<li>
+					<li id="H10E0304">
 						<a href="javascript:void(0)" onclick="menuCAClick('sbcsglform',this,'page40001')"><i class="iconfont icon-liuchengshuoming left"></i><font>设备厂商管理</font></a>
 					</li>
 		        </ul>
@@ -142,4 +142,7 @@
 			}
 		}
 	</script>
+	<!-- 权限机制-->
+	<div style="display: none" id="perurl" th:text="${session.perurl}"></div>
+	<script id="scripturlid" src="static/common/js/checkurl.js" type="text/javascript"></script>
 </html>
\ No newline at end of file

src/main/resources/templates/login/login.html

@@ -63,11 +63,17 @@
 			<p><a class="dw-bg yhglqx"><span class="top"></span>用户管理权限<span class="bottom"></span></a></p>
 		</div>
 		<div class="announcement">
-			<p>系统内容：</p>
-			<p>1.该系统包含了人员基本信息、人像、指纹、声纹、虹膜、足迹、手机等信息的采集</p>
-			<p>2.具备针对所采集人员指纹进行采集质量的检查和抽查等功能</p>
-			<p>3.添加指纹比中信息查询功能</p>
-			<p>4.新增的全国失踪人员和全国被盗抢机动车查询</p>
+			<p>各厂商联系方式：</p>
+<!--			<p>1.该系统包含了人员基本信息、人像、指纹、声纹、虹膜、足迹、手机等信息的采集</p>-->
+<!--			<p>2.具备针对所采集人员指纹进行采集质量的检查和抽查等功能</p>-->
+<!--			<p>3.添加指纹比中信息查询功能</p>-->
+<!--			<p>4.新增的全国失踪人员和全国被盗抢机动车查询</p>-->
+			<p> 一、 指纹、掌纹： 姚峰 13407311035 &nbsp;<br>
+				二、 虹膜 &nbsp;1、虹霸：陈志平 18163679418   &nbsp;2、万里红： 范志 15301016896   &nbsp;陈沐 18001311772&nbsp;<br>
+				三、 足迹： 李田 18229884317 &nbsp;&nbsp;<br>
+				四、 声纹 &nbsp;1、科大讯飞： 张郭舟 15616335123  &nbsp; 2、国音：  周凡络 18163677117
+				&nbsp; <br>
+				五、 手机 &nbsp;1、新德汇 400-8886688  &nbsp;  2、英苑 单国震 13659191852  &nbsp; 3、金诺： 戴永祥 18655139318 </p>
 		</div>
 	</div>
 </div>
@@ -192,15 +198,15 @@
 		var perurl="admin";//默认权限
 		var user;
 
-		//$.ajax({
-		//	url:"qxdoLogin",//权限登陆
-		//	data:{"username":username,"password":password},
-		//	type:"post",
-		//	async: false,
-		//	dataType:"json",
-		//	success:function(mgs){
-		//		setTimeout("hide()",500);
-		//		perurl=mgs.perurl;
+		$.ajax({
+			url:"qxdoLogin",//权限登陆
+			data:{"username":username,"password":password},
+			type:"post",
+			async: false,
+			dataType:"json",
+			success:function(mgs){
+				setTimeout("hide()",500);
+				perurl=mgs.perurl;
 				$.ajax({
 					url:"doLogin",
 					data:{"userId":username,"psw":password,"perurl":perurl},
@@ -218,8 +224,8 @@
 						}
 					}
 				});
-		//	}
-		//});
+			}
+		});
 	}
 	function hide(){
 		$("#loadgif").hide();

src/main/resources/templates/rygl/ryxxcjxz.html

@@ -40,11 +40,11 @@
     <!-- <script type="text/javascript" src="easyui-window/js/jquery.easyui.min.js"></script>-->
     <script type="text/javascript" src="static/easyui-window/js/function.js"></script>
 </head>
-<body>
+<body style="background: #66afe9;">
 <div class="cxtj">
     <fieldset>
-        <table class="xj-table">
-            <tbody>
+        <table style="width:100%;border-collapse: collapse;background-color: rgba(255,255,255,0.75);text-align:left;" class="xj-table">
+            <tbody class="td_r">
 <!--            <tr>-->
 <!--                <td class="ar" width="18%">抽查时间：</td>-->
 <!--                <td width="20%">-->
@@ -59,17 +59,18 @@
 <!--                  </span>-->
 <!--                </td>-->
 <!--            </tr>-->
-                <tr>
-                    <td class="ar">身份证号码：</td>
-                    <td colspan="3">
+                <tr style="height: 70px;">
+                    <td class="td_r" style="width:30%">身份证号码：</td>
+                    <td class="td_r" style="width:60%;margin-left: 0px;">
                                   <span class="textbox" style="width: 90%;">
-                                      <input id="zjhm" name="zjhm" onchange="onchangetext('zjhm')" class="" type="text"/>
+                                      <input id="zjhm" name="zjhm" onchange="onchangetext('zjhm')" class="" type="text" style="
+    height: 30px;"/>
                                   </span>
                     </td>
                 </tr>
             <tr style="height: 80px;">
-                <td class="ar" width="13.3%">人员属性：</td>
-                <td width="20%">
+                <td class="td_r" width="30.3%">人员属性：</td>
+                <td class="td_r" width="60%">
                                 <span class="textbox" style="font-size: 14px;width: 90%;">
                                     <select id="rysx" style="height: 34px;width: 100%;font-size: 14px;" onchange="checkboxOnclick()" >
                                         <option value=""></option>
@@ -108,7 +109,7 @@
             </tbody>
         </table>
     </fieldset>
-    <span style="color: red;font-weight:bold;margin-left: 10px;margin-top:20px;">警综犯罪嫌疑人请去警综平台添加</span>
+    <span style="color: red;font-weight:bold;margin-left: 10px;margin-top:20px;">注：警综犯罪嫌疑人请去执法平台添加</span>
 </div>
 <!--- 日期时间-->
 <script type="text/javascript" src="static/xtba/zlcc/css/datepicker/WdatePicker.js"></script>

src/main/resources/templates/rygl/ryxxlist.html

@@ -62,6 +62,7 @@
             <input type="hidden" id="username" name="username" th:value="${username}"/>
             <input type="hidden" id="cxqssj" th:value="${cxqssj}" />
             <input type="hidden" id="rysx" th:value="${rysx}" />
+            <input type="hidden" id="purl" th:value="${session.perurl}" />
             <input type="hidden" id="ifxz" value="0" />
             <form name="ryxxForm">
                 <table style="width:100%;border-collapse: collapse;background-color: rgba(255,255,255,0.75);text-align:left;" class="cx_table_tj_zljc">
@@ -152,6 +153,9 @@
                                     <option value="2">未采集</option>
                                     <option value="3">已采集</option>
                                     <option value="4">采集合格</option>
+                                    <option value="5">有手机未采集</option>
+                                    <option value="6">有手机已采集</option>
+                                    <option value="7">有手机采集合格</option>
                                 </select>
                             </p>
                         </td>
@@ -248,7 +252,8 @@
                             <a href="javascript:doQuery();" class="btn_cx">查询</a>
                             <a href="javascript:doClear();" class="btn_qkcxtj">清空</a>
                             <a href="javascript:doExportExcel();" class="btn btn_dc">导出</a>
-                            <a href="javascript:toAddpage();" class="btn_dc">新增</a>
+
+                            <a href="javascript:toAddpage();" th:if="${#strings.containsIgnoreCase(session.perurl,'H10A0102')} and ${type} eq 'CJ' " class="btn_dc">新增</a>
                         </td>
                     </tr>
 
@@ -522,13 +527,13 @@
                         var jcjg = row.jcjg;
                         var rstStr;
                         if (szzwbh == null || szzwbh == "") {
-                            rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title='平面指纹'>×</span>";
+                            rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title='指纹'>×</span>";
                         } else if ( szzwbh!=null && jcjg == "0") {
-                            rstStr = "<span style='color: green;font-size: 20px;font-weight: bold;' title='平面指纹'>√</span>";
+                            rstStr = "<span style='color: green;font-size: 20px;font-weight: bold;' title='指纹'>√</span>";
                         } else if (szzwbh!=null && jcjg != "0") {
-                            rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title='平面指纹'>√</span>";
+                            rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title='指纹'>√</span>";
                         } else {
-                            rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title='平面指纹'>×</span>";
+                            rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title='指纹'>×</span>";
                         }
                         return rstStr;
                     }
@@ -788,10 +793,19 @@
                         }
 
                         var username=$("#username").val();
-                        if(username!=null&&username!=""&&username=="admin"){
-                            return "<span class='hg-btn' onclick=\"modify('" + rybh + "','" + hmzt + "','" + zjzt + "','" + swzt + "','" + sjzt + "','" + yhkzt + "','" + sswpzt + "')\">修改</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' onclick=\"cut('"+rybh+"','"+xm+"')\">删除</span>";
-                        }else{
+                        // if(username!=null&&username!=""&&username=="admin"){
+                        //     return "<span class='hg-btn' onclick=\"modify('" + rybh + "','" + hmzt + "','" + zjzt + "','" + swzt + "','" + sjzt + "','" + yhkzt + "','" + sswpzt + "')\">修改</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' onclick=\"cut('"+rybh+"','"+xm+"')\">删除</span>";
+                        // }else{
+                        //     return "<span class='hg-btn' onclick=\"modify('" + rybh + "','" + hmzt + "','" + zjzt + "','" + swzt + "','" + sjzt + "','" + yhkzt + "','" + sswpzt + "')\">修改</span>";
+                        // }
+                        var purl=$("#purl").val();
+                        // if(purl.indexOf("H10A0101")<0 ){
+                        //     return "<span class='hg-btn' >修改<img src=\"static/common/img/suo.png\" title=\"无权限\" ></span>    &nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' >删除 <img src=\"static/common/img/suo.png\" title=\"无权限\" ></span>";
+                        // }
+                        if(purl.indexOf("H10A0101")<0 ){
                             return "<span class='hg-btn' onclick=\"modify('" + rybh + "','" + hmzt + "','" + zjzt + "','" + swzt + "','" + sjzt + "','" + yhkzt + "','" + sswpzt + "')\">修改</span>";
+                        }else{
+                            return "<span class='hg-btn' onclick=\"modify('" + rybh + "','" + hmzt + "','" + zjzt + "','" + swzt + "','" + sjzt + "','" + yhkzt + "','" + sswpzt + "')\">修改</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' onclick=\"cut('"+rybh+"','"+xm+"')\">删除</span>";
                         }
                         //return "<span class='hg-btn' onclick=\"modify('"+rybh+"')\">修改</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' onclick=\"cut('"+rybh+"','"+xm+"')\">删除</span>";
                         //return "<span class='hg-btn' onclick=\"modify('" + rybh + "','" + hmzt + "','" + zjzt + "','" + swzt + "','" + sjzt + "','" + yhkzt + "','" + sswpzt + "')\">修改</span>";
@@ -1432,8 +1446,14 @@
         var RRx = $("#RRx").val();
         var r_sjlxdh = $("#r_sjlxdh").val();
         var dnabh = $("#dnabh").val();
+        var swyw = $("#swyw").val();
+        var hmyw = $("#hmyw").val();
+        var zjyw = $("#zjyw").val();
+        var sjzt = $("#sjzt").val();
+        var sjly = $("#sjly").val();
+        var ajlbdm = $("#ajlbdm").val();
         window.location.href="/exportExcelToRyxx?rybh="+rybh+"&zjhm="+zjhm+"&xm="+xm+"&szzwbh="+szzwbh+"&jcjg="+jcjg+"&xbdm="+xbdm+"&hjdzXzqhdm="+hjdzXzqhdm+"&RRx="+RRx+"&r_sjlxdh="+r_sjlxdh+"&dnabh="+dnabh
-                +"&lrdwdm="+lrdwdm+"&fcsrqStr="+fcsrqStr+"&ecsrqStr="+ecsrqStr+"&lrr="+lrr+"&flrsjStr="+flrsjStr+"&elrsjStr="+elrsjStr;
+                +"&lrdwdm="+lrdwdm+"&fcsrqStr="+fcsrqStr+"&ajlbdm="+ajlbdm+"&swyw="+swyw+"&hmyw="+hmyw+"&zjyw="+zjyw+"&sjzt="+sjzt+"&sjly="+sjly+"&ecsrqStr="+ecsrqStr+"&lrr="+lrr+"&flrsjStr="+flrsjStr+"&elrsjStr="+elrsjStr;
     }
 
     function sbsj(num,rybh,sbyy){