修改对标后的需求

src/main/java/com/founder/cjqx/controller/SysClientVpController.java

@@ -54,6 +54,17 @@ public class SysClientVpController {
         if(sysClientVp.getMac()!=null&&!sysClientVp.getMac().equals("")){
             sysClientVp.setMac(xzxtencode(sysClientVp.getMac()));
         }
+        if(sysClientVp.getSsdwcode()!=null&&!sysClientVp.getSsdwcode().equals("")){
+            if (sysClientVp.getSsdwcode().substring(2, 12).equals("0000000000")) {//省
+                sysClientVp.setSsdwcode(sysClientVp.getSsdwcode().substring(0,2));
+            } else if (sysClientVp.getSsdwcode().substring(4, 12).equals("00000000")) {//市
+                sysClientVp.setSsdwcode(sysClientVp.getSsdwcode().substring(0,4));
+            }else if(sysClientVp.getSsdwcode().substring(6, 12).equals("000000")){ //县
+                sysClientVp.setSsdwcode(sysClientVp.getSsdwcode().substring(0,6));
+            }else if(sysClientVp.getSsdwcode().substring(8, 12).equals("0000")){ //所
+                sysClientVp.setSsdwcode(sysClientVp.getSsdwcode().substring(0,8));
+            }
+        }
         resultMap =sysClientVpService.ClientVpAll(sysClientVp);
         return resultMap;
     }
@@ -81,6 +92,17 @@ public class SysClientVpController {
         if(sysClientVp.getMac()!=null&&!sysClientVp.getMac().equals("")){
             sysClientVp.setMac(xzxtencode(sysClientVp.getMac()));
         }
+        if(sysClientVp.getSsdwcode()!=null&&!sysClientVp.getSsdwcode().equals("")){
+            if (sysClientVp.getSsdwcode().substring(2, 12).equals("0000000000")) {//省
+                sysClientVp.setSsdwcode(sysClientVp.getSsdwcode().substring(0,2));
+            } else if (sysClientVp.getSsdwcode().substring(4, 12).equals("00000000")) {//市
+                sysClientVp.setSsdwcode(sysClientVp.getSsdwcode().substring(0,4));
+            }else if(sysClientVp.getSsdwcode().substring(6, 12).equals("000000")){ //县
+                sysClientVp.setSsdwcode(sysClientVp.getSsdwcode().substring(0,6));
+            }else if(sysClientVp.getSsdwcode().substring(8, 12).equals("0000")){ //所
+                sysClientVp.setSsdwcode(sysClientVp.getSsdwcode().substring(0,8));
+            }
+        }
         resultMap =sysClientVpService.ClientVpAll(sysClientVp);
         return resultMap;
     }

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

@@ -242,6 +242,20 @@ public class TbXwRycjController {
         return bool;
     }
 
+    @RequestMapping("/getTaryxx")
+    @ResponseBody
+    public Map<String,Object> getTaryxx(Model model,String rybh){
+        Map<String,Object> rstmap = new HashMap<String,Object>();
+        if(rybh!=null&&!"".equals(rybh)){
+            AutoTbStRy ryxx = rycjService.getRyxxByRybh(rybh);
+            rstmap.put("ryxx",ryxx);
+        }else{
+            List<AutoTbStRy> ryxxs = rycjService.getRyxxByToday();
+            rstmap.put("ryxxs",ryxxs);
+        }
+        return rstmap;
+    }
+
     @RequestMapping("/toAddRyxx")
     public String toAddRyxx(Model model,String perurl,String gmsfzh,HttpServletRequest request){
         String ips = "";

src/main/java/com/founder/dao/TbXwRycjDao.java

@@ -21,6 +21,8 @@ public interface TbXwRycjDao {
     public List<AutoTbStRy> getRyxxByRybh(Map<String, Object> map);
     public List<AutoTbStRy> getRyxxByRybh_new(Map<String, Object> map);
 
+    public List<AutoTbStRy> getRyxxByToday();
+
     public List<AutoTbStRy> getRyxxByZjhm(Map<String, Object> map);
 
     public List<AutoTbStRy> getRyxxByJzrybh(Map<String, Object> map);

src/main/java/com/founder/model/AfisQualityCk.java

@@ -74,6 +74,7 @@ public class AfisQualityCk  implements Serializable {
 	private String ccsjStr;      //抽查时间
 	private String rwbh;      //任务编号
 	private String fssj;      //发送时间
+	private String gmsfhm;
 
 	public String getRRybh() {
 		return this.RRybh;
@@ -530,4 +531,12 @@ public class AfisQualityCk  implements Serializable {
 	public void setFssj(String fssj) {
 		this.fssj = fssj;
 	}
+
+	public String getGmsfhm() {
+		return gmsfhm;
+	}
+
+	public void setGmsfhm(String gmsfhm) {
+		this.gmsfhm = gmsfhm;
+	}
 }
\ No newline at end of file

src/main/java/com/founder/model/SysWhgl.java

@@ -67,4 +67,119 @@ public class SysWhgl implements Serializable {
      */
     private String modifiedTime;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getWhbh() {
+        return whbh;
+    }
+
+    public void setWhbh(String whbh) {
+        this.whbh = whbh;
+    }
+
+    public String getBxdw() {
+        return bxdw;
+    }
+
+    public void setBxdw(String bxdw) {
+        this.bxdw = bxdw;
+    }
+
+    public String getBxr() {
+        return bxr;
+    }
+
+    public void setBxr(String bxr) {
+        this.bxr = bxr;
+    }
+
+    public String getBxsj() {
+        return bxsj;
+    }
+
+    public void setBxsj(String bxsj) {
+        this.bxsj = bxsj;
+    }
+
+    public String getGzxx() {
+        return gzxx;
+    }
+
+    public void setGzxx(String gzxx) {
+        this.gzxx = gzxx;
+    }
+
+    public String getGzlx() {
+        return gzlx;
+    }
+
+    public void setGzlx(String gzlx) {
+        this.gzlx = gzlx;
+    }
+
+    public String getBxrlxdh() {
+        return bxrlxdh;
+    }
+
+    public void setBxrlxdh(String bxrlxdh) {
+        this.bxrlxdh = bxrlxdh;
+    }
+
+    public String getClzt() {
+        return clzt;
+    }
+
+    public void setClzt(String clzt) {
+        this.clzt = clzt;
+    }
+
+    public String getJjsj() {
+        return jjsj;
+    }
+
+    public void setJjsj(String jjsj) {
+        this.jjsj = jjsj;
+    }
+
+    public String getScbz() {
+        return scbz;
+    }
+
+    public void setScbz(String scbz) {
+        this.scbz = scbz;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser;
+    }
+
+    public String getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(String modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
 }

src/main/java/com/founder/service/AutoTbXwRycjService.java

@@ -21,6 +21,8 @@ public interface AutoTbXwRycjService extends IService<AutoTbStRy> {
 
     public AutoTbStRy getRyxxByRybh(String asjxgrybh);
 
+    public List<AutoTbStRy> getRyxxByToday();
+
     public List<AutoTbStRy> getRyxxByZjhm(String zjhm);
 
     public AutoTbStRy getRyxxByJzrybh(String asjxgrybh);

src/main/java/com/founder/service/impl/AutoTbXwRycjServiceImpl.java

@@ -162,6 +162,12 @@ public class AutoTbXwRycjServiceImpl extends BaseService<AutoTbStRy> implements
     }
 
     @Override
+    public List<AutoTbStRy> getRyxxByToday(){
+       List<AutoTbStRy> xyrCs = mapper.getRyxxByToday();
+        return xyrCs;
+    }
+
+    @Override
     public List<AutoTbStRy> getRyxxByZjhm(String zjhm){
         Map<String, Object> map = new HashMap<>();
         map.put("zjhm", zjhm);

src/main/java/com/founder/sysWhgl/controller/SysWhglController.java

@@ -56,6 +56,23 @@ public class SysWhglController {
         return "whgl/whgllist";
     }
 
+    @RequestMapping("/toSjjk")
+    public String toSjjk(Model model, HttpServletRequest request, String isfirst, String type) {
+        User user = (User) request.getSession().getAttribute("User");
+        model.addAttribute("username", user.getUsername());
+        String scheme = request.getScheme();//http
+        String serverName = request.getServerName();//IP
+        int serverPort = request.getServerPort();//端口号
+        String contextPath = request.getContextPath();//项目名
+        String webappurl = scheme + "://" + serverName + ":" + serverPort + contextPath;
+        if (isfirst != null && "1".equals(isfirst)) {
+            model.addAttribute("cxqssj", getSystemTime());
+        }
+        model.addAttribute("webappurl", webappurl);
+        model.addAttribute("type", type);
+        return "whgl/Sjjklist";
+    }
+
     @RequestMapping("/toEditWhgl")
     public String toEditWhgl(String whbh, Model model, HttpServletRequest request) {
         User user = (User) request.getSession().getAttribute("User");
@@ -183,6 +200,15 @@ public class SysWhglController {
         return easyUIPage;
     }
 
+    @RequestMapping("/querySjjkList")
+    @ResponseBody
+    public EasyUIPage querySjjkList(@ModelAttribute SysWhgl sysWhgl, EasyUIPage easyUIPage, Integer rows, String type, HttpServletRequest request) {
+        easyUIPage.setPagePara(rows);
+        User user = (User) request.getSession().getAttribute("User");
+        easyUIPage = sysWhglService.querySjjkPage(easyUIPage, sysWhgl);
+        return easyUIPage;
+    }
+
     @RequestMapping("/deleteWhgl")
     @ResponseBody
     public boolean deleteWhgl(Model model, String whbh) {

src/main/java/com/founder/sysWhgl/service/SysWhglService.java

@@ -51,9 +51,24 @@ public interface SysWhglService {
     public EasyUIPage queryWhglPage(EasyUIPage page, SysWhgl sysWhgl);
 
     /**
+     * 维护管理多条件分页查询
+     * @param page
+     * @param sysWhgl
+     * @return
+     */
+    public EasyUIPage querySjjkPage(EasyUIPage page, SysWhgl sysWhgl);
+
+    /**
      * 维护管理多条件查询
      * @param sysWhgl
      * @return
      */
     List<SysWhgl> queryWhglList(SysWhgl sysWhgl);
+
+    /**
+     * 维护管理多条件查询
+     * @param sysWhgl
+     * @return
+     */
+    List<SysWhgl> querySjjkList(SysWhgl sysWhgl);
 }

src/main/java/com/founder/sysWhgl/service/impl/SysWhglServiceImpl.java

@@ -64,6 +64,25 @@ public class SysWhglServiceImpl implements SysWhglService {
         }
         return page;
     }
+    @Override
+    public EasyUIPage querySjjkPage(EasyUIPage page, SysWhgl sysWhgl) {
+        List<SysWhgl> lsts = new ArrayList<SysWhgl>();
+        SysWhgl sysWhgl1 = new SysWhgl();
+        SysWhgl sysWhgl2 = new SysWhgl();
+        sysWhgl1.setWhbh("2021-05-26 19:21:18");
+        sysWhgl1.setBxdw("R4690025200002021055034");
+        sysWhgl1.setBxr("琼海市公安局城南派出所");
+        sysWhgl1.setGzxx("该数据未及时上报至指纹系统!");
+        sysWhgl2.setWhbh("2021-05-28 10:03:37");
+        sysWhgl2.setBxdw("R4602035500002021055149");
+        sysWhgl2.setBxr("三亚市公安局天涯分局凤凰派出所");
+        sysWhgl2.setGzxx("该数据未及时上报至指纹系统！");
+        lsts.add(sysWhgl2);
+        lsts.add(sysWhgl1);
+        page.setTotal(2);
+        page.setRows(lsts);
+        return page;
+    }
 
     @Override
     public List<SysWhgl> queryWhglList(SysWhgl sysWhgl) {
@@ -73,4 +92,12 @@ public class SysWhglServiceImpl implements SysWhglService {
         map.put("end", "10000");
         return sysWhglMapper.queryPageList(map);
     }
+    @Override
+    public List<SysWhgl> querySjjkList(SysWhgl sysWhgl) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("whgl", sysWhgl);
+        map.put("begin", "0");
+        map.put("end", "0");
+        return sysWhglMapper.queryPageList(map);
+    }
 }

src/main/resources/mapper/AfisQualityCcrwSqlMapper.xml

@@ -199,7 +199,8 @@
         GXSJ=SYSDATE
         where SCBZ = '0'
         <if test="entity.xxbh != null and entity.xxbh != ''"> AND XXBH = #{entity.xxbh , jdbcType=VARCHAR } </if>
-        <if test="entity.rwbh != null and entity.rwbh != ''"> AND RWBH = #{entity.rwbh , jdbcType=VARCHAR } AND CCDW = #{entity.ccdw , jdbcType=VARCHAR } </if>
+        <if test="entity.rwbh != null and entity.rwbh != ''"> AND RWBH = #{entity.rwbh , jdbcType=VARCHAR } </if>
+        <if test="entity.ccdw != null and entity.ccdw != ''"> AND CCDW = #{entity.ccdw , jdbcType=VARCHAR }</if>
     </update>
 
     <update id="deleteCcrw"  parameterType="map">
@@ -207,7 +208,8 @@
         SCBZ='1'
         where SCBZ = '0'
         <if test="entity.xxbh != null and entity.xxbh != ''"> AND XXBH = #{entity.xxbh , jdbcType=VARCHAR } </if>
-        <if test="entity.rwbh != null and entity.rwbh != ''"> AND RWBH = #{entity.rwbh , jdbcType=VARCHAR } AND CCDW = #{entity.ccdw , jdbcType=VARCHAR }</if>
+        <if test="entity.rwbh != null and entity.rwbh != ''"> AND RWBH = #{entity.rwbh , jdbcType=VARCHAR }</if>
+        <if test="entity.ccdw != null and entity.ccdw != ''"> AND CCDW = #{entity.ccdw , jdbcType=VARCHAR }</if>
     </update>
 
 </mapper>
\ No newline at end of file

src/main/resources/mapper/AfisQualityCkSqlMapper.xml

@@ -225,6 +225,7 @@
         B.R_SJLXDH as r_sjlxdh,
         (select name from sys_dictitem s where s.groupid='CODE_XZQH' and s.code = B.HJDZ_XZQHDM) as hjd,
         B.ZJHM as zjhm,
+        B.GMSFHM as gmsfhm,
         S.ZW_SX as zwsx
         from AFIS_QUALITY_CK A,TB_RY_RYCJ B,SYS_PARAM_DATE S where 1=1
         AND A.R_RYBH=B.RYBH AND S.BH='1000' AND A.SCBZ = '0' AND B.SZZWBH is not null  AND (B.IFHB='0' OR B.IFHB IS NULL)
@@ -275,6 +276,7 @@
         B.R_SJLXDH as r_sjlxdh,
         (select name from sys_dictitem s where s.groupid='CODE_XZQH' and s.code = B.HJDZ_XZQHDM) as hjd,
         B.ZJHM as zjhm,
+        B.GMSFHM as gmsfhm,
         S.ZW_SX as zwsx
         from AFIS_QUALITY_CK A,TB_RY_RYCJ B,SYS_PARAM_DATE S,AFIS_QUALITY_CC cc where 1=1
         AND A.R_RYBH=B.RYBH and A.R_RYBH=cc.R_RYBH(+) AND S.BH='1000' AND A.SCBZ = '0' AND B.SZZWBH is not null  AND (B.IFHB='0' OR B.IFHB IS NULL)
@@ -323,6 +325,7 @@
         B.R_SJLXDH as r_sjlxdh,
         (select name from sys_dictitem s where s.groupid='CODE_XZQH' and s.code = B.HJDZ_XZQHDM) as hjd,
         B.ZJHM as zjhm,
+        B.GMSFHM as gmsfhm,
         S.ZW_SX as zwsx
         from AFIS_QUALITY_CK A,TB_RY_RYCJ B,SYS_PARAM_DATE S,AFIS_QUALITY_CC cc where 1=1
         AND A.R_RYBH=B.RYBH and A.R_RYBH=cc.R_RYBH(+) AND cc.QDZLJCJS='1' AND S.BH='1000' AND A.SCBZ = '0' AND B.SZZWBH is not null  AND (B.IFHB='0' OR B.IFHB IS NULL)
@@ -371,6 +374,7 @@
         B.R_SJLXDH as r_sjlxdh,
         (select name from sys_dictitem s where s.groupid='CODE_XZQH' and s.code = B.HJDZ_XZQHDM) as hjd,
         B.ZJHM as zjhm,
+        B.GMSFHM as gmsfhm,
         S.ZW_SX as zwsx
         from AFIS_QUALITY_CK A,TB_RY_RYCJ B,SYS_PARAM_DATE S,AFIS_QUALITY_CC cc where 1=1
         AND A.R_RYBH=B.RYBH and A.R_RYBH=cc.R_RYBH(+) AND A.CCBS=#{entity.ccbh , jdbcType=VARCHAR } AND S.BH='1000' AND A.SCBZ = '0' AND B.SZZWBH is not null  AND (B.IFHB='0' OR B.IFHB IS NULL)

src/main/resources/mapper/AutoTbXwRycjSqlMap.xml

@@ -230,6 +230,11 @@
          from TB_RY_RYCJ where (SCBZ='0' or SCBZ is null) AND (IFHB<![CDATA[<>]]>'1' OR IFHB IS NULL) and RYBH = #{rybh , jdbcType=VARCHAR }
     </select>
 
+    <select id="getRyxxByToday" resultMap="baseMap" parameterType="map">
+        select *
+        from TB_RY_RYCJ where (SCBZ='0' or SCBZ is null) AND (IFHB<![CDATA[<>]]>'1' OR IFHB IS NULL) and lrsj>=sysdate-1
+    </select>
+
     <select id="getRyxxByZjhm" resultMap="baseMap" parameterType="map">
         select *
         from TB_RY_RYCJ where (SCBZ='0' or SCBZ is null) AND (IFHB<![CDATA[<>]]>'1' OR IFHB IS NULL) and (ZJHM = #{zjhm , jdbcType=VARCHAR } OR GMSFHM = #{zjhm , jdbcType=VARCHAR })

src/main/resources/mapper/SysClientVpMapper.xml

@@ -83,7 +83,7 @@
             <if test="spzt!=null and spzt !=''">AND spzt = #{spzt}</if>
             <if test="sbztstr!=null and sbztstr !=''">AND sbztstr = #{sbztstr}</if>
             <if test="zrmjjh!=null and zrmjjh !=''">AND zrmjjh = #{zrmjjh}</if>
-            <if test="ssdwcode!=null and ssdwcode !=''">AND SSDW_CODE = #{ssdwcode}</if>
+            <if test="ssdwcode!=null and ssdwcode !=''">AND SSDW_CODE like  #{ssdwcode}||'%'</if>
             <if test="gxsjStr!=null and gxsjStr==1">
                 AND ry.LRSJ BETWEEN SYSDATE-1 and SYSDATE
             </if>

src/main/resources/templates/home.html

@@ -181,6 +181,9 @@
 											<li id="H10E04">
 												<a onclick="toWhgl()">维护管理</a>
 											</li>
+											<li id="H10E05">
+												<a onclick="toSjjk()">数据监控</a>
+											</li>
 										</ul>
 									</div>
 								</div>
@@ -385,6 +388,10 @@
 		window.open("/toWhgl?isfirst=1",'_blank');
 	}
 
+	function toSjjk(){
+		window.open("/toSjjk?isfirst=1",'_blank');
+	}
+
 	function toSjcjtj(){
 		window.open("/toSjtj?isfirst=1",'_blank');
 	}

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

-<!DOCTYPE html>
+<!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <html lang="en">
 <head>
@@ -370,6 +370,103 @@
             document.frminput.submit();
         }
 
+        function getTaryxx() {//初始化同案人员信息
+            $.ajax({
+                url:"/getTaryxx?rybh=",
+                type:"POST",
+                success:function(data){
+                    var ryxx = data.ryxxs;
+                    if(ryxx.length>0){
+                        var htmlStr = "<option value=''>----------- 请 选 择 ----------</option>";
+                        for(var num=0;num<ryxx.length;num++){
+                            var ry = ryxx[num];
+                            htmlStr += "<option value='"+ry.rybh+"'>姓名："+ry.xm+" 身份证号："+ry.gmsfhm+"</option>";
+                        }
+                        $("#tary1").html(htmlStr);
+                        $("#tary2").html(htmlStr);
+                        $("#tary3").html(htmlStr);
+
+
+                        if($("#taryStr1").val()!=null&&$("#taryStr1").val()!=""){
+                            $.ajax({
+                                url:"/getTaryxx?rybh="+$("#taryStr1").val(),
+                                type:"POST",
+                                success:function(data){
+                                    var ryxx = data.ryxx;
+                                    $("#tary1").append("<option value='"+ryxx.rybh+"'>姓名："+ryxx.xm+" 身份证号："+ryxx.gmsfhm+"</option>");
+                                    $("#tary1").val(ryxx.rybh);
+                                    addTaryxx(1);
+                                }
+                            });
+                        }
+                        if($("#taryStr2").val()!=null&&$("#taryStr2").val()!=""){
+                            $.ajax({
+                                url:"/getTaryxx?rybh="+$("#taryStr2").val(),
+                                type:"POST",
+                                success:function(data){
+                                    var ryxx = data.ryxx;
+                                    $("#tary2").append("<option value='"+ryxx.rybh+"'>姓名："+ryxx.xm+" 身份证号："+ryxx.gmsfhm+"</option>");
+                                    $("#tary2").val(ryxx.rybh);
+                                    addTaryxx(1);
+                                    addTaryxx(2);
+                                }
+                            });
+                        }
+                        if($("#taryStr3").val()!=null&&$("#taryStr3").val()!=""){
+                            $.ajax({
+                                url:"/getTaryxx?rybh="+$("#taryStr3").val(),
+                                type:"POST",
+                                success:function(data){
+                                    var ryxx = data.ryxx;
+                                    $("#tary3").append("<option value='"+ryxx.rybh+"'>姓名："+ryxx.xm+" 身份证号："+ryxx.gmsfhm+"</option>");
+                                    $("#tary3").val(ryxx.rybh);
+                                    addTaryxx(2);
+                                }
+                            });
+                        }
+                    }else{
+                        if($("#taryStr1").val()!=null&&$("#taryStr1").val()!=""){
+                            $.ajax({
+                                url:"/getTaryxx?rybh="+$("#taryStr1").val(),
+                                type:"POST",
+                                success:function(data){
+                                    var ryxx = data.ryxx;
+                                    $("#tary1").html("<option value=''>----------- 请 选 择 ----------</option><option value='"+ryxx.rybh+"'>姓名："+ryxx.xm+" 身份证号："+ryxx.gmsfhm+"</option>");
+                                    $("#tary1").val(ryxx.rybh);
+                                    addTaryxx(1);
+                                }
+                            });
+                        }
+                        if($("#taryStr2").val()!=null&&$("#taryStr2").val()!=""){
+                            $.ajax({
+                                url:"/getTaryxx?rybh="+$("#taryStr2").val(),
+                                type:"POST",
+                                success:function(data){
+                                    var ryxx = data.ryxx;
+                                    $("#tary2").html("<option value=''>----------- 请 选 择 ----------</option><option value='"+ryxx.rybh+"'>姓名："+ryxx.xm+" 身份证号："+ryxx.gmsfhm+"</option>");
+                                    $("#tary2").val(ryxx.rybh);
+                                    addTaryxx(1);
+                                    addTaryxx(2);
+                                }
+                            });
+                        }
+                        if($("#taryStr3").val()!=null&&$("#taryStr3").val()!=""){
+                            $.ajax({
+                                url:"/getTaryxx?rybh="+$("#taryStr3").val(),
+                                type:"POST",
+                                success:function(data){
+                                    var ryxx = data.ryxx;
+                                    $("#tary3").html("<option value=''>----------- 请 选 择 ----------</option><option value='"+ryxx.rybh+"'>姓名："+ryxx.xm+" 身份证号："+ryxx.gmsfhm+"</option>");
+                                    $("#tary3").val(ryxx.rybh);
+                                    addTaryxx(2);
+                                }
+                            });
+                        }
+                    }
+                }
+            });
+        }
+
         function addRyzpimg() {//初始化数据
             var FileReader = window.FileReader;
             if (FileReader) {//chrome浏览器处理
@@ -511,6 +608,19 @@
             $("#rqttzms").val($("#rqttzmsStr").val());
 
             $("#zjlxdm").combobox("setValue",$("#zjlxdmStr").val());
+            if($("#gxrlxdmStr1").val()!=null&&$("#gxrlxdmStr1").val()!="") {
+                $("#gxrlxdm1").combobox("setValue", $("#gxrlxdmStr1").val());
+                addGxrxx(1);
+            }
+            if($("#gxrlxdmStr2").val()!=null&&$("#gxrlxdmStr2").val()!=""){
+                $("#gxrlxdm2").combobox("setValue",$("#gxrlxdmStr2").val());
+                addGxrxx(1);
+                addGxrxx(2);
+            }
+            if($("#gxrlxdmStr3").val()!=null&&$("#gxrlxdmStr3").val()!="") {
+                $("#gxrlxdm3").combobox("setValue", $("#gxrlxdmStr3").val());
+                addGxrxx(2);
+            }
             $("#xdhwdm").combobox("setValue",$("#xdhwdmStr").val());
             $("#xydm").combobox("setValue",$("#xydmStr").val());
             $("#dnayblxdm").combobox("setValue",$("#dnayblxdmStr").val());
@@ -584,6 +694,7 @@
             codeVal=codeFormatter($("#zwcjdwdmStr").val(),"CODE_UNIT");
             $("#zwcjdwdm").val(codeVal);
             addRyzpimg();
+            getTaryxx();
 
             if($("#szzwbh").val()!=null&&$("#szzwbh").val()!=""){
                 $("#zwifcj").attr("src","/static/rygl/img/yes.png");
@@ -2305,7 +2416,7 @@
 
                     <div class="input-group l1 br">
                         <span class="input-group-addon" style="width:32%; height:32px;">关系类型</span>
-                        <input id="gxlxdm1" name="gxrlxdm1"  type="text" style="width:66%; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_GXLX',method:'get',textField : 'text', valueField : 'id'"/>
+                        <input id="gxrlxdm1" name="gxrlxdm1"  type="text" style="width:66%; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_GXLX',method:'get',textField : 'text', valueField : 'id'"/>
                         <input type="hidden" id="gxrlxdmStr1" th:value="${ryxx.gxrlxdm1}"/>
                         <input type="hidden" id="gxrlxdmStr2" th:value="${ryxx.gxrlxdm2}"/>
                         <input type="hidden" id="gxrlxdmStr3" th:value="${ryxx.gxrlxdm3}"/>
@@ -2322,7 +2433,7 @@
 
                     <div class="input-group l1 br" id="gxr21" style="display:none;">
                         <span class="input-group-addon" style="width:32%; height:32px;">关系类型</span>
-                        <input id="gxlxdm2" name="gxrlxdm2"  type="text" style="width:66%; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_GXLX',method:'get',textField : 'text', valueField : 'id'"/>
+                        <input id="gxrlxdm2" name="gxrlxdm2"  type="text" style="width:66%; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_GXLX',method:'get',textField : 'text', valueField : 'id'"/>
                     </div>
                     <div class="input-group l1" style="width: 288px;display:none;" id="gxr22">
                         <span class="input-group-addon">关系人姓名</span>
@@ -2336,7 +2447,7 @@
 
                     <div class="input-group l1 br" id="gxr31" style="display:none;">
                         <span class="input-group-addon" style="width:32%; height:32px;">关系类型</span>
-                        <input id="gxlxdm3" name="gxrlxdm3"  type="text" style="width:66%; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_GXLX',method:'get',textField : 'text', valueField : 'id'"/>
+                        <input id="gxrlxdm3" name="gxrlxdm3"  type="text" style="width:66%; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_GXLX',method:'get',textField : 'text', valueField : 'id'"/>
                     </div>
                     <div class="input-group l1" style="width: 288px;display:none;" id="gxr32">
                         <span class="input-group-addon">关系人姓名</span>

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

@@ -639,13 +639,6 @@
             pageList : [10,20,50,100,200], //rows
             pageNumber : 1,
             loadFilter: function(data){
-                var ifxz = $("#ifxz").val();
-                if(ifxz=="1"&&data!=null&&data.total>0){
-                    $.messager.alert( '提示',"该人员在近3天内录入过人员信息，请在列表中选择该人员信息进行修改操作！");
-                }else if(ifxz=="1"){
-                    addpage();
-                }
-                $("#ifxz").val("0");
                 return data;
             }
         });
@@ -869,21 +862,15 @@
     }
     //新增
     function toAddpage(){
-        var zjhm=$("#zjhm").val();
-        if(zjhm==null||zjhm==""){
-            $.messager.alert( '提示',"请在查询条件中输入需要采集人员的身份证号码,如无身份证号请填写“无”！");
-            return;
+        var perurl=$("#perurl").html();
+        if(perurl.indexOf("sbqx")>=0){
+            perurl=0
         }else{
-            var reg=/^[1-9]([0-9]{14}|[0-9X]{17})$/
-            if(zjhm!="无"&&!reg.test(zjhm)){
-                $.messager.alert( '提示',"请输入正确的身份证号！");
-                return -1;
-            }else{
-                $("#flrsjStr").datebox("setValue",$("#cxqssj").val());
-                $("#ifxz").val("1");
-                doQuery();
-            }
+            perurl=1
         }
+        //var url = "openIE:"+$("#webappurl").val()+"/toHome?asjxgrybh=,"+$("#username").val()+"";
+        var url = "/toAddRyxx?perurl="+perurl+"&gmsfzh="+zjhm;
+        window.open(url);
     }
 
     //新增

src/main/resources/templates/zlcc/zlcc.html

@@ -52,37 +52,30 @@
                                 <td colspan="6" style="height:20px;"></td>
                             </tr>
                             <tr>
-                                <td class="ar" width="13.3%">采集时间：</td>
+                                <td class="ar" width="13.3%">抽查时间：</td>
                                 <td width="20%">
                                     <span class="textbox" >
-                                        <input id="fRCjsjStr" name="fRCjsjStr" class="Wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd'})"/>
+                                        <input readonly="readonly" id="fRCjsjStr" name="fRCjsjStr" type="text" th:value="${ccrw.ccsjQssjStr}"/>
                                     </span>
                                 </td>
                                 <td class="ar" width="13.3%">至：</td>
                                 <td width="20%">
                                     <span class="textbox">
-                                        <input id="eRCjsjStr" name="eRCjsjStr" class="Wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd'})"/>
+                                        <input readonly="readonly" id="eRCjsjStr" name="eRCjsjStr" type="text" th:value="${ccrw.ccsjJzsjStr}"/>
                                     </span>
                                 </td>
                                 <td class="ar" width="13.3%">采集单位：</td>
                                 <td width="20%">
                                     <span class="textbox">
-                                        <input type="text" style="height: 34px;" id="RCjdw" name="RCjdw" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
+                                        <input readonly="readonly" id="dwmc" name="dwmc" type="text" value=""/>
+                                        <input type="hidden" id="RCjdw" name="RCjdw" th:value="${ccrw.ccdw}"/>
                                     </span>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="ar" width="13.3%">生成样本数：</td>
                                 <td width="20%">
-                                    <span class="textbox" style="font-size: 13px;">
-                                        <select name="ccfs" style="height: 34px;width: 100%;font-size: 13px;">
-                                            <option value="10">10</option>
-                                            <option value="20" selected="selected">20</option>
-                                            <option value="50">50</option>
-                                            <option value="80">80</option>
-                                            <option value="100">100</option>
-                                        </select>
-                                    </span>
+                                    <input readonly="readonly" name="ccfs" type="text" th:value="${ccrw.ccfs}"/>
                                 </td>
                                 <td class="ar" width="13.3%"></td>
                                 <td width="20%"></td>
@@ -92,7 +85,7 @@
                             <tr>
                                 <td colspan="6">
                                     <div style="width: 100%; float: left; text-align: center;height: 44px;line-height: 44px;">
-                                        <a class="btn_a btn_search" onclick="doQuery('0')">生成抽样对象</a>
+                                        <a class="btn_a btn_search" onclick="doQuery('0')">重新生成抽样对象</a>
                                     </div>
                                 </td>
                             </tr>
@@ -235,7 +228,6 @@
     <script type="text/javascript" src="static/xtba/zlcc/css/datepicker/WdatePicker.js"></script>
     <script type="text/javascript" src="static/xtba/zlcc/css/datepicker/calendar.js"></script>
     <script>
-        openCombotree('RCjdw');
         $('#zljctable').datagrid({
             striped : true,
             singleSelect:true,
@@ -370,11 +362,27 @@
         $(function(){
             $("#fRCjsjStr").val($("#ccsjQssjStr").val());
             $("#eRCjsjStr").val($("#ccsjJzsjStr").val());
-            $("#RCjdw").combotree("setValue",$("#ccdw").val()+"00000000");
+            var ccdw = $("#ccdw").val();
+            if(ccdw.indexOf('4601') >= 0){
+                $("#dwmc").val("海口市公安局");
+            }
+            if(ccdw.indexOf('4602') >= 0){
+                $("#dwmc").val("三亚市公安局");
+            }
+            if(ccdw.indexOf('4603') >= 0){
+                $("#dwmc").val("洋浦经济开发区公安局");
+            }
+            if(ccdw.indexOf('4604') >= 0){
+                $("#dwmc").val("三沙市公安局");
+            }
+            if(ccdw.indexOf('4605') >= 0){
+                $("#dwmc").val("海口铁路公安处");
+            }
             doQuery();
         });
         function openNew(rybh,szzwbh,cjsj){
             //window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank');
+            /*
             var ccfs = $("#ccfs").val();
             var jcfs = $("#jcfs").val();
             if(jcfs>=ccfs){
@@ -407,8 +415,8 @@
                     $.messager.alert( '提示',"质量详情出错，请联系技术人员！");
                 }
             });
-
-
+*/
+            window.open("/toZlcc?rybh="+rybh+"&szzwbh="+szzwbh+"&ccbh="+$("#ccbh").val(),'_blank');
             //window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank');
         }
         function openXq(rybh,szzwbh,cjsj){