Skip to content

H
hnxtbaboot
Commit 66c938e0 by wuchengwu
Options

指纹人员查询接口添加检查结果，平面，滚动指纹字段

parent 32096baa
Showing with 79 additions and 17 deletions
src/main/java/com/founder/controller/TbXwRycjController.java
......@@ -4463,31 +4463,31 @@ public class TbXwRycjController {
public String getYthcjryxxByRybh(String rybh){
ResultDto resultDto =null;
try {
AutoTbStRy ryxxByRybh = rycjService.getRyxxByRybh(rybh);
AutoTbStRyDto autoTbStRyDto = rycjService.getRyxxZwByRybh(rybh);
if (ryxxByRybh.getRybh() == null){
if (autoTbStRyDto.getRybh() == null){
resultDto = new ResultDto(false,"该人员编号未查询到数据",2000,null);
return JSONObject.toJSONString(resultDto, SerializerFeature.WriteNullStringAsEmpty);
}else {
AutoTbStRyDto tbStRyDto = new AutoTbStRyDto();
BeanUtils.copyProperties(ryxxByRybh,tbStRyDto);
Map<String,Object> map = new HashMap<>();
map.put("rybh",ryxxByRybh.getRybh());
List<AutoTbRyZp> tbRyRyzpByRybh = tbRyRyzpService.getTbRyRyzpByRybh(map, ryxxByRybh.getLrdwdm());
// AutoTbStRyDto autoTbStRyDto = new AutoTbStRyDto();
// BeanUtils.copyProperties(ryxxByRybh,autoTbStRyDto);
map.put("rybh",autoTbStRyDto.getRybh());
List<AutoTbRyZp> tbRyRyzpByRybh = tbRyRyzpService.getTbRyRyzpByRybh(map, autoTbStRyDto.getLrdwdm());
tbRyRyzpByRybh.stream().forEach((p) ->{
if("2".equals(p.getZpbw())){
tbStRyDto.setZmzpStr64(GetImageStrsByByte(p.getDzwjnr()));
autoTbStRyDto.setZmzpStr64(GetImageStrsByByte(p.getDzwjnr()));
}else if ("3".equals(p.getZpbw())){
tbStRyDto.setCmzpStr64(GetImageStrsByByte(p.getDzwjnr()));
autoTbStRyDto.setCmzpStr64(GetImageStrsByByte(p.getDzwjnr()));
}else if ("4".equals(p.getZpbw())){
tbStRyDto.setYcmzpStr64(GetImageStrsByByte(p.getDzwjnr()));
autoTbStRyDto.setYcmzpStr64(GetImageStrsByByte(p.getDzwjnr()));
}
});
if (StringUtils.isBlank(tbStRyDto.getSzzwbh())){
tbStRyDto.setSzzwbh(tbStRyDto.getRybh().substring(1));
if (StringUtils.isBlank(autoTbStRyDto.getSzzwbh())){
autoTbStRyDto.setSzzwbh(autoTbStRyDto.getRybh().substring(1));
}
resultDto = new ResultDto(true,"查询成功",1000,tbStRyDto);
resultDto = new ResultDto(true,"查询成功",1000,autoTbStRyDto);
}
}catch (Exception e){
e.printStackTrace();
......
src/main/java/com/founder/dao/TbXwRycjDao.java
package com.founder.dao;
import com.founder.model.AutoTbStRy;
import com.founder.model.AutoTbStRyDto;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
......@@ -20,6 +21,8 @@ public interface TbXwRycjDao {
public List<AutoTbStRy> queryPageList_new(Map<String, Object> map);
public List<AutoTbStRy> getRyxxByRybh(Map<String, Object> map);
public List<AutoTbStRyDto> getRyxxZwByRybh(Map<String, Object> map);
public List<AutoTbStRy> getRyxxByRybh_new(Map<String, Object> map);
public List<AutoTbStRy> getRyxxByZjhm(Map<String, Object> map);
......
src/main/java/com/founder/model/AutoTbStRyDto.java
package com.founder.model;
import java.io.Serializable;
import java.util.Date;
public class AutoTbStRyDto implements Serializable {
......@@ -46,6 +45,33 @@ public class AutoTbStRyDto implements Serializable {
private String cmzpStr64; //左侧面
private String zc; //足长
private String zwfkxx; //指纹反馈信息
private String rPmzw; //平面指纹检查结果
private String rGdzw; //滚动指纹检查结果
private String jcjg; //检查结果
public String getrPmzw() {
return rPmzw;
}
public void setrPmzw(String rPmzw) {
this.rPmzw = rPmzw;
}
public String getrGdzw() {
return rGdzw;
}
public void setrGdzw(String rGdzw) {
this.rGdzw = rGdzw;
}
public String getJcjg() {
return jcjg;
}
public void setJcjg(String jcjg) {
this.jcjg = jcjg;
}
public String getZwfkxx() {
return zwfkxx;
......
src/main/java/com/founder/service/AutoTbXwRycjService.java
package com.founder.service;
import com.founder.model.AutoTbStRy;
import com.founder.model.AutoTbStRyDto;
import com.founder.utils.EasyUIPage;
import java.util.List;
......@@ -21,6 +22,8 @@ public interface AutoTbXwRycjService extends IService<AutoTbStRy> {
public AutoTbStRy getRyxxByRybh(String asjxgrybh);
public AutoTbStRyDto getRyxxZwByRybh(String asjxgrybh);
public List<AutoTbStRy> getRyxxByZjhm(String zjhm);
public AutoTbStRy getRyxxByJzrybh(String asjxgrybh);
......
src/main/java/com/founder/service/impl/AutoTbXwRycjServiceImpl.java
......@@ -3,6 +3,7 @@ package com.founder.service.impl;
import com.founder.dao.TbXwRycjDao;
import com.founder.jwzhDao.JwzhDao;
import com.founder.model.AutoTbStRy;
import com.founder.model.AutoTbStRyDto;
import com.founder.service.AutoTbXwRycjService;
import com.founder.utils.EasyUIPage;
import org.slf4j.Logger;
......@@ -171,6 +172,19 @@ public class AutoTbXwRycjServiceImpl extends BaseService<AutoTbStRy> implements
}
@Override
public AutoTbStRyDto getRyxxZwByRybh(String asjxgrybh) {
AutoTbStRyDto xyrC=new AutoTbStRyDto();
Map<String, Object> map = new HashMap<>();
map.put("rybh", asjxgrybh);
//List<AutoTbStRy> xyrCs = mapper.getRyxxByRybh_new(map);
List<AutoTbStRyDto> xyrCs = mapper.getRyxxZwByRybh(map);
if(xyrCs!=null&&xyrCs.size()>0){
xyrC = xyrCs.get(0);
}
return xyrC;
}
@Override
public List<AutoTbStRy> getRyxxByZjhm(String zjhm){
Map<String, Object> map = new HashMap<>();
map.put("zjhm", zjhm);
......
src/main/resources/mapper/AutoTbXwRycjSqlMap.xml
......@@ -220,6 +220,9 @@
<if test="entity.zjyw != null and entity.zjyw != '' and entity.zjyw == 1">
and (select count(1) from tb_xw_ythcj_zj s where s.rybh=TB_RY_RYCJ.rybh) >0
</if>
<if test="entity.zjyw != null and entity.zjyw != '' and entity.zjyw == 2">
and (select count(1) from tb_xw_ythcj_zj s where s.rybh=TB_RY_RYCJ.rybh and (s.SFTS = '0' or s.SFTS is null) ) >0
</if>
<if test="entity.ajlbdm != null and entity.ajlbdm != '' ">
and TB_RY_RYCJ.AJLBDM = #{entity.ajlbdm , jdbcType=VARCHAR }
</if>
......@@ -399,7 +402,20 @@
select cj.* ,
to_char(cj.lrsj, 'yyyy-MM-dd HH24:mm:ss') as lrsjStr,
to_char(cj.CSRQ_QSRQ, 'yyyy-MM-dd HH24:mm:ss') as csrqQsrqStr
from TB_RY_RYCJ cj where (cj.SCBZ='0' or cj.SCBZ is null) AND (cj.IFHB<![CDATA[<>]]>'1' OR cj.IFHB IS NULL) and cj.RYBH = #{rybh , jdbcType=VARCHAR }
from TB_RY_RYCJ cj
where (cj.SCBZ='0' or cj.SCBZ is null) AND (cj.IFHB<![CDATA[<>]]>'1' OR cj.IFHB IS NULL) and cj.RYBH = #{rybh , jdbcType=VARCHAR }
</select>
<select id="getRyxxZwByRybh" resultType="com.founder.model.AutoTbStRyDto" parameterType="map">
select cj.* ,
to_char(cj.lrsj, 'yyyy-MM-dd HH24:mm:ss') as lrsjStr,
to_char(cj.CSRQ_QSRQ, 'yyyy-MM-dd HH24:mm:ss') as csrqQsrqStr,
ck.R_PMZW as "rPmzw",
ck.R_GDZW as "rGdzw",
ck.JCJG as jcjg
from TB_RY_RYCJ cj,
AFIS_QUALITY_CK ck
where cj.RYBH = ck.R_RYBH and (cj.SCBZ='0' or cj.SCBZ is null) and (ck.SCBZ='0' or ck.SCBZ is null) AND (cj.IFHB<![CDATA[<>]]>'1' OR cj.IFHB IS NULL) and cj.RYBH = #{rybh , jdbcType=VARCHAR }
</select>
<select id="getRyxxByZjhm" resultMap="baseMap" parameterType="map">
......
src/main/resources/templates/cjqx/shebform.html
......@@ -673,7 +673,7 @@
}
$("#" + name).val($("#" + id + " option:selected").text());
// alert("text==" + $("#" + id + " option:selected").text());
if ("4" == $("#zwcjycode option:selected").val()){
if ("5" == $("#zwcjycode option:selected").val()){
$('#zwcjsbbhstr').attr("lay-verify","zwjk");
$("#zwsbbh .layui-form-label").html(red + $("#zwsbbh .layui-form-label").children().remove().end().text());
form.render();
......
src/main/resources/templates/cjqx/shebupdate.html
......@@ -418,7 +418,7 @@
}
$("#" + name).val($("#" + id + " option:selected").text());
// alert("text==" + $("#zwcjycode option:selected").val());
if ("4" == $("#zwcjycode option:selected").val()){
if ("5" == $("#zwcjycode option:selected").val()){
$('#zwcjsbbhstr').attr("lay-verify","zwjk");
$("#zwsbbh .layui-form-label").html(red + $("#zwsbbh .layui-form-label").children().remove().end().text());
form.render();
......@@ -489,7 +489,7 @@
$("#ifzwcjy").val("是");
$("#zwcj").show();
//设备编号
if ("4" == $("#zwcjycode2").val()){
if ("5" == $("#zwcjycode2").val()){
$('#zwcjsbbhstr').attr("lay-verify","zwjk");
$("#zwsbbh .layui-form-label").html(red + $("#zwsbbh .layui-form-label").children().remove().end().text());
}else {
......
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