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

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

@@ -25,6 +25,8 @@ public interface AfisQualityCcrwDao extends MyMapper<AfisQualityCcrw> {
 
     public List<AfisQualityCcrw> getAfisQualityCcrw(Map<String, Object> map);
 
+    public List<AfisQualityCcrw> getAfisQualityCcrwlbxq(Map<String, Object> map);
+
     public List<AfisQualityCcrw> getAfisQualityCcrwByRwbh(Map<String, Object> map);
 
     public boolean insertCcrw(Map<String, Object> map);

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

 package com.founder.dao;
 
 import com.founder.model.AfisQualityCk;
+import com.founder.model.AfisQualityDto;
 import com.founder.util.MyMapper;
 import org.springframework.stereotype.Component;
 
@@ -51,4 +52,17 @@ public interface AfisQualityCkDao extends MyMapper<AfisQualityCk> {
 
     public List<AfisQualityCk> queryZlccWcPageList(Map<String, Object> map);
 
+    public List<AfisQualityCk> queryZlccDwList(Map<String, Object> map);
+
+    public List<AfisQualityDto> queryZlccjcPageList(Map<String, Object> map);
+
+    /***************************抽查任务导出*******************************************/
+    /**
+     * 抽查任务下的单位
+     * @param map
+     * @return
+     */
+    public List<AfisQualityDto> queryZlccRwDwList(Map<String, Object> map);
+    public List<AfisQualityDto> queryCcrwtjList(Map<String, Object> map);
+    /*********************************************************************/
 }

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

@@ -17,6 +17,9 @@ import java.util.Map;
 public interface IDictitemDao {
 	List<SysDictitem> queryDictList(Map map);
 	List<SysDictitem> getDictByRybh(Map<String, Object> map);
+
+	List<SysDictitem> queryDictByPid(Map<String, Object> map);
+
 	int queryDictPageCount(Map map);
 	boolean deleteDict(String dictId);
 	boolean insertDict(Map map);

src/main/java/com/founder/khtj/dao/KhtjDao.java

@@ -18,9 +18,11 @@ public interface KhtjDao {
     public List<RstBean> getRycjtjListzwcjs(Map<String, String> map);
     public List<RstBean> getRycjtjListzwxzcjs(Map<String, String> map);
     public List<RstBean> getRycjtjListzwwcjs(Map<String, String> map);
+    public List<RstBean> getRycjtjListzwzlcjs(Map<String, String> map);//指纹质量采集数
     public List<RstBean> getRycjtjListrxcjs(Map<String, String> map);
     public List<RstBean> getRycjtjListrxxzcjs(Map<String, String> map);
     public List<RstBean> getRycjtjListrxwcjs(Map<String, String> map);
+    public List<RstBean> getRycjtjListrxzlcjs(Map<String, String> map);//人像质量采集数
 
     public List<RstBean> getRycjtjListsgcjs(Map<String, String> map);
     public List<RstBean> getRycjtjListsgxzcjs(Map<String, String> map);
@@ -46,6 +48,8 @@ public interface KhtjDao {
     public List<RstBean> getRycjtjListdnaxzcjs(Map<String, String> map);
     public List<RstBean> getRycjtjListdnawcjs(Map<String, String> map);
 
+    public List<RstBean> getRycjtjListsjcjsNew(Map<String, String> map);//根据新的手机采集数定义获取数据
+    public List<RstBean> getRycjtjListsjzlcjs(Map<String, String> map);//手机质量采集数
     public List<RstBean> getRycjtjListsjcjs(Map<String, String> map);
     public List<RstBean> getRycjtjListsjlxcjs(Map<String, String> map);
     public List<RstBean> getRycjtjListsjxzcjs(Map<String, String> map);
@@ -60,5 +64,6 @@ public interface KhtjDao {
 
     public List<AutoTbStRy> queryPageList(Map<String, Object> map);
     public List<AutoTbStRy> querySjxxPageList(Map<String, Object> map);
+    public List<AutoTbStRy> queryHglPageList(Map<String, Object> map);
 
 }

src/main/java/com/founder/khtj/domain/RstBean.java

@@ -28,6 +28,9 @@ public class RstBean  implements Serializable {
 	private String zycs;//应采数
 	private String zycstotal;//应采总数
 
+	private String zwycs;//指纹应采数
+	private String zwzlcjs;//指纹质量采集数
+	private String zwzlcjl;//指纹质量采集率
 	private String zwcjs;//指纹采集数
 	private String zwxzcjs;//指纹新增采集数
 	private String zwwcjs;//指纹未采集数
@@ -37,6 +40,9 @@ public class RstBean  implements Serializable {
 	private String zwwcjtotal;//指纹未采集总数
 	private String zwcjltotal;//指纹采集总率
 
+	private String rxycs;//人像应采数
+	private String rxzlcjs;//人像质量采集数
+	private String rxzlcjl;//人像质量采集率
 	private String rxcjs;//人像采集数
 	private String rxxzcjs;//人像新增采集数
 	private String rxwcjs;//人像未采集数
@@ -73,6 +79,8 @@ public class RstBean  implements Serializable {
 	private String zjwcjtotal;//足迹未采集总数
 	private String zjcjltotal;//足迹采集总率
 
+	private String sjzlcjs;//手机质量采集数
+	private String sjzlcjl;//手机质量采集率
 	private String sjycs;//手机应采数
 	private String sjcjs;//手机采集数
 	private String sjxzcjs;//手机新增采集数
@@ -99,6 +107,8 @@ public class RstBean  implements Serializable {
 	private String dnawcjtotal;//DNA未采集总数
 	private String dnacjltotal;//DNA采集总率
 
+	private  String sxzlcjl;//三项质量合格率，表示十指纹、人像、手机质量合格率
+
 
 	public String getRys() {
 		return rys;
@@ -671,4 +681,78 @@ public class RstBean  implements Serializable {
 	public void setSjsxwcjtotal(String sjsxwcjtotal) {
 		this.sjsxwcjtotal = sjsxwcjtotal;
 	}
+
+
+
+	public String getZwzlcjs() {
+		return zwzlcjs;
+	}
+
+	public void setZwzlcjs(String zwzlcjs) {
+		this.zwzlcjs = zwzlcjs;
+	}
+
+	public String getZwzlcjl() {
+		return zwzlcjl;
+	}
+
+	public void setZwzlcjl(String zwzlcjl) {
+		this.zwzlcjl = zwzlcjl;
+	}
+
+	public String getRxzlcjs() {
+		return rxzlcjs;
+	}
+
+	public void setRxzlcjs(String rxzlcjs) {
+		this.rxzlcjs = rxzlcjs;
+	}
+
+	public String getRxzlcjl() {
+		return rxzlcjl;
+	}
+
+	public void setRxzlcjl(String rxzlcjl) {
+		this.rxzlcjl = rxzlcjl;
+	}
+
+	public String getSjzlcjs() {
+		return sjzlcjs;
+	}
+
+	public void setSjzlcjs(String sjzlcjs) {
+		this.sjzlcjs = sjzlcjs;
+	}
+
+	public String getSjzlcjl() {
+		return sjzlcjl;
+	}
+
+	public void setSjzlcjl(String sjzlcjl) {
+		this.sjzlcjl = sjzlcjl;
+	}
+
+	public String getSxzlcjl() {
+		return sxzlcjl;
+	}
+
+	public void setSxzlcjl(String sxzlcjl) {
+		this.sxzlcjl = sxzlcjl;
+	}
+
+	public String getZwycs() {
+		return zwycs;
+	}
+
+	public void setZwycs(String zwycs) {
+		this.zwycs = zwycs;
+	}
+
+	public String getRxycs() {
+		return rxycs;
+	}
+
+	public void setRxycs(String rxycs) {
+		this.rxycs = rxycs;
+	}
 }

src/main/java/com/founder/khtj/service/IRycjtjService.java

@@ -13,6 +13,10 @@ public interface IRycjtjService {
 
     public List<RstBean> getSjcjs(RstBean ajflpt, String unit_matchstring, int unitgrade, int ifslgzd);
 
+    public List<RstBean> getHgl(RstBean ajflpt, String unit_matchstring, int unitgrade, int ifslgzd);
+
+    public EasyUIPage queryHglPage(EasyUIPage page, String unitCode,String startCcsj,String endCcsj,String slType,String unitgrade,String cot);
+
     public EasyUIPage queryRyxxPage(EasyUIPage page, String unitCode,String startCcsj,String endCcsj,String slType,String unitgrade,String cot,String ifslgzd);
     public EasyUIPage querySjxxPage(EasyUIPage page, String unitCode,String startCcsj,String endCcsj,String slType,String unitgrade,String cot);
 }

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

@@ -19,6 +19,7 @@ public class AfisQualityCcrw implements Serializable {
 	private Date ccsjJzsj; //抽查时间截止时间
 	private String ccsjJzsjStr; //抽查时间截止时间
 	private String ccdw;    //抽查单位
+	private String ccdwStr; //抽查单位名称
 	private String ccfs;    //抽查份数
 	private String jcfs;    //已检查份数
 	private String cjdwdm;  //创建单位
@@ -30,6 +31,14 @@ public class AfisQualityCcrw implements Serializable {
 	private String gxr;     //修改人
 	private Date gxsj;      //修改时间
 
+	public String getCcdwStr() {
+		return ccdwStr;
+	}
+
+	public void setCcdwStr(String ccdwStr) {
+		this.ccdwStr = ccdwStr;
+	}
+
 	public String getXxbh() {
 		return xxbh;
 	}

src/main/java/com/founder/module/redis/controller/DictController.java

@@ -98,6 +98,18 @@ public class DictController {
         return ZTreeNodeList;
     }
 
+    @RequestMapping(value = "/queryDictByPid", method = RequestMethod.GET)
+    @ResponseBody
+    public List<SysDictitem> queryDictByPid( String code,HttpServletRequest request) {
+        User user = (User)request.getSession().getAttribute("User");
+        String pid  = user.getUnitcode();
+        List<SysDictitem> dictitemList = new ArrayList<SysDictitem>();
+        dictitemList = dicItemService.queryDictByPid(code,pid);
+        return dictitemList;
+    }
+
+
+
     @RequestMapping(value="/queryAjxzJsonActon",method= RequestMethod.GET,produces="text/html;charset=UTF-8")
     @ResponseBody
     public String queryAjxzJson(String yycj,String code_val,String flag) {

src/main/java/com/founder/module/redis/service/IDicItemService.java

@@ -21,6 +21,12 @@ public interface IDicItemService {
     boolean updateDict(SysDictitem entity);
 
     /**
+     * 根据字典pid与code查询
+     * @return
+     */
+    List<SysDictitem> queryDictByPid(String code,String pid);
+
+    /**
      * 查询字典类别
      * @return
      */

src/main/java/com/founder/module/redis/service/impl/IDicItemServiceImpl.java

@@ -201,6 +201,14 @@ public class IDicItemServiceImpl implements IDicItemService {
         return dicItemDao.updateDict(map);
     }
 
+    @Override
+    public List<SysDictitem> queryDictByPid(String code,String pid) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("code",code);
+        map.put("pid",pid);
+        List<SysDictitem> sysDictitems = dicItemDao.queryDictByPid(map);
+        return sysDictitems;
+    }
 
 
     public List<ZTreeNode> getZtreeNode(String code_type, String id, String yycj, String unitcode) {

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

@@ -9,10 +9,12 @@ import java.util.List;
 
 public interface AfisQualityCcrwService extends IService<AfisQualityCcrw> {
 
-    public EasyUIPage queryZlccrwPage(EasyUIPage page, AfisQualityCcrw entity,String ifwc);
+    public EasyUIPage queryZlccrwPage(EasyUIPage page, AfisQualityCcrw entity,String ifwc,String pid);
 
     public AfisQualityCcrw getAfisQualityCcrw(String xxbh);
 
+    public AfisQualityCcrw getAfisQualityCcrwlbxq(String xxbh,String rwbh,String sfdrw);
+
     public AfisQualityCcrw getAfisQualityCcrwByRwbh(String rwbh);
 
     public boolean insertCcrw(AfisQualityCcrw entity);

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

 package com.founder.service;
 
 import com.founder.model.AfisQualityCk;
+import com.founder.model.AfisQualityDto;
 import com.founder.model.User;
 import com.founder.utils.EasyUIPage;
 
@@ -19,11 +20,30 @@ public interface AfisQualityService extends IService<AfisQualityCk> {
 
     public EasyUIPage queryZljcPage(EasyUIPage page, AfisQualityCk entity);
 
-    public EasyUIPage queryZlccPage(EasyUIPage page, AfisQualityCk entity,int ccfs,String rwbh,String flg);
+    public EasyUIPage queryZlccPage(EasyUIPage page, AfisQualityCk entity,int ccfs,String rwbh,String flg,int jcfs);
 
     public List<AfisQualityCk> queryZljcList(AfisQualityCk entity);
 
-    public List<AfisQualityCk> queryZlccList(AfisQualityCk entity,String rwbh);
+    public List<AfisQualityDto> queryZlccList(AfisQualityCk entity, String rwbh);
+
+    public EasyUIPage queryZlccjcPage(EasyUIPage page, AfisQualityCk entity,String sfdrw, String ccdw,String ssdw);
+
+    /**
+     * 质量抽查详情导出
+     * @param entity
+     * @param sfdrw
+     * @return
+     */
+    public List<AfisQualityDto> getCcdwData( AfisQualityCk entity,String sfdrw,String ccdw);
+
+
+    /**
+     * 获取抽查任务单位
+     * @param entity
+     * @param sfdrw
+     * @return
+     */
+    public List<AfisQualityDto> queryZlccRwDwList( AfisQualityCk entity,String sfdrw);
     /**
      * 指纹质量检查保存函数
      * @param afisQualityCk

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

 package com.founder.service.impl;
 
 import com.founder.dao.AfisQualityCcrwDao;
+import com.founder.dao.IDictitemDao;
 import com.founder.model.AfisQualityCcrw;
+import com.founder.model.SysDictitem;
 import com.founder.service.AfisQualityCcrwService;
 import com.founder.utils.EasyUIPage;
 import org.slf4j.Logger;
@@ -10,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Resource;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -25,8 +28,11 @@ public class AfisQualityCcrwServiceImpl extends BaseService<AfisQualityCcrw> imp
     @Autowired
     private AfisQualityCcrwDao mapper;
 
+    @Resource
+    private IDictitemDao dictitemDao;
+
     @Override
-    public EasyUIPage queryZlccrwPage(EasyUIPage page, AfisQualityCcrw entity,String ifwc) {
+    public EasyUIPage queryZlccrwPage(EasyUIPage page, AfisQualityCcrw entity,String ifwc,String pid) {
         Map<String, Object> map = new HashMap<>();
         map.put("begin", page.getBegin());
         map.put("end", page.getEnd());
@@ -39,6 +45,10 @@ public class AfisQualityCcrwServiceImpl extends BaseService<AfisQualityCcrw> imp
         map.put("sort", sort);
         map.put("order", order);
         map.put("entity", entity);
+        //添加字典查询条件
+        map.put("code","CODE_SXDWCC");
+        map.put("pid",pid);
+        List<SysDictitem> dictitemList = dictitemDao.queryDictByPid(map);
         if(entity!=null&&entity.getRwbh()!=null&&!"".equals(entity.getRwbh())){
             page.setTotal(mapper.queryZlccrwByRwbhPageCount(map));
         }else {
@@ -73,6 +83,20 @@ public class AfisQualityCcrwServiceImpl extends BaseService<AfisQualityCcrw> imp
                 }else{
                     afisQualityCks.get(i).setCcsjJzsjStr("");
                 }
+                if(afisQualityCks.get(i).getCcdw() != null){
+                    String ccdwStr ="";
+                    String[] words = afisQualityCks.get(i).getCcdw() .split(",");
+                    for (SysDictitem dict:dictitemList ) {
+                            for (int s=0;s<words.length;s++){
+                                if(dict.getCode().substring(0,6).equals(words[s])){
+                                    ccdwStr += ","+dict.getName();
+                                }
+                            }
+                    }
+                    if(ccdwStr != null && ccdwStr !="") {
+                        afisQualityCks.get(i).setCcdw(ccdwStr.substring(1));
+                    }
+                }
             }
 
             page.setRows(afisQualityCks);
@@ -104,6 +128,31 @@ public class AfisQualityCcrwServiceImpl extends BaseService<AfisQualityCcrw> imp
     }
 
     @Override
+    public AfisQualityCcrw getAfisQualityCcrwlbxq(String xxbh, String rwbh,String sfdrw) {
+        AfisQualityCcrw xyrC = new AfisQualityCcrw();
+        Map map = new HashMap();
+        map.put("xxbh", xxbh);
+        map.put("rwbh", rwbh);
+        map.put("sfdrw", sfdrw);
+        List<AfisQualityCcrw> xyrCs = mapper.getAfisQualityCcrwlbxq(map);
+        if ((xyrCs != null) && (xyrCs.size() > 0)) {
+            xyrC = xyrCs.get(0);
+            DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+            if(xyrC.getCcsjQssj()!=null&&!"".equals(xyrC.getCcsjQssj())){
+                xyrC.setCcsjQssjStr(df.format(xyrC.getCcsjQssj()));
+            }else{
+                xyrC.setCcsjQssjStr("");
+            }
+            if(xyrC.getCcsjJzsj()!=null&&!"".equals(xyrC.getCcsjJzsj())){
+                xyrC.setCcsjJzsjStr(df.format(xyrC.getCcsjJzsj()));
+            }else{
+                xyrC.setCcsjJzsjStr("");
+            }
+        }
+        return xyrC;
+    }
+
+    @Override
     public AfisQualityCcrw getAfisQualityCcrwByRwbh(String rwbh)
     {
         AfisQualityCcrw xyrC = new AfisQualityCcrw();

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

@@ -37,6 +37,7 @@ public class ExportExcels {
         // 第四步，创建单元格，并设置值表头 设置表头居中
         HSSFCellStyle style = wb.createCellStyle();
         style.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 创建一个居中格式
+        style.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);//垂直居中
 
         //声明列对象
         HSSFCell cell = null;

src/main/resources/mapper/AfisQualityCcrwSqlMapper.xml

@@ -17,7 +17,7 @@
     <sql id="queryWhere">
         <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 } </if>
-        <if test="entity.ccdw != null and entity.ccdw != ''"> AND CCDW = #{entity.ccdw , jdbcType=VARCHAR } </if>
+        <if test="entity.ccdw != null and entity.ccdw != ''"> AND CCDW = #{entity.ccdw , jdbcType=VARCHAR }</if>
         <if test="entity.cjdwdm != null and entity.cjdwdm != ''"> AND CJDWDM = #{entity.cjdwdm , jdbcType=VARCHAR } </if>
         <if test="entity.ccsjQssjStr != null and entity.ccsjQssjStr != ''"> AND cjsj <![CDATA[>=]]> to_date(#{entity.ccsjQssjStr , jdbcType=VARCHAR },'yyyy-mm-dd') </if>
         <if test="entity.ccsjJzsjStr != null and entity.ccsjJzsjStr != ''"> AND cjsj <![CDATA[<]]> to_date(#{entity.ccsjJzsjStr , jdbcType=VARCHAR },'yyyy-mm-dd')+1 </if>
@@ -114,6 +114,7 @@
         A.XXBH as xxbh,
         A.RWBH as rwbh,
         A.CCDW as ccdw,
+        (select name from sys_dictitem s where s.groupid='CODE_SXDWCC' and SUBSTR(s.code,0, 6) = A.CCDW) as ccdwStr ,
         A.CCSJ_QSSJ as ccsjQssj,
         A.CCSJ_JZSJ as ccsjJzsj,
         A.CCFS as ccfs,
@@ -128,6 +129,49 @@
         and A.XXBH = #{xxbh , jdbcType=VARCHAR }
     </select>
 
+    <!--  质量抽查多任务列表  -->
+    <select id="getAfisQualityCcrwlbxq" resultType="com.founder.model.AfisQualityCcrw" parameterType="map">
+                    SELECT
+            	A.XXBH AS xxbh,
+            	A.RWBH AS rwbh,
+            	A.CCDW AS ccdw,
+            	( SELECT name FROM sys_dictitem s WHERE s.groupid = 'CODE_SXDWCC' AND SUBSTR( s.code, 0, 6 ) = A.CCDW ) AS ccdwStr,
+            	A.CCSJ_QSSJ AS ccsjQssj,
+            	A.CCSJ_JZSJ AS ccsjJzsj,
+        <if test=" sfdrw == 'true'">
+            	cs.CCFS AS ccfs,
+            	cs.JCFS AS jcfs,
+        </if>
+        <if test="sfdrw == 'false'">
+            A.CCFS AS ccfs,
+            A.JCFS AS jcfs,
+        </if>
+            	A.CJDWDM AS cjdwdm,
+            	A.CJR AS cjr,
+            	A.BZ AS bz,
+            	A.RWBZ AS rwbz,
+            	A.CJSJ AS cjsj
+            FROM
+        <if test=" sfdrw == 'true'">
+            	(
+            	SELECT
+            		sum( A.jcfs ) AS jcfs,
+            		SUM( A.ccfs ) AS ccfs,
+            		rwbh
+            	FROM
+            		AFIS_QUALITY_CCRW A
+            	WHERE
+            		A.rwbh = #{rwbh , jdbcType=VARCHAR }
+            		AND A.SCBZ = '0'
+            	GROUP BY
+            		rwbh
+            	) cs,
+        </if>
+            	AFIS_QUALITY_CCRW A
+            WHERE A.SCBZ = '0'
+        and A.XXBH = #{xxbh , jdbcType=VARCHAR }
+    </select>
+
     <select id="getAfisQualityCcrwByRwbh" resultType="com.founder.model.AfisQualityCcrw" parameterType="map">
         select
         A.XXBH as xxbh,
@@ -208,7 +252,7 @@
         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 } </if>
-        <if test="entity.rwbh == null or entity.rwbh == ''"> AND RWBH ='' </if>
+<!--         <if test="entity.rwbh == null or entity.rwbh == ''"> AND RWBH ='' </if>-->
     </update>
 
 </mapper>
\ No newline at end of file

src/main/resources/mapper/DictitemSqlMap.xml

@@ -44,10 +44,13 @@
 
     <sql id="queryWhere">
         <if test="entity.code != null and entity.code != ''">AND CODE = #{entity.code , jdbcType=VARCHAR }</if>
-        <if test="entity.groupid != null and entity.groupid != ''">AND GROUPID = #{entity.groupid , jdbcType=VARCHAR }</if>
+        <if test="entity.groupid != null and entity.groupid != ''">AND GROUPID = #{entity.groupid , jdbcType=VARCHAR }
+        </if>
         <if test="entity.name != null and entity.name != ''">AND NAME like #{entity.name , jdbcType=VARCHAR }||'%'</if>
         <if test="entity.lrdwdm != null and entity.lrdwdm != ''">AND LRDWDM = #{entity.lrdwdm , jdbcType=VARCHAR }</if>
-        <if test="entity.groupname != null and entity.groupname != ''">AND GROUPNAME like #{entity.groupname , jdbcType=VARCHAR } ||'%'</if>
+        <if test="entity.groupname != null and entity.groupname != ''">AND GROUPNAME like
+            #{entity.groupname , jdbcType=VARCHAR } ||'%'
+        </if>
         <if test="entity.lrsj != null">AND LRSJ = #{entity.lrsj , jdbcType=TIMESTAMP }</if>
 
     </sql>
@@ -81,6 +84,22 @@
          from SYS_DICTITEM where (SCBZ='0' or SCBZ is null)  and ID = #{dictId , jdbcType=VARCHAR }
     </select>
 
+    <select id="queryDictByPid" resultMap="BaseResultMap" parameterType="map">
+        SELECT
+	code,
+	name,
+	groupid,
+	pid
+        FROM
+	SYS_DICTITEM
+        WHERE
+	groupid = #{code , jdbcType=VARCHAR }
+	AND scbz = '0'
+        <if test="pid != null and pid != ''">
+	and pid = #{pid , jdbcType=VARCHAR }
+        </if>
+    </select>
+
     <select id="queryDictGroupId" resultType="com.founder.model.ZTreeNode">
         select GROUPID as ids,GROUPID as id, GROUPID as codeType,null as pid, GROUPNAME as name, GROUPNAME as text, count(1)
         from SYS_DICTITEM
@@ -308,7 +327,9 @@
 
         <if test="entity.yycj5 != null and entity.yycj5 != ''">YYCJ5 = #{entity.yycj5 , jdbcType=VARCHAR },</if>
         <if test="entity.yycj6 != null and entity.yycj6 != ''">YYCJ6 = #{entity.yycj6 , jdbcType=VARCHAR },</if>
-        <if test="entity.description != null and entity.description != ''">DESCRIPTION = #{entity.description , jdbcType=VARCHAR },</if>
+        <if test="entity.description != null and entity.description != ''">DESCRIPTION =
+            #{entity.description , jdbcType=VARCHAR },
+        </if>
         <if test="entity.description == null or entity.description == ''">DESCRIPTION = null,</if>
         <if test="entity.endcode != null and entity.endcode != ''">ENDCODE = #{entity.endcode , jdbcType=VARCHAR },</if>
         <if test="entity.startcode != null and entity.startcode != ''">STARTCODE

src/main/resources/mapper/KhtjDao.xml

@@ -679,4 +679,134 @@
         WHERE ROWNUM <= #{ end } ) t
         WHERE rn > #{ begin } ]]>
   </select>
+
+  <!-- 按单位分组统计人员采集数(手机采集数)  -->
+  <select id="getRycjtjListsjcjsNew"  parameterType="map" resultType="com.founder.khtj.domain.RstBean">
+    select substr(substr(p.lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) sjcjs from TB_RY_RYCJ p,
+    (select sjcj.xyrbh rybh, count(*) iftxlcj from TB_PH_LXRXX sjcj where sjcj.SCBZ = '0'  group by sjcj.xyrbh) rt,
+    (select sjcj.xyrbh rybh, count(*) iftxlcj from TB_PH_FZXYRSJGL sjcj where sjcj.SCBZ = '0'  group by sjcj.xyrbh) sj,
+    (select sjcj.xyrbh rybh, count(*) iftxlcj from tb_ph_dxjl sjcj where sjcj.SCBZ = '0' group by xyrbh) dxjl,
+    (select sjcj.xyrbh rybh, count(*) iftxlcj from tb_ph_thjl sjcj where sjcj.SCBZ = '0' group by xyrbh) thjl
+
+
+    where p.rybh = rt.rybh(+) and p.rybh = sj.rybh(+) and (p.SCBZ='0' or p.SCBZ is null) and (p.ifhb is null or p.ifhb<![CDATA[<>]]>'1') and (p.tbbz = '1' or p.tbbz = '2')  and (p.sjbs<![CDATA[<>]]>'0' or p.sjbs is null)
+    and p.rybh = dxjl.rybh(+) and p.rybh = thjl.rybh(+)
+    and (sj.iftxlcj>0 or rt.iftxlcj>0 or dxjl.iftxlcj>0 or thjl.iftxlcj>0)
+    <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
+    <if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
+    <if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
+    group by substr(lrdwdm,1,${unitgrade})
+  </select>
+
+  <!-- 按单位分组统计人员采集数(指纹质量采集数)  -->
+  <select id="getRycjtjListzwzlcjs"  parameterType="map" resultType="com.founder.khtj.domain.RstBean">
+    select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) zwzlcjs from TB_RY_RYCJ RYCJ,AFIS_QUALITY_CK where (JCJG = '0') and (RYCJ.rybh = R_RYBH) and (RYCJ.ifhb is null or RYCJ.ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and szzwbh is not null
+    <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
+    <if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
+    <if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
+    group by substr(lrdwdm,1,${unitgrade})
+  </select>
+
+  <!-- 按单位分组统计人员采集数(人像质量采集数)  -->
+  <select id="getRycjtjListrxzlcjs"  parameterType="map" resultType="com.founder.khtj.domain.RstBean">
+    select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) rxzlcjs from TB_RY_RYCJ RYCJ,AFIS_QUALITY_CK
+    where (JCJG = '0') and (RYCJ.rybh = R_RYBH) and (RYCJ.SCBZ='0' or RYCJ.SCBZ is null) and (RYCJ.ifhb is null or RYCJ.ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and ZMZPXXBH is not null
+    and CMZPXXBH is not null
+    and YCMZPXXBH is not null
+    <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
+    <if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
+    <if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
+    group by substr(lrdwdm,1,${unitgrade})
+  </select>
+
+  <!-- 按单位分组统计人员采集数(手机质量采集数)  -->
+  <select id="getRycjtjListsjzlcjs"  parameterType="map" resultType="com.founder.khtj.domain.RstBean">
+    select substr(substr(p.lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) sjzlcjs from TB_RY_RYCJ p,AFIS_QUALITY_CK CK,
+    (select sjcj.xyrbh rybh, count(*) iftxlcj from TB_PH_LXRXX sjcj where sjcj.SCBZ = '0'  group by sjcj.xyrbh) rt,
+    (select sjcj.xyrbh rybh, count(*) iftxlcj from TB_PH_FZXYRSJGL sjcj where sjcj.SCBZ = '0'  group by sjcj.xyrbh) sj,
+    (select sjcj.xyrbh rybh, count(*) iftxlcj from tb_ph_dxjl sjcj where sjcj.SCBZ = '0' group by xyrbh) dxjl,
+    (select sjcj.xyrbh rybh, count(*) iftxlcj from tb_ph_thjl sjcj where sjcj.SCBZ = '0' group by xyrbh) thjl
+
+
+    where p.rybh = rt.rybh(+) and p.rybh = sj.rybh(+) and (rt.rybh is not null and sj.rybh is not null) and (p.SCBZ='0' or p.SCBZ is null) and (p.ifhb is null or p.ifhb<![CDATA[<>]]>'1') and (p.tbbz = '1' or p.tbbz = '2')
+    and (p.sjbs<![CDATA[<>]]>'0' or p.sjbs is null) and CK.r_rybh = p.rybh
+    and p.rybh = dxjl.rybh(+) and p.rybh = thjl.rybh(+)
+    and (sj.iftxlcj>0 and rt.iftxlcj>0 and dxjl.iftxlcj>0 and thjl.iftxlcj>0)
+    <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
+    <if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
+    <if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
+    group by substr(lrdwdm,1,${unitgrade})
+  </select>
+
+  <!-- 人员采集统计   质量合格率列表 -->
+  <select id="queryHglPageList" resultMap="baseMap" parameterType="map">
+    <![CDATA[SELECT t.* FROM (
+        SELECT a.* , rownum r FROM (]]>
+    select * from (
+    SELECT RYBH,
+    XM,
+    ZJHM,
+    TB_RY_RYCJ.Sjbs as SJBS,
+    GMSFHM,
+    EDZZPXXBH,
+    ZMZPXXBH,
+    CMZPXXBH,
+    YCMZPXXBH,
+    SZZWBH,
+    ZWCJSJ,
+    BZW,
+    R_SJLXDH,
+    ZWFKXX,
+    TBBZ,
+    LRDWDM,
+    (select name from sys_dictitem s where s.groupid='CODE_UNIT' and s.code = TB_RY_RYCJ.LRDWDM) as LRDWMC,
+    LRR,
+    LRSJ,
+    (select count(1) from tb_xw_ythcj_yhkjbxx s where s.rybh=TB_RY_RYCJ.rybh) as YHK,
+    TB_RY_RYCJ.SCBZ,
+    (select name from sys_dictitem s where s.groupid='CODE_XB' and s.code = TB_RY_RYCJ.XBDM) as XBDM,
+    (select name from sys_dictitem s where s.groupid='CODE_UNIT' and s.code = TB_RY_RYCJ.ZWCJDWDM) as ZWCJDWDM,
+    to_char(TB_RY_RYCJ.ZWCJSJ,'YYYY-MM-DD') ZWCJSJSTR,
+    AFIS_QUALITY_CK.R_GDZW,AFIS_QUALITY_CK.R_WZXX,AFIS_QUALITY_CK.R_PMZW,AFIS_QUALITY_CK.R_RX,AFIS_QUALITY_CK.BZ,AFIS_QUALITY_CK.JCJG,
+    nvl2(sj.sjjbxx, sj.sjjbxx, '0') sjjbxx,
+    nvl2(lxrxx.lxr, lxrxx.lxr, '0') sjlxrxx,
+    nvl2(dxjl.dxjl, dxjl.dxjl, '0') dxjl,
+    nvl2(thjl.thjl, thjl.thjl, '0') thjl
+    from TB_RY_RYCJ,AFIS_QUALITY_CK,
+    (select xyrbh, count(xyrbh) sjjbxx from tb_ph_fzxyrsjgl group by xyrbh) sj,
+    (select xyrbh, count(xyrbh) lxr from tb_ph_lxrxx group by xyrbh) lxrxx,
+    (select xyrbh, count(xyrbh) dxjl from tb_ph_dxjl group by xyrbh) dxjl,
+    (select xyrbh, count(xyrbh) thjl from tb_ph_thjl group by xyrbh) thjl
+    where TB_RY_RYCJ.RYBH=AFIS_QUALITY_CK.R_RYBH(+) AND (TB_RY_RYCJ.SCBZ='0' or TB_RY_RYCJ.SCBZ is null) AND (IFHB<![CDATA[<>]]>'1' OR IFHB IS NULL)
+    and TB_RY_RYCJ.rybh = sj.xyrbh(+) and TB_RY_RYCJ.rybh = lxrxx.xyrbh(+) and TB_RY_RYCJ.rybh = dxjl.xyrbh(+) and TB_RY_RYCJ.rybh = thjl.xyrbh(+)
+    <if test="lrdwdm != null and lrdwdm != ''">and LRDWDM like #{lrdwdm , jdbcType=VARCHAR }||'%'</if>
+    <if test="flrsjStr != null and flrsjStr != ''"> AND LRSJ <![CDATA[>=]]> to_date(#{flrsjStr, jdbcType=VARCHAR },'yyyy-mm-dd') </if>
+    <if test="elrsjStr != null and elrsjStr != ''"> AND LRSJ <![CDATA[<]]> to_date(#{elrsjStr , jdbcType=VARCHAR },'yyyy-mm-dd')+1 </if>
+    ) where 1=1
+
+    <if test="tjtype != null and tjtype != '' and tjtype == 'ycs'">and (tbbz = '1' or tbbz = '2')</if>
+    <if test="tjtype != null and tjtype != '' and tjtype == 'zwcjs'"> and szzwbh is not null and (tbbz = '1' or tbbz = '2')</if>
+    <if test="tjtype != null and tjtype != '' and tjtype == 'zwzlcjs'"> and szzwbh is not null and (tbbz = '1' or tbbz = '2') and JCJG = '0'</if>
+
+    <if test="tjtype != null and tjtype != '' and tjtype == 'rxcjs'"> and (zmzpxxbh is not null or cmzpxxbh is not null or ycmzpxxbh is not null) and (tbbz = '1' or tbbz = '2')</if>
+    <if test="tjtype != null and tjtype != '' and tjtype == 'rxzlcjs'"> and (zmzpxxbh is not null or cmzpxxbh is not null or ycmzpxxbh is not null) and (tbbz = '1' or tbbz = '2') and JCJG = '0'</if>
+
+    <if test="tjtype != null and tjtype != '' and tjtype == 'xtzrs'">  and 1=1</if>
+    <if test="tjtype != null and tjtype != '' and tjtype == 'csycs'">  and (tbbz = '1' or tbbz = '2')</if>
+
+    <if test="tjtype != null and tjtype != '' and tjtype == 'sjycs'">
+      and (tbbz = '1' or tbbz = '2') and (SJBS<![CDATA[<>]]>'0' or SJBS is null)
+    </if>
+    <if test="tjtype != null and tjtype != '' and tjtype == 'sjcjs'">
+      and (sjjbxx>0 or sjlxrxx>0 or dxjl>0 or thjl>0)  and (tbbz = '1' or tbbz = '2') and (SJBS<![CDATA[<>]]>'0' or SJBS is null)
+    </if>
+    <if test="tjtype != null and tjtype != '' and tjtype == 'sjzlcjs'">
+      and (sjjbxx>0 and sjlxrxx>0 and dxjl>0 and thjl>0)  and (tbbz = '1' or tbbz = '2') and (SJBS<![CDATA[<>]]>'0' or SJBS is null)
+    </if>
+
+
+    <![CDATA[ order by ${sort} ${order}  ) a
+        WHERE ROWNUM <= #{ end } ) t
+        WHERE r > #{ begin } ]]>
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -70,7 +70,7 @@
     <div class="layui-form-item">
         <label class="layui-form-label">隶属单位：</label>
         <div class="layui-input-block">
-            <input id="ssdwcode" name="ssdwcode" type="text"  lay-verify="scode"  style="width:66%; height:32px;" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
+            <input id="ssdwcode" name="ssdwcode" type="text"  lay-verify="scode"  style="width:66%; height:32px;" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_QGUNIT',method:'get',textField : 'text', valueField : 'id'"/>
         </div>
     </div>
     <div class="layui-form-item" style="clear: both;width: 100%;text-align: center;">
@@ -162,6 +162,9 @@
 <script src="/static/layui/layui.js" charset="utf-8"></script>
 <script src="/static/layui/layui.all.js" charset="utf-8"></script>
 <script>
+    $(function () {
+        openCombotree('ssdwcode');
+    });
     layui.use('table', function(){
         var date = new Date();
         var table = layui.table;

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

@@ -171,7 +171,7 @@
             <input type="checkbox" value="是" lay-verify="pps1" id="ifyhkcjyCheckbox" title="银行卡"   name="ifyhkcjyCheckbox"/>
             <input type="checkbox" value="是" lay-verify="pps1" id="ifdnabqdyjCheckbox" title="DNA标签打印机"  name="ifdnabqdyjCheckbox"/>
 
-            <input type="button" value="确定" class="layui-btn layui-btn-sm" name="ifythcjy" id="ifythcjy"/>
+<!--            <input type="button" value="确定" class="layui-btn layui-btn-sm" name="ifythcjy" id="ifythcjy"/>-->
         </div>
     </div>
     <!--     lay-filter="ifythcjy"-->
@@ -377,7 +377,8 @@
             strdnabqdyj: [/\S/, 'DNA标签打印机品牌商不能为空！']
         });
 
-        $('#ifythcjy').on('click', function () {
+
+        form.on('checkbox', function (data) {
             var red = '<font class="red">*</font>';
             //指纹
             if ($('input[name="ifzwcjyCheckbox"]:checked ').val() == '是') {

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

@@ -382,7 +382,7 @@
         });
 
         //根据是否一体化采集仪做相关控制
-        $('#ifythcjy').on('click', function(){
+        form.on('checkbox', function (data) {
             checkboxValue();
         });
 

src/main/resources/templates/home.html

@@ -183,6 +183,9 @@
 											<li id="H10D02">
 												<a onclick="toSjcjtj()">手机采集信息统计</a>
 											</li>
+											<li id="H10D03">
+												<a onclick="toHgltj()">合格率信息统计</a>
+											</li>
 										</ul>
 									</div>
 								</div>
@@ -418,6 +421,10 @@
 		window.open("/toSjtj?isfirst=1",'_blank');
 	}
 
+	function toHgltj(){
+		window.open("/toHgltj?isfirst=1",'_blank');
+	}
+
 	function ajxxgl(){
 		window.open("/toAjJbxxDetail?asjxgrybh=1&zjhm=111",'_blank');
 	}
@@ -587,7 +594,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>
+<!--<div style="display: none" id="perurl" th:text="${session.perurl}"></div>-->
+<!--<script id="scripturlid" src="static/common/js/checkurl.js" type="text/javascript"></script>-->
 </body>
 </html>
\ No newline at end of file

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

@@ -24,6 +24,8 @@
 </head>
 
 <body  style="overflow: auto">
+        <input type="hidden" id="unitcode" name="unitcode" th:value="${unitcode}"/>
+
     <header class="heade-box">
         <img src="static/xtba/zlcc/img/title_ccrwgl.png" class="header-title-img" alt="">
     </header>
@@ -78,7 +80,20 @@
             //pageList : [5,10,15,20], //rows
             //pageNumber : 1   //显示在第几页     
         });
-        
+
+        // 调用子页面方法
+        var frame  = document.getElementById("f1");
+        function chuandicanshu(){
+            var unitcode = $('#unitcode').val();
+
+            frame.onload = function(){
+                frame.contentWindow.unitcode(unitcode);
+            }
+                // .contentWindow.unitcode(unitcode);
+        }
+        $(function () {
+            chuandicanshu()
+        });
     //新建弹框
     function newDialog(){
           var dialogId='new';

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

@@ -56,13 +56,13 @@
                     <td class="ar" width="13.3%">任务对象：</td>
                     <td width="20%">
                                 <span class="textbox" style="font-size: 14px;">
-                                    <select name="ccdw" style="height: 33px;width: 100%;font-size: 14px;">
-                                        <option value=""></option>
-                                        <option value="4601">海口市公安局</option>
-                                        <option value="4602">三亚市公安局</option>
-                                        <option value="4603">洋浦经济开发区公安局</option>
-                                        <option value="4604">三沙市公安局</option>
-                                        <option value="4605">海口铁路公安处</option>
+                                    <select name="lrdwdm" id="lrdwdm" style="height: 34px;width: 100%;font-size: 14px;">
+<!--                                        <option value=""></option>-->
+                                        <!--                                        <option value="4601">海口市公安局</option>-->
+                                        <!--                                        <option value="4602">三亚市公安局</option>-->
+                                        <!--                                        <option value="4603">洋浦经济开发区公安局</option>-->
+                                        <!--                                        <option value="4604">三沙市公安局</option>-->
+                                        <!--                                        <option value="4605">海口铁路公安处</option>-->
                                     </select>
                                 </span>
                     </td>
@@ -71,7 +71,8 @@
                     <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()">查询</a>
-                            <a class="btn_a btn_empty" onclick="newDialog()">新建</a>
+                            <button type="reset" class="btn_a btn_empty">重 置</button>
+<!--                            <a class="btn_a btn_add" onclick="newDialog()">新建</a>-->
                         </div>
                     </td>
                 </tr>
@@ -141,11 +142,8 @@
                 var xxbh=row.xxbh;
                 var rwbh=row.rwbh;
                 var ccdw=row.ccdw;
-                var ccfs=row.ccfs;
-                var jcfs=row.jcfs;
-                var ccsjQssjStr=row.ccsjQssjStr;
-                var ccsjJzsjStr=row.ccsjJzsjStr;
-                return "<a href='javascript:void(0)' onclick='zlcc(\"" + xxbh + "\",\"3\")'>"+rwbh+"</a>";;
+                var sfdrw= (ccdw.indexOf(',') >= 0);
+                return "<a href='javascript:void(0)' onclick='zlcc(\"" + xxbh + "\",\"3\",\"" + rwbh + "\",\"" + sfdrw + "\")'>"+rwbh+"</a>";;
             }},
             {title:"任务时间",field:"ccsjQssjStr",align:'center',width:285,formatter:function(val,row,index){
                 var ccsjQssjStr=row.ccsjQssjStr;
@@ -160,26 +158,7 @@
                 }
                 return ccsjQssjStr+" 至 "+ccsjJzsjStr;
             }},
-            {title:"任务对象",field:"ccdw",align:'center',width:175,formatter:function(val,row,index){
-                var ccdw=row.ccdw;
-                var rstStr="";
-                if(ccdw.indexOf('4601') >= 0){
-                    rstStr += "<br>海口市公安局";
-                }
-                if(ccdw.indexOf('4602') >= 0){
-                    rstStr += "<br>三亚市公安局";
-                }
-                if(ccdw.indexOf('4603') >= 0){
-                    rstStr += "<br>洋浦经济开发区公安局";
-                }
-                if(ccdw.indexOf('4604') >= 0){
-                    rstStr += "<br>三沙市公安局";
-                }
-                if(ccdw.indexOf('4605') >= 0){
-                    rstStr += "<br>海口铁路公安处";
-                }
-                return rstStr.substring(4);
-            }},
+            {title:"任务对象",field:"ccdw",align:'center',width:175},
             {title:"任务进度",field:"ccfs",align:'center',width:180,formatter:function(val,row,index){
                 var ccfs=row.ccfs;
                 var jcfs=row.jcfs;
@@ -242,10 +221,45 @@
         return o;
     }
 
+    /**
+     * 数据字典获取系统类型
+     */
+    function rwdw() {
+        var dicType = "CODE_SXDWCC";
+        $.ajax({
+            url: "/queryDictByPid?code=" + dicType,
+            type: "GET",
+            success: function (data) {
+                if (data) {
+                    initSelect(data);
+                } else {
+                    $.messager.alert( '提示',"字典获取失败！");
+                }
+            }
+        });
+        // ajax.start();
+    }
+    function initSelect (data) {
+        $("select[name='lrdwdm']").html("<option value=''>请选择</option>");
+        for (var i = 0; i < data.length; i++) {
+            // if(major==data[i].VALUE){
+            //     $("select[name='anyScript']").append(
+            //         "<option value='" + data[i].VALUE + "' selected>"
+            //         + data[i].LABEL + "</option>");
+            // }else {
+            $("select[name='lrdwdm']").append(
+                "<option value='" + data[i].code + "'>"
+                + data[i].name + "</option>");
+            // }
+        }
+        // form.render();
+    }
+
     function doClear(){
         $("form[name='zlccrwForm']") .find("input").val('');
     }
     $(function(){
+        rwdw();
         doQuery();
     });
     //新建弹框
@@ -258,7 +272,7 @@
             id:dialogId,
             url:'xj',
             title:'新建',
-            width:600,
+            width:700,
             height:300,
             cache:false,
             onClose:function(){
@@ -269,21 +283,38 @@
                 //确定生成表头配置信息,并重新加载表格数据
                 text:'保存',
                 handler:function(){
-                    $.ajax({
-                        url:"doAddOrUpdateCcrw?xxbh="+$('#xxbh').val()+"&ccdw="+$('#ccdw').val()+"&fccsj="+$('#ccsjQssjStr').val()+"&eccsj="+$('#ccsjJzsjStr').val()+"&ccfs="+$('#ccfs').val(),
-                        type:"POST",
-                        success:function(data){
-                            if(data){
-                                $.messager.alert( '提示',"任务信息保存成功！");
-                                doQuery();
-                                $('#new').dialog('close');
-                            }else{
-                                $.messager.alert( '提示',"任务信息保存失败！");
-                                doQuery();
-                                $('#new').dialog('close');
+                    var ccdw = $('#ccdw').val();
+                    var ccsjQssjStr = $('#ccsjQssjStr').val();
+                    var ccsjJzsjStr = $('#ccsjJzsjStr').val();
+                    var ccfs = $('#ccfs').val();
+                    var flag = false;
+                    if(ccdw ==null || ccdw =='' || ccsjQssjStr ==null || ccsjQssjStr ==''||ccsjJzsjStr ==null || ccsjJzsjStr =='' || ccfs ==null || ccfs ==''){
+                        $.messager.alert('提示',"带*号必填项不能为空！")
+                    }else if (ccdw !=null && ccdw !='' && ccsjQssjStr !=null && ccsjQssjStr !=''&&ccsjJzsjStr !=null
+                        && ccsjJzsjStr !='' && ccfs !=null && ccfs !=''){
+                        flag = true;
+                    }
+                    if(flag) {
+                        $.ajax({
+                            url: "doAddOrUpdateCcrw?xxbh=" + $('#xxbh').val() + "&ccdw=" + $('#ccdw').val() + "&fccsj=" + $('#ccsjQssjStr').val() + "&eccsj=" + $('#ccsjJzsjStr').val() + "&ccfs=" + $('#ccfs').val(),
+                            type: "POST",
+                            success: function (data) {
+                                $('#ccdw').val('');
+                                $('#ccsjQssjStr').val('');
+                                $('#ccsjJzsjStr').val('');
+                                $('#ccfs').val('');
+                                if (data) {
+                                    $.messager.alert('提示', "任务信息保存成功！");
+                                    doQuery();
+                                    $('#new').dialog('close');
+                                } else {
+                                    $.messager.alert('提示', "任务信息保存失败！");
+                                    doQuery();
+                                    $('#new').dialog('close');
+                                }
                             }
-                        }
-                    });
+                        });
+                    }
                 }
             },{
                 text:'取消',
@@ -294,8 +325,8 @@
         ])
     }
 
-    function zlcc(xxbh,flg){
-        window.open("/toZlccList?rwbh="+xxbh+"&flg="+flg,'_blank');
+    function zlcc(xxbh,flg,rwbh,sfdrw){
+        window.open("/toZlccList?xxbh="+xxbh+"&flg="+flg+"&rwbh="+rwbh+"&sfdrw="+sfdrw,'_blank');
     }
 
     function rwxq(){

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

@@ -10,7 +10,13 @@
 	<link rel="stylesheet" type="text/css" href="static/xtba/zljc/css/btn.css">
 	<link rel="stylesheet" type="text/css" href="static/xtba/zljc/css/layer/skin/default/layer.css">
 </head>
+<style>
+	.fingerprint .bhg-bg, .fingerprint2 .bhg-bg, .fingerprint3 .bhg-bg {
+		bottom: 80px!important;
+	}
+</style>
 <body>
+
 <div>
 	<!-- 锚点菜单开始 -->
 	<div id="loutinav">
@@ -45,6 +51,8 @@
 		<div class="zljc-list">
 			<!---->
 			<p class="div_title"><img src="static/xtba/zljc/images/jc-icon.png" class="jc-icon" />人员基本信息</p>
+			<input type="hidden" id="rwbh" th:value="${rwbh}"/>
+			<input type="hidden" id="rwbh2" th:value="${rwbh2}"/>
 			<input type="hidden" id="ccbh" th:value="${afisQualityCk.ccbh}"/>
 			<input type="hidden" id="szzwbhStr" th:value="${ryxx.szzwbh}"/>
 			<input type="hidden" id="username" th:value="${username}"/>
@@ -214,37 +222,46 @@
 		<div class="zljc-list rx">
 			<!---->
 			<p class="div_title"><img src="static/xtba/zljc/images/jc-icon.png" class="jc-icon" />人像</p>
-			<div class="condition" id="layer-photos-rx">
-				<div class="left-rxxx">
+			<div class="condition" id="layer-photos-rx" style="height: 390px!important;">
+				<div class="left-rxxx" style="height: 100%!important;">
 
-					<dl class="fingerprint">
+					<dl class="fingerprint" style="height: 88%!important;">
 						<dd>左侧面照</dd>
 						<dt><img class="lazy" layer-pid="l-hand" layer-src="static/xtba/zljc/images/loading-1.gif"id="cmzp" alt="左侧面照" src="static/xtba/zljc/images/loading-1.gif" onclick="showImgRx()"/></dt>
 						<dd>
 							<span class="btn-span"><a class="btn-xx-small" id="zcmzp1" onclick="btnChange(this,'zcmzp','1')">合格</a></span>
-							<span class="btn-span"><a class="btn-xx-small" id="zcmzp4" onclick="btnChange(this,'zcmzp','4')">位置截取不正确</a></span>
-							<span class="btn-span"><a class="btn-xx-small" id="zcmzp2" onclick="btnChange(this,'zcmzp','2')">不完整</a></span>
-							<span class="btn-span"><a class="btn-xx-small" id="zcmzp3" onclick="btnChange(this,'zcmzp','3')">不清晰</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="zcmzp4" onclick="btnChange(this,'zcmzp','4')">图像不清晰</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="zcmzp2" onclick="btnChange(this,'zcmzp','2')">角度不正确</a></span><br>
+							<span class="btn-span"><a class="btn-xx-small" id="zcmzp3" onclick="btnChange(this,'zcmzp','3')">面部被遮挡</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="zcmzp5" onclick="btnChange(this,'zcmzp','5')">光线问题</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="zcmzp6" onclick="btnChange(this,'zcmzp','6')">取景过大</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="zcmzp7" onclick="btnChange(this,'zcmzp','7')">没有身高标识</a></span>
 						</dd>
 					</dl>
-					<dl class="fingerprint">
+					<dl class="fingerprint" style="height: 88%!important;">
 						<dd>正面照</dd>
 						<dt><img class="lazy" layer-pid="l-hand" layer-src="static/xtba/zljc/images/loading-1.gif" id="zmzp" alt="正面照" src="static/xtba/zljc/images/loading-1.gif" onclick="showImgRx()"/></dt>
 						<dd>
 							<span class="btn-span"><a class="btn-xx-small" id="zmzp1" onclick="btnChange(this,'zmzp','1')">合格</a></span>
-							<span class="btn-span"><a class="btn-xx-small" id="zmzp4" onclick="btnChange(this,'zmzp','4')">位置截取不正确</a></span>
-							<span class="btn-span"><a class="btn-xx-small" id="zmzp2" onclick="btnChange(this,'zmzp','2')">不完整</a></span>
-							<span class="btn-span"><a class="btn-xx-small" id="zmzp3" onclick="btnChange(this,'zmzp','3')">不清晰</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="zmzp4" onclick="btnChange(this,'zmzp','4')">图像不清晰</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="zmzp2" onclick="btnChange(this,'zmzp','2')">角度不正确</a></span><br>
+							<span class="btn-span"><a class="btn-xx-small" id="zmzp3" onclick="btnChange(this,'zmzp','3')">面部被遮挡</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="zmzp5" onclick="btnChange(this,'zmzp','5')">光线问题</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="zmzp6" onclick="btnChange(this,'zmzp','6')">取景过大</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="zmzp7" onclick="btnChange(this,'zmzp','7')">没有身高标识</a></span>
 						</dd>
 					</dl>
-					<dl class="fingerprint">
+					<dl class="fingerprint" style="height: 88%!important;">
 						<dd>右侧面照</dd>
 						<dt><img class="lazy" layer-pid="l-hand" layer-src="static/xtba/zljc/images/loading-1.gif" id="ycmzp" alt="右侧面照" src="static/xtba/zljc/images/loading-1.gif" onclick="showImgRx()"/></dt>
 						<dd>
 							<span class="btn-span"><a class="btn-xx-small" id="ycmzp1" onclick="btnChange(this,'ycmzp','1')">合格</a></span>
-							<span class="btn-span"><a class="btn-xx-small" id="ycmzp4" onclick="btnChange(this,'ycmzp','4')">位置截取不正确</a></span>
-							<span class="btn-span"><a class="btn-xx-small" id="ycmzp2" onclick="btnChange(this,'ycmzp','2')">不完整</a></span>
-							<span class="btn-span"><a class="btn-xx-small" id="ycmzp3" onclick="btnChange(this,'ycmzp','3')">不清晰</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="ycmzp4" onclick="btnChange(this,'ycmzp','4')">图像不清晰</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="ycmzp2" onclick="btnChange(this,'ycmzp','2')">角度不正确</a></span><br>
+							<span class="btn-span"><a class="btn-xx-small" id="ycmzp3" onclick="btnChange(this,'ycmzp','3')">面部被遮挡</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="ycmzp5" onclick="btnChange(this,'ycmzp','5')">光线问题</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="ycmzp6" onclick="btnChange(this,'ycmzp','6')">取景过大</a></span>
+							<span class="btn-span"><a class="btn-xx-small" id="ycmzp7" onclick="btnChange(this,'ycmzp','7')">没有身高标识</a></span>
 						</dd>
 					</dl>
 				</div>

src/main/resources/templates/zljc/zljccx.html

@@ -478,7 +478,7 @@ function codeFormatter(val,type){
 }
 
 function openNew(rybh,szzwbh,cjsj){
-    //window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank');
+    window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank');
 
     $.ajax({
         url: "doCprExistAmiss",
@@ -501,7 +501,7 @@ function openNew(rybh,szzwbh,cjsj){
                 }
             } else
             {
-                window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank');
+                // window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank');
             }
         },
         error: function(){