Skip to content

H
hnxtbaboot
Commit a819b6c4 by yangliang
Options

修改考核统计，数据列表明细数量不一致的问题

parent 204f81b0
Showing with 222 additions and 27 deletions
src/main/java/com/founder/controller/TbXwRycjController.java
......@@ -1813,11 +1813,23 @@ public class TbXwRycjController {
xyrxx.setRRx(RRx);
xyrxx.setDnabh(dnabh);
User user = (User)request.getSession().getAttribute("User");
if(!"CX".equals(type)&&(xyrxx.getLrdwdm()==null||"".equals(xyrxx.getLrdwdm()))){
xyrxx.setLrdwdm(user.getUnitcode());
if(xyrxx.getXxdjdwGajgjgdm()==null||"".equals(xyrxx.getXxdjdwGajgjgdm())){
String grade = user.getGrade();
String ucode = user.getUnitcode();
if("S".equals(grade)){
xyrxx.setXxdjdwGajgjgdm(ucode.substring(0,2)+"0000000000");
}else if("D".equals(grade)){
xyrxx.setXxdjdwGajgjgdm(ucode.substring(0,4)+"00000000");
}else if("X".equals(grade)){
xyrxx.setXxdjdwGajgjgdm(ucode.substring(0,6)+"000000");
}else if("K".equals(grade)){
xyrxx.setXxdjdwGajgjgdm(ucode.substring(0,8)+"0000");
}else{
xyrxx.setXxdjdwGajgjgdm(ucode.substring(0,10)+"00");
}
}
if(!"CX".equals(type)&&(xyrxx.getXxdjdwGajgjgdm()==null||"".equals(xyrxx.getXxdjdwGajgjgdm()))){
xyrxx.setXxdjdwGajgjgdm(user.getUnitcode());
if("CX".equals(type)){
xyrxx.setXxdjdwGajgjgdm(null);
}
List<AutoTbStRy> ryxxs = rycjService.queryRyxxList(xyrxx);
......@@ -2970,16 +2982,26 @@ public class TbXwRycjController {
{
long start = System.currentTimeMillis();
Map<String,Object> rstmap = new HashMap<String,Object>();
for(int i=1;i<=4;i++){
Future<String> future = asyncTask.getRyzpimages(rybh,zjhm,i+"");
try {
rstmap.put(i+"",(String)future.get());
} catch (InterruptedException e) {
e.printStackTrace();
} catch (ExecutionException e) {
e.printStackTrace();
}
}
Map<String, Object> map = new HashMap<>();
map.put("rybh",rybh);
List<AutoTbRyZp> ryzpList = tbRyRyzpService.getTbRyRyzpByRybh(map,rybh.substring(1,12));
if(ryzpList!=null&&ryzpList.size()>0){
for(int i=0;i<ryzpList.size();i++){
AutoTbRyZp autoTbRyZp = ryzpList.get(i);
String zpBase64 = GetImageStrsByByte(autoTbRyZp.getDzwjnr());
rstmap.put(autoTbRyZp.getZpbw()+"",zpBase64);
}
}
//for(int i=1;i<=4;i++){
// Future<String> future = asyncTask.getRyzpimages(rybh,zjhm,i+"");
// try {
// rstmap.put(i+"",(String)future.get());
// } catch (InterruptedException e) {
// e.printStackTrace();
// } catch (ExecutionException e) {
// e.printStackTrace();
// }
//}
return rstmap;
}
@ResponseBody
......
src/main/java/com/founder/khtj/controller/KhtjController.java
......@@ -262,6 +262,7 @@ public class KhtjController {
//rstBean.setDnawcjs(dnawcjs + "");
rstBean.setName("合计");
rstBean.setCode(rstBean.getRCcdw());
rstBean.setUnitgrade(unitgrade+"");
rstBeanlist.add(rstBean);
} else {
User user = (User) request.getSession().getAttribute("User");
......@@ -499,13 +500,14 @@ public class KhtjController {
}
@RequestMapping("/toKhtjDet")
public ModelAndView toKhtjDet(ModelAndView model, HttpServletRequest request, String unitCode, String startCcsj, String endCcsj, String slType, String unitgrade, String cot) {
public ModelAndView toKhtjDet(ModelAndView model, HttpServletRequest request, String unitCode, String startCcsj, String endCcsj, String slType, String unitgrade, String cot, String ifslgzd) {
model.addObject("unitCode", unitCode);
model.addObject("startCcsj", startCcsj);
model.addObject("endCcsj", endCcsj);
model.addObject("slType", slType);
model.addObject("unitgrade", unitgrade);
model.addObject("cot", cot);
model.addObject("ifslgzd", ifslgzd);
model.setViewName("khtj/cxlist");
return model;
}
......@@ -524,9 +526,9 @@ public class KhtjController {
@RequestMapping("/queryRytjxqList")
@ResponseBody
public EasyUIPage queryRytjxqList(EasyUIPage easyUIPage, Integer rows, HttpServletRequest request, String unitCode, String startCcsj, String endCcsj, String slType, String unitgrade, String cot) {
public EasyUIPage queryRytjxqList(EasyUIPage easyUIPage, Integer rows, HttpServletRequest request, String unitCode, String startCcsj, String endCcsj, String slType, String unitgrade, String cot, String ifslgzd) {
easyUIPage.setPagePara(rows);
easyUIPage = rycjtjService.queryRyxxPage(easyUIPage, getTjdw(unitCode, unitgrade), startCcsj, endCcsj, slType, unitgrade, cot);
easyUIPage = rycjtjService.queryRyxxPage(easyUIPage, getTjdw(unitCode, unitgrade), startCcsj, endCcsj, slType, unitgrade, cot ,ifslgzd);
return easyUIPage;
}
......
src/main/java/com/founder/khtj/service/IRycjtjService.java
......@@ -13,6 +13,6 @@ public interface IRycjtjService {
public List<RstBean> getSjcjs(RstBean ajflpt, String unit_matchstring, int unitgrade, int ifslgzd);
public EasyUIPage queryRyxxPage(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/khtj/service/impl/IRycjtjServiceImpl.java
......@@ -70,14 +70,14 @@ public class IRycjtjServiceImpl implements IRycjtjService {
if(unitgrade==10){
}else if(ifslgzd==1){
filterMap.put("sqlwhere","(lrdwdm like '%s%' or lrdwdm like '%S%' or lrdwdm like '%88____')");
filterMap.put("sqlwhere","(lrdwdm like '"+unit_matchstring.substring(0,4)+"%s%' or lrdwdm like '"+unit_matchstring.substring(0,4)+"%S%' or lrdwdm like '"+unit_matchstring.substring(0,4)+"%88____')");
}else if(ifslgzd==2){
filterMap.put("sqlwhere","(lrdwdm like '%g%' or lrdwdm like '%G%')");
filterMap.put("sqlwhere","(lrdwdm like '"+unit_matchstring.substring(0,4)+"%g%' or lrdwdm like '"+unit_matchstring.substring(0,4)+"%G%')");
}else{
filterMap.put("sqlwhere","lrdwdm not like '%s%' and lrdwdm not like '%S%' and lrdwdm not like '%G%' and lrdwdm not like '%g%' and lrdwdm not like '%88____'");
filterMap.put("sqlwhere","lrdwdm not like '"+unit_matchstring.substring(0,4)+"%s%' and lrdwdm not like '"+unit_matchstring.substring(0,4)+"%S%' and lrdwdm not like '"+unit_matchstring.substring(0,4)+"%G%' and lrdwdm not like '"+unit_matchstring.substring(0,4)+"%g%' and lrdwdm not like '"+unit_matchstring.substring(0,4)+"%88____'");
}
filterMap1.put("sqlwhere","(lrdwdm like '%s%' or lrdwdm like '%S%' or lrdwdm like '%88____')");
filterMap2.put("sqlwhere","(lrdwdm like '%G%' or lrdwdm like '%g%')");
filterMap1.put("sqlwhere","(lrdwdm like '"+unit_matchstring.substring(0,4)+"%s%' or lrdwdm like '"+unit_matchstring.substring(0,4)+"%S%' or lrdwdm like '"+unit_matchstring.substring(0,4)+"%88____')");
filterMap2.put("sqlwhere","(lrdwdm like '"+unit_matchstring.substring(0,4)+"%G%' or lrdwdm like '"+unit_matchstring.substring(0,4)+"%g%')");
if(nuitCodes!=null){
if(ifslgzd==0){
......@@ -286,6 +286,7 @@ public class IRycjtjServiceImpl implements IRycjtjService {
sl.get(0).setZjcjl(jscjl(sl.get(0).getYcs(),sl.get(0).getZjcjs()));
sl.get(0).setHmcjl(jscjl(sl.get(0).getYcs(),sl.get(0).getHmcjs()));
sl.get(0).setDnacjl(jscjl(sl.get(0).getYcs(),sl.get(0).getDnacjs()));
sl.get(0).setTxls("1");
gzd.get(0).setCode(nuitCodes.get(0).getCode().substring(0, 4)+"00GB0000");
gzd.get(0).setName("高支队");
gzd.get(0).setUnitgrade(8+"");
......@@ -297,6 +298,7 @@ public class IRycjtjServiceImpl implements IRycjtjService {
gzd.get(0).setZjcjl(jscjl(gzd.get(0).getYcs(),gzd.get(0).getZjcjs()));
gzd.get(0).setHmcjl(jscjl(gzd.get(0).getYcs(),gzd.get(0).getHmcjs()));
gzd.get(0).setDnacjl(jscjl(gzd.get(0).getYcs(),gzd.get(0).getDnacjs()));
gzd.get(0).setTxls("2");
zwzltjBeans.add(sl.get(0));
zwzltjBeans.add(gzd.get(0));
}
......@@ -326,6 +328,7 @@ public class IRycjtjServiceImpl implements IRycjtjService {
sl.get(0).setZjcjl(jscjl(sl.get(0).getYcs(),sl.get(0).getZjcjs()));
sl.get(0).setHmcjl(jscjl(sl.get(0).getYcs(),sl.get(0).getHmcjs()));
sl.get(0).setDnacjl(jscjl(sl.get(0).getYcs(),sl.get(0).getDnacjs()));
sl.get(0).setTxls("1");
zwzltjBeans.add(sl.get(0));
}else if(ifslgzd==2){
filterMap2.put("lrdwdm", zeroUnit);
......@@ -341,6 +344,7 @@ public class IRycjtjServiceImpl implements IRycjtjService {
gzd.get(0).setZjcjl(jscjl(gzd.get(0).getYcs(),gzd.get(0).getZjcjs()));
gzd.get(0).setHmcjl(jscjl(gzd.get(0).getYcs(),gzd.get(0).getHmcjs()));
gzd.get(0).setDnacjl(jscjl(gzd.get(0).getYcs(),gzd.get(0).getDnacjs()));
gzd.get(0).setTxls("2");
zwzltjBeans.add(gzd.get(0));
}
}
......@@ -481,11 +485,11 @@ public class IRycjtjServiceImpl implements IRycjtjService {
Map<String, String> filterMap = new HashMap<String, String>();
filterMap.put("code",unit_matchstring);
if(ifslgzd==1){
filterMap.put("sqlwhere","(code like '%s%' or code like '%S%' or code like '%88____')");
filterMap.put("sqlwhere","(code like '"+unit_matchstring.substring(0,4)+"%s%' or code like '"+unit_matchstring.substring(0,4)+"%S%' or code like '"+unit_matchstring.substring(0,4)+"%88____')");
}else if(ifslgzd==2){
filterMap.put("sqlwhere","(code like '%g%' or code like '%G%')");
filterMap.put("sqlwhere","(code like '"+unit_matchstring.substring(0,4)+"%g%' or code like '"+unit_matchstring.substring(0,4)+"%G%')");
}else{
filterMap.put("sqlwhere","code not like '%s%' and code not like '%S%' and code not like '%G%' and code not like '%g%' and code not like '%88____'");
filterMap.put("sqlwhere","code not like '"+unit_matchstring.substring(0,4)+"%s%' and code not like '"+unit_matchstring.substring(0,4)+"%S%' and code not like '"+unit_matchstring.substring(0,4)+"%G%' and code not like '"+unit_matchstring.substring(0,4)+"%g%' and code not like '"+unit_matchstring.substring(0,4)+"%88____'");
}
unitCodeBean = khtjDao.getUnitCodeList(filterMap);
}
......@@ -530,7 +534,7 @@ public class IRycjtjServiceImpl implements IRycjtjService {
}
@Override
public EasyUIPage queryRyxxPage(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) {
Map<String, Object> map = new HashMap<>();
map.put("begin", page.getBegin());
map.put("end", page.getEnd());
......@@ -544,6 +548,7 @@ public class IRycjtjServiceImpl implements IRycjtjService {
map.put("order", order);
map.put("lrdwdm", unitCode);
map.put("tjtype", slType);
map.put("ifslgzd", ifslgzd);
map.put("flrsjStr", startCcsj);
map.put("elrsjStr", endCcsj);
map.put("unitgrade", unitgrade);
......
src/main/java/com/founder/ryswtz/controller/RyxxController.java
......@@ -79,6 +79,9 @@ public class RyxxController {
if(xyrC.getZhsj()!=null&&!"".equals(xyrC.getZhsj())){
xyrC.setZhsjStr(df.format(xyrC.getZhsj()));
}
if(xyrC.getZwcjsj()!=null&&!"".equals(xyrC.getZwcjsj())){
xyrC.setZwcjsjStr(df.format(xyrC.getZwcjsj()));
}
/*String rybh = xyrC.getRybh();
String savePath = "/personphoto/"+ rybh.substring(rybh.length() - 10, rybh.length() - 4)+ "/" + rybh.substring(rybh.length() - 3, rybh.length());
......
src/main/resources/mapper/KhtjDao.xml
......@@ -553,6 +553,8 @@
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
from TB_RY_RYCJ,AFIS_QUALITY_CK 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)
<if test="lrdwdm != null and lrdwdm != ''">and LRDWDM like #{lrdwdm , jdbcType=VARCHAR }||'%'</if>
<if test="ifslgzd != null and ifslgzd == 1"> and (LRDWDM like '%s%' or LRDWDM like '%S%' or LRDWDM like '%88____')</if>
<if test="ifslgzd != null and ifslgzd == 2"> and (LRDWDM like '%g%' or LRDWDM like '%G%')</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
......@@ -579,6 +581,8 @@
<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>
<![CDATA[ order by ${sort} ${order} ) a
WHERE ROWNUM <= #{ end } ) t
WHERE r > #{ begin } ]]>
......
src/main/resources/static/hmcj/js/hmcj_wlh.js 0 → 100644
function jsonp( options ) {
options = options || {};
if( !options.url || !options.callback ) {
throw new Error( "参数不合法" );
}
let callbackName = ( "jsonp_" + Math.random()).replace( ".", "" );
let oHead = document.getElementsByTagName("head")[0];
options.data[options.callback] = callbackName;
let params = formatParams( options.data );
let oS = document.createElement( "script" );
oHead.appendChild( oS );
window[callbackName] = function( res ) {
oHead.removeChild( oS );
clearTimeout( oS.timer );
window[callbackName] = null;
options.success && options.success( res );
};
oS.src = options.url + "?" + params;
if( options.time ) {
oS.timer = setTimeout(function() {
window[callbackName] = null;
oHead.removeChild( oS );
options.fail && options.fail({ message: "超时" });
}, options.time );
}
oS.onerror = function(e) {
window[callbackName] = null;
oHead.removeChild( oS );
options.fail && options.fail({ message: "失败，请检查客户端是否开启" });
}
}
function formatParams( data ) {
let arr = [];
for( let name in data ) {
arr.push( encodeURIComponent(name) + "=" + encodeURIComponent(data[name]) );
}
arr.push( ("t=" + Math.random()).replace( ".", "" ) );
return arr.join( "&" );
}
var myEvent;
if(typeof(myEvent) === 'function') {
myEvent = new Event('onirisdone');
}else{
myEvent = document.createEvent('Event');
myEvent.initEvent('onirisdone', true, true);
}
var timerID = -1;
var irisData;
function startIris(leftid,rightid,setEye){
jsonp({
url: "http://127.0.0.1:40315/getEyeReg",
data: { eyeType: setEye, time: new Date().getTime() },
dataType: "json",
callback:"jsonpCallback",
success: function (response, xml) {
clearInterval(timerID);
if(response.flgResult==0){
document.getElementById(leftid).src ="data:image/jpeg;base64," + response["hmzp_zy_zip"];
document.getElementById(rightid).src ="data:image/jpeg;base64," + response["hmzp_yy_zip"];
irisData=response;
window.dispatchEvent(myEvent);
}else{
alert(response.flgDesc);
}
},
fail: function (status) {
clearInterval(timerID);
alert(status.message);
}
});
if (-1 != timerID){
clearInterval(timerID);
}
sleep(200);
timerID = setInterval(function(){getLiveImage(leftid,rightid,setEye)}, 200);
}
function getIrisData(){
return irisData;
}
function getLiveImage(leftid,rightid,setEye) {
var eye_left = document.getElementById(leftid);
var eye_right = document.getElementById(rightid);
var eyeType=setEye;
if(eyeType==3){
eyeType=2;
}
if(setEye==1){
eye_right.src = "http://127.0.0.1:40315/getEyeLive?eyeType=1&t=" + Math.random();
}else if(setEye==2){
eye_left.src = "http://127.0.0.1:40315/getEyeLive?eyeType=2&t=" + Math.random();
}else{
eye_left.src = "http://127.0.0.1:40315/getEyeLive?eyeType=2&t=" + Math.random();
eye_right.src = "http://127.0.0.1:40315/getEyeLive?eyeType=1&t=" + Math.random();
}
}
/**
* 关闭虹膜采集
*/
function gbcj(){
clearInterval(timerID);
jsonp({
url: "http://127.0.0.1:40315/cancel",
data: { },
dataType: "json",
callback:"jsonpCallback",
fail: function (status) {
alert(status.message)
}
});
}
function sleep(delay) {
var start = (new Date()).getTime();
while ((new Date()).getTime() - start < delay) {
continue;
}
}
\ No newline at end of file
src/main/resources/templates/khtj/cxlist.html
......@@ -43,6 +43,7 @@
<input type="hidden" name="slType" id="slType" th:value="${slType}">
<input type="hidden" name="unitgrade" id="unitgrade" th:value="${unitgrade}">
<input type="hidden" name="cot" id="cot" th:value="${cot}">
<input type="hidden" name="ifslgzd" id="ifslgzd" th:value="${ifslgzd}">
</form>
</div>
<!--查询结果 table-->
......
src/main/resources/templates/zljc/zljc.html
......@@ -1105,6 +1105,40 @@
}
}
function wcjxxsm(){
var dialogId='w';
var zjhm = $('#gmsfhmStr').val();
if(zjhm==null||zjhm==""){
zjhm = $('#zjhmStr').val();
}
openUrlForm({
id:dialogId,
url:'ryxxwfcjsm?rybh='+$('#rybhStr').val()+'&xm='+$("#xmStr").val()+'&gmsfhm='+zjhm+'&ifcx=1',
title:'人员信息无法采集说明',
width:835,
height:540,
cache:false,
onClose:function(){
}
},[
{
//确定生成表头配置信息,并重新加载表格数据
text:'确定',
handler:function(){
$('#w').dialog('close');
$(document).unbind("scroll");
}
},{
text:'取消',
handler:function(){
$('#w').dialog('close');
$(document).unbind("scroll");
}
}
])
}
</script>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment