Skip to content

H
hnxtbaboot
Commit d9a0e68f by wuchengwu
Options

质量抽查新增抽查内容

parent b5a496b2
Showing with 630 additions and 48 deletions
src/main/java/com/founder/dao/AfisQualityCkDao.java
...@@ -66,5 +66,8 @@ public interface AfisQualityCkDao extends MyMapper<AfisQualityCk> { ...@@ -66,5 +66,8 @@ public interface AfisQualityCkDao extends MyMapper<AfisQualityCk> {
*/ */
public List<AfisQualityDto> queryZlccRwDwList(Map<String, Object> map); public List<AfisQualityDto> queryZlccRwDwList(Map<String, Object> map);
public List<AfisQualityDto> queryCcrwtjList(Map<String, Object> map); public List<AfisQualityDto> queryCcrwtjList(Map<String, Object> map);
public List<AfisQualityDto> queryZltjList(Map<String, Object> map);
public List<AfisQualityDto> queryZldrwtjList(Map<String, Object> map);
/*********************************************************************/ /*********************************************************************/
} }
src/main/java/com/founder/model/AfisQualityCcrw.java
...@@ -19,6 +19,7 @@ public class AfisQualityCcrw implements Serializable { ...@@ -19,6 +19,7 @@ public class AfisQualityCcrw implements Serializable {
private Date ccsjJzsj; //抽查时间截止时间 private Date ccsjJzsj; //抽查时间截止时间
private String ccsjJzsjStr; //抽查时间截止时间 private String ccsjJzsjStr; //抽查时间截止时间
private String ccdw; //抽查单位 private String ccdw; //抽查单位
private String ccnr; //抽查内容
private String ccdwStr; //抽查单位名称 private String ccdwStr; //抽查单位名称
private String ccfs; //抽查份数 private String ccfs; //抽查份数
private String jcfs; //已检查份数 private String jcfs; //已检查份数
...@@ -32,6 +33,14 @@ public class AfisQualityCcrw implements Serializable { ...@@ -32,6 +33,14 @@ public class AfisQualityCcrw implements Serializable {
private String gxr; //修改人 private String gxr; //修改人
private Date gxsj; //修改时间 private Date gxsj; //修改时间
public String getCcnr() {
return ccnr;
}
public void setCcnr(String ccnr) {
this.ccnr = ccnr;
}
public String getCjsjStr() { public String getCjsjStr() {
return cjsjStr; return cjsjStr;
} }
......
src/main/java/com/founder/model/AfisQualityDto.java
...@@ -5,8 +5,8 @@ import java.util.Date; ...@@ -5,8 +5,8 @@ import java.util.Date;
/** /**
* @author wcw * @author wcw
* @date 2021-07-27
* @version 1.0 * @version 1.0
* @date 2021-07-27
*/ */
public class AfisQualityDto implements Serializable { public class AfisQualityDto implements Serializable {
...@@ -91,17 +91,31 @@ public class AfisQualityDto implements Serializable { ...@@ -91,17 +91,31 @@ public class AfisQualityDto implements Serializable {
private String bhgs; //不合格枚数 private String bhgs; //不合格枚数
private String qzms; //缺指枚数 private String qzms; //缺指枚数
private int zcqs;//总抽取数
private int bhgfs; //不合格份数 private int bhgfs; //不合格份数
private String cqdw; //抽取单位 private String cqdw; //抽取单位
private String cqdwdm;//抽取单位代码 private String cqdwdm;//抽取单位代码
private int hgs;//合格数
public String getCqdwdm() { private int wzhgs;//文字合格数
return cqdwdm; private int wzbhgs;//文字不合格数
} private String hgl;//合格率
public void setCqdwdm(String cqdwdm) { private int gdzgms;//滚动总共枚数
this.cqdwdm = cqdwdm; private int gdhgms;//滚动合格枚数
} private String gdhgl;//滚动合格率
private int gdbhgms;//滚动不合格枚数
private String gdbhgl;//滚动不合格率
private int pmzgms;//平面总共枚数
private int pmhgms;//平面合格枚数
private String pmhgl;//平面合格率
private int pmbhgms;//平面不合格枚数
private String pmbhgl;//平面不合格率
private int rxccfs;//人像抽查份数
private int rxhgs;//人像合格数
private int rxbhgs;//人像不合格数
private String rxhgl;//人像合格率
public int getCjs() { public int getCjs() {
return cjs; return cjs;
...@@ -127,6 +141,14 @@ public class AfisQualityDto implements Serializable { ...@@ -127,6 +141,14 @@ public class AfisQualityDto implements Serializable {
this.bhgs = bhgs; this.bhgs = bhgs;
} }
public int getZcqs() {
return zcqs;
}
public void setZcqs(int zcqs) {
this.zcqs = zcqs;
}
public int getBhgfs() { public int getBhgfs() {
return bhgfs; return bhgfs;
} }
...@@ -143,6 +165,158 @@ public class AfisQualityDto implements Serializable { ...@@ -143,6 +165,158 @@ public class AfisQualityDto implements Serializable {
this.cqdw = cqdw; this.cqdw = cqdw;
} }
public String getCqdwdm() {
return cqdwdm;
}
public void setCqdwdm(String cqdwdm) {
this.cqdwdm = cqdwdm;
}
public int getHgs() {
return hgs;
}
public void setHgs(int hgs) {
this.hgs = hgs;
}
public int getWzhgs() {
return wzhgs;
}
public void setWzhgs(int wzhgs) {
this.wzhgs = wzhgs;
}
public int getWzbhgs() {
return wzbhgs;
}
public void setWzbhgs(int wzbhgs) {
this.wzbhgs = wzbhgs;
}
public String getHgl() {
return hgl;
}
public void setHgl(String hgl) {
this.hgl = hgl;
}
public int getGdzgms() {
return gdzgms;
}
public void setGdzgms(int gdzgms) {
this.gdzgms = gdzgms;
}
public int getGdhgms() {
return gdhgms;
}
public void setGdhgms(int gdhgms) {
this.gdhgms = gdhgms;
}
public String getGdhgl() {
return gdhgl;
}
public void setGdhgl(String gdhgl) {
this.gdhgl = gdhgl;
}
public int getGdbhgms() {
return gdbhgms;
}
public void setGdbhgms(int gdbhgms) {
this.gdbhgms = gdbhgms;
}
public String getGdbhgl() {
return gdbhgl;
}
public void setGdbhgl(String gdbhgl) {
this.gdbhgl = gdbhgl;
}
public int getPmzgms() {
return pmzgms;
}
public void setPmzgms(int pmzgms) {
this.pmzgms = pmzgms;
}
public int getPmhgms() {
return pmhgms;
}
public void setPmhgms(int pmhgms) {
this.pmhgms = pmhgms;
}
public String getPmhgl() {
return pmhgl;
}
public void setPmhgl(String pmhgl) {
this.pmhgl = pmhgl;
}
public int getPmbhgms() {
return pmbhgms;
}
public void setPmbhgms(int pmbhgms) {
this.pmbhgms = pmbhgms;
}
public String getPmbhgl() {
return pmbhgl;
}
public void setPmbhgl(String pmbhgl) {
this.pmbhgl = pmbhgl;
}
public int getRxccfs() {
return rxccfs;
}
public void setRxccfs(int rxccfs) {
this.rxccfs = rxccfs;
}
public int getRxhgs() {
return rxhgs;
}
public void setRxhgs(int rxhgs) {
this.rxhgs = rxhgs;
}
public int getRxbhgs() {
return rxbhgs;
}
public void setRxbhgs(int rxbhgs) {
this.rxbhgs = rxbhgs;
}
public String getRxhgl() {
return rxhgl;
}
public void setRxhgl(String rxhgl) {
this.rxhgl = rxhgl;
}
public String getZmzp() { public String getZmzp() {
return zmzp; return zmzp;
} }
......
src/main/java/com/founder/model/ResultDto.java 0 → 100644
package com.founder.model;
/**
* @author wcw
* @version 1.0
* @date 2021/9/7 9:17
*/
public class ResultDto {
private boolean success;
private String msg;
private int code;
private Object data;
public ResultDto() {
}
public ResultDto(boolean success, String msg, int code, Object data) {
this.success = success;
this.msg = msg;
this.code = code;
this.data = data;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public Object getData() {
return data;
}
public void setData(Object data) {
this.data = data;
}
public boolean isSuccess() {
return success;
}
public void setSuccess(boolean success) {
this.success = success;
}
}
src/main/java/com/founder/service/AfisQualityService.java
...@@ -38,6 +38,12 @@ public interface AfisQualityService extends IService<AfisQualityCk> { ...@@ -38,6 +38,12 @@ public interface AfisQualityService extends IService<AfisQualityCk> {
/** /**
* 质量抽查统计
* @return
*/
public List<AfisQualityDto> queryZltjList( String ccbh, String ccdw,String rwbh,String drw,String drwdw);
/**
* 获取抽查任务单位 * 获取抽查任务单位
* @param entity * @param entity
* @param sfdrw * @param sfdrw
......
src/main/java/com/founder/service/impl/AfisQualityServiceImpl.java
...@@ -2,7 +2,7 @@ package com.founder.service.impl; ...@@ -2,7 +2,7 @@ package com.founder.service.impl;
import com.founder.dao.AfisQualityCkDao; import com.founder.dao.AfisQualityCkDao;
import com.founder.khtj.dao.KhtjDao; import com.founder.khtj.dao.KhtjDao;
import com.founder.khtj.domain.UnitCodeBean; import com.founder.utils.MathUtil;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import com.founder.model.AfisQualityCk; import com.founder.model.AfisQualityCk;
import com.founder.model.AfisQualityDto; import com.founder.model.AfisQualityDto;
...@@ -77,14 +77,14 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement ...@@ -77,14 +77,14 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement
List afisQualityCks = this.mapper.queryZljcPageList(map); List afisQualityCks = this.mapper.queryZljcPageList(map);
DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (int i = 0; i < afisQualityCks.size(); i++) { for (int i = 0; i < afisQualityCks.size(); i++) {
if ((((AfisQualityCk) afisQualityCks.get(i)).getRCjsj() != null) && (!"".equals(((AfisQualityCk) afisQualityCks.get(i)).getRCjsj()))) if ((((AfisQualityCk) afisQualityCks.get(i)).getRCjsj() != null) && (!"".equals(((AfisQualityCk) afisQualityCks.get(i)).getRCjsj()))) {
((AfisQualityCk) afisQualityCks.get(i)).setRCjsjStr(df.format(((AfisQualityCk) afisQualityCks.get(i)).getRCjsj())); ((AfisQualityCk) afisQualityCks.get(i)).setRCjsjStr(df.format(((AfisQualityCk) afisQualityCks.get(i)).getRCjsj()));
else { } else {
((AfisQualityCk) afisQualityCks.get(i)).setRCjsjStr(""); ((AfisQualityCk) afisQualityCks.get(i)).setRCjsjStr("");
} }
if ((((AfisQualityCk) afisQualityCks.get(i)).getJcsj() != null) && (!"".equals(((AfisQualityCk) afisQualityCks.get(i)).getJcsj()))) if ((((AfisQualityCk) afisQualityCks.get(i)).getJcsj() != null) && (!"".equals(((AfisQualityCk) afisQualityCks.get(i)).getJcsj()))){
((AfisQualityCk) afisQualityCks.get(i)).setJcsjStr(df.format(((AfisQualityCk) afisQualityCks.get(i)).getJcsj())); ((AfisQualityCk) afisQualityCks.get(i)).setJcsjStr(df.format(((AfisQualityCk) afisQualityCks.get(i)).getJcsj()));
else { } else {
((AfisQualityCk) afisQualityCks.get(i)).setJcsjStr(""); ((AfisQualityCk) afisQualityCks.get(i)).setJcsjStr("");
} }
} }
...@@ -224,9 +224,10 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement ...@@ -224,9 +224,10 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement
mapt.put("r_sjlxdh", psn_jcjg); mapt.put("r_sjlxdh", psn_jcjg);
mapt.put("zwbh", zwbh); mapt.put("zwbh", zwbh);
boolean f2 = this.mapper.updateCloseCheckSql2(mapt); boolean f2 = this.mapper.updateCloseCheckSql2(mapt);
if ((f1) && (f2)) if ((f1) && (f2)) {
result = "1"; result = "1";
} }
}
} catch (Exception e) { } catch (Exception e) {
result = "0"; result = "0";
e.printStackTrace(); e.printStackTrace();
...@@ -311,6 +312,96 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement ...@@ -311,6 +312,96 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement
return ccrwTjList; return ccrwTjList;
} }
@Override
public List<AfisQualityDto> queryZltjList(String ccbh, String ccdw,String rwbh,String drw,String drwdw) {
int zcqsSum = 0;
int hgsSum = 0;
int bhgfsSum = 0;
int gdzgmsSum = 0;
int gdhgmsSum = 0;
int gdbhgmsSum = 0;
int pmzgmsSum = 0;
int pmhgmsSum = 0;
int pmbhgmsSum = 0;
int wzhgsSum = 0;
int wzbhgsSum = 0;
int rxccfsSum = 0;
int rxhgsSum = 0;
int rxbhgsSum = 0;
Map<String, Object> map = new HashMap<>();
List<AfisQualityDto> afisQualityDtos = null;
//判断是为多任务
if ("false".equals(drw)) {
map.put("ccbh", ccbh);
map.put("ccdw", ccdw.substring(0, 4));
afisQualityDtos = mapper.queryZltjList(map);
}else if ("true".equals(drw)){
map.put("rwbh", rwbh);
map.put("ccdw", drwdw.substring(0, 4));
if ("4300".equals(drwdw.substring(0,4))){
map.put("dwdj", 4);
}else {
map.put("dwdj", 6);
}
afisQualityDtos = mapper.queryZldrwtjList(map);
}
if (afisQualityDtos.size()>0) {
for (AfisQualityDto p : afisQualityDtos) {
int gdbhgms = p.getGdzgms() - p.getGdhgms();
int pmbhgms = p.getPmzgms() - p.getPmhgms();
int rxbhgs = p.getRxccfs() - p.getRxhgs();
p.setGdbhgms(gdbhgms);
p.setPmbhgms(pmbhgms);
p.setRxbhgs(rxbhgs);
p.setHgl(MathUtil.percentage(p.getHgs(), p.getZcqs()));
p.setGdhgl(MathUtil.percentage(p.getGdhgms(), p.getGdzgms()));
p.setGdbhgl(MathUtil.percentage(gdbhgms, p.getGdzgms()));
p.setPmhgl(MathUtil.percentage(p.getPmhgms(), p.getPmzgms()));
p.setPmbhgl(MathUtil.percentage(pmbhgms, p.getPmzgms()));
p.setRxhgl(MathUtil.percentage(rxbhgs, p.getRxccfs()));
//求合计
zcqsSum = zcqsSum + p.getZcqs();
hgsSum = hgsSum + p.getHgs();
bhgfsSum = bhgfsSum + p.getBhgfs();
gdzgmsSum = gdzgmsSum + p.getGdzgms();
gdhgmsSum = gdhgmsSum + p.getGdhgms();
gdbhgmsSum = gdbhgmsSum + p.getGdbhgms();
pmzgmsSum = pmzgmsSum + p.getPmzgms();
pmhgmsSum = pmhgmsSum + p.getPmhgms();
pmbhgmsSum = pmbhgmsSum + p.getPmbhgms();
wzbhgsSum = wzbhgsSum + p.getWzbhgs();
wzhgsSum = wzhgsSum + p.getWzhgs();
rxccfsSum = rxccfsSum + p.getRxccfs();
rxhgsSum = rxhgsSum + p.getRxhgs();
rxbhgsSum = rxbhgsSum + p.getRxbhgs();
}
AfisQualityDto qualityDto = new AfisQualityDto();
qualityDto.setCqdw("合计");
qualityDto.setZcqs(zcqsSum);
qualityDto.setHgs(hgsSum);
qualityDto.setBhgfs(bhgfsSum);
qualityDto.setHgl(MathUtil.percentage(hgsSum, zcqsSum));
qualityDto.setGdzgms(gdzgmsSum);
qualityDto.setGdhgms(gdhgmsSum);
qualityDto.setGdhgl(MathUtil.percentage(gdhgmsSum, gdzgmsSum));
qualityDto.setGdbhgms(gdbhgmsSum);
qualityDto.setGdbhgl(MathUtil.percentage(gdbhgmsSum, gdzgmsSum));
qualityDto.setPmzgms(pmzgmsSum);
qualityDto.setPmhgms(pmhgmsSum);
qualityDto.setPmhgl(MathUtil.percentage(pmhgmsSum, pmzgmsSum));
qualityDto.setPmbhgms(pmbhgmsSum);
qualityDto.setPmbhgl(MathUtil.percentage(pmbhgmsSum, pmzgmsSum));
qualityDto.setWzhgs(wzhgsSum);
qualityDto.setWzbhgs(wzbhgsSum);
qualityDto.setRxccfs(rxccfsSum);
qualityDto.setRxhgs(rxhgsSum);
qualityDto.setRxbhgs(rxbhgsSum);
qualityDto.setRxhgl(MathUtil.percentage(rxhgsSum, rxccfsSum));
afisQualityDtos.add(qualityDto);
}
return afisQualityDtos;
}
@Override @Override
public List<AfisQualityDto> queryZlccRwDwList(AfisQualityCk entity, String sfdrw) { public List<AfisQualityDto> queryZlccRwDwList(AfisQualityCk entity, String sfdrw) {
...@@ -484,6 +575,7 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement ...@@ -484,6 +575,7 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement
* @param ccfs * @param ccfs
* @return * @return
*/ */
private List<AfisQualityCk> ccdwList(List<AfisQualityCk> zlccDwList, List<AfisQualityCk> resultList, int syccs, int zsccs, AfisQualityCk entity, private List<AfisQualityCk> ccdwList(List<AfisQualityCk> zlccDwList, List<AfisQualityCk> resultList, int syccs, int zsccs, AfisQualityCk entity,
Map<String, Object> map, String flg, List<AfisQualityCk> afisQualityCks, String syccbh, int ccfs, boolean isjcjg) { Map<String, Object> map, String flg, List<AfisQualityCk> afisQualityCks, String syccbh, int ccfs, boolean isjcjg) {
List<AfisQualityCk> currentList = new ArrayList<>(); List<AfisQualityCk> currentList = new ArrayList<>();
...@@ -629,9 +721,10 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement ...@@ -629,9 +721,10 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement
String psn_jcjg = "1".equals(jcjg) ? "19" : "18"; String psn_jcjg = "1".equals(jcjg) ? "19" : "18";
ryxx.setSzzwbh(zwbh); ryxx.setSzzwbh(zwbh);
ryxx.setR_sjlxdh(psn_jcjg); ryxx.setR_sjlxdh(psn_jcjg);
if (f1) if (f1) {
result = "1"; result = "1";
} }
}
} catch (Exception e) { } catch (Exception e) {
result = "0"; result = "0";
e.printStackTrace(); e.printStackTrace();
......
src/main/java/com/founder/utils/ExportExcels.java
...@@ -6,7 +6,10 @@ import org.apache.poi.hssf.usermodel.HSSFRow; ...@@ -6,7 +6,10 @@ import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Font; import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
...@@ -140,4 +143,113 @@ public class ExportExcels { ...@@ -140,4 +143,113 @@ public class ExportExcels {
ex.printStackTrace(); ex.printStackTrace();
} }
} }
/**
*给定一张图纸，此方法从图纸中删除一列并移动
*它右边的所有列到左边的一个单元格。
*
*注意，此方法不会更新任何公式引用。
*
*@param表
*@param列
*/
public static void deleteColumn(Sheet sheet, int columnToDelete ){
int maxColumn = 0;
for ( int r=0; r < sheet.getLastRowNum()+1; r++ ){
Row row = sheet.getRow( r );
// 如果此处不存在行；那就没什么事可做了；下一个
if ( row == null )
continue;
//如果行没有这么多列，那么我们就很好；下一个
int lastColumn = row.getLastCellNum();
if ( lastColumn > maxColumn )
maxColumn = lastColumn;
if ( lastColumn < columnToDelete )
continue;
for ( int x=columnToDelete+1; x < lastColumn + 1; x++ ){
Cell oldCell = row.getCell(x-1);
if ( oldCell != null )
row.removeCell( oldCell );
Cell nextCell = row.getCell( x );
if ( nextCell != null ){
Cell newCell = row.createCell( x-1, nextCell.getCellType() );
cloneCell(newCell, nextCell);
}
}
}
// 调整列宽
for ( int c=columnToDelete; c < maxColumn; c++ ){
sheet.setColumnWidth( c, sheet.getColumnWidth(c+1) );
}
}
/**
*获取现有单元格并合并所有样式和forumla
*进入新的一个
*/
private static void cloneCell( Cell cNew, Cell nextCell ){
cNew.setCellComment( nextCell.getCellComment() );
cNew.setCellStyle( nextCell.getCellStyle() );
switch ( cNew.getCellType() ){
case Cell.CELL_TYPE_BOOLEAN:{
cNew.setCellValue( nextCell.getBooleanCellValue() );
break;
}
case Cell.CELL_TYPE_NUMERIC:{
cNew.setCellValue( nextCell.getNumericCellValue() );
break;
}
case Cell.CELL_TYPE_STRING:{
cNew.setCellValue( nextCell.getStringCellValue() );
break;
}
case Cell.CELL_TYPE_ERROR:{
cNew.setCellValue( nextCell.getErrorCellValue() );
break;
}
case Cell.CELL_TYPE_FORMULA:{
cNew.setCellFormula( nextCell.getCellFormula() );
break;
}
}
}
/**
* 自适应宽度(中文支持)
* @param sheet
* @param size
*/
public static void setSizeColumn(HSSFSheet sheet, int size) {
for (int columnNum = 0; columnNum < size; columnNum++) {
int columnWidth = sheet.getColumnWidth(columnNum) / 256;
for (int rowNum = 1; rowNum < sheet.getLastRowNum(); rowNum++) {
HSSFRow currentRow;
//当前行未被使用过
if (sheet.getRow(rowNum) == null) {
currentRow = sheet.createRow(rowNum);
} else {
currentRow = sheet.getRow(rowNum);
}
if (currentRow.getCell(columnNum) != null) {
HSSFCell currentCell = currentRow.getCell(columnNum);
if (currentCell.getCellType() == HSSFCell.CELL_TYPE_STRING) {
int length = currentCell.getStringCellValue().getBytes().length;
if (columnWidth < length) {
columnWidth = length;
}
}
}
}
sheet.setColumnWidth(columnNum, columnWidth * 256);
}
}
} }
\ No newline at end of file
src/main/java/com/founder/utils/MathUtil.java 0 → 100644
package com.founder.utils;
import java.math.BigDecimal;
/**
* @author wcw
* @version 1.0
* @date 2021/9/2 18:10
*/
public class MathUtil {
//计算百分率
public static String percentage(int val1, int val2) {
String percentage = "";
if (val2 == 0 || val1 ==0) {
percentage = "0";
} else if ( val1==val2) {
percentage = "100%";
} else{
BigDecimal bd1 = new BigDecimal(val1);//分子
BigDecimal bd2 = new BigDecimal(val2);//分母
BigDecimal bd3 = bd1.divide(bd2, 4, BigDecimal.ROUND_HALF_UP);
BigDecimal bd4 = bd3.multiply(new BigDecimal(100)).setScale(2);
percentage = bd4.toString() + "%";
}
return percentage;
}
public static void main(String[] args) {
String percentage = percentage(1, 2);
System.out.println(percentage);
}
}
src/main/resources/mapper/AfisQualityCcrwSqlMapper.xml
...@@ -45,7 +45,8 @@ ...@@ -45,7 +45,8 @@
A.CJDWDM as cjdwdm, A.CJDWDM as cjdwdm,
A.CJR as cjr, A.CJR as cjr,
A.BZ as bz, A.BZ as bz,
A.CJSJ as cjsj A.CJSJ as cjsj,
A.CCNR as ccnr
from AFIS_QUALITY_CCRW A where 1=1 from AFIS_QUALITY_CCRW A where 1=1
AND A.SCBZ = '0' AND A.SCBZ = '0'
<if test="entity.bz != null and entity.bz != ''"> <if test="entity.bz != null and entity.bz != ''">
...@@ -77,7 +78,8 @@ ...@@ -77,7 +78,8 @@
A.CJDWDM as cjdwdm, A.CJDWDM as cjdwdm,
A.CJR as cjr, A.CJR as cjr,
A.BZ as bz, A.BZ as bz,
A.CJSJ as cjsj A.CJSJ as cjsj,
A.CCNR as ccnr
from AFIS_QUALITY_CCRW A where 1=1 from AFIS_QUALITY_CCRW A where 1=1
AND A.SCBZ = '0' AND RWBZ = '1' AND (select sum(t.jcfs) from AFIS_QUALITY_CCRW t where t.rwbh=A.rwbh and t.SCBZ = '0')>=(select sum(t.ccfs) from AFIS_QUALITY_CCRW t where t.rwbh=A.rwbh and t.SCBZ = '0') AND A.SCBZ = '0' AND RWBZ = '1' AND (select sum(t.jcfs) from AFIS_QUALITY_CCRW t where t.rwbh=A.rwbh and t.SCBZ = '0')>=(select sum(t.ccfs) from AFIS_QUALITY_CCRW t where t.rwbh=A.rwbh and t.SCBZ = '0')
<include refid="queryWhere"/> <include refid="queryWhere"/>
...@@ -106,7 +108,8 @@ ...@@ -106,7 +108,8 @@
A.CJDWDM as cjdwdm, A.CJDWDM as cjdwdm,
A.CJR as cjr, A.CJR as cjr,
A.BZ as bz, A.BZ as bz,
A.CJSJ as cjsj A.CJSJ as cjsj,
A.CCNR as ccnr
from AFIS_QUALITY_CCRW A where 1=1 from AFIS_QUALITY_CCRW A where 1=1
AND A.SCBZ = '0' AND A.SCBZ = '0'
<include refid="queryWhere"/> <include refid="queryWhere"/>
...@@ -129,7 +132,8 @@ ...@@ -129,7 +132,8 @@
A.CJR as cjr, A.CJR as cjr,
A.BZ as bz, A.BZ as bz,
A.RWBZ as rwbz, A.RWBZ as rwbz,
A.CJSJ as cjsj A.CJSJ as cjsj,
A.CCNR as ccnr
from AFIS_QUALITY_CCRW A where 1=1 from AFIS_QUALITY_CCRW A where 1=1
AND A.SCBZ = '0' AND A.SCBZ = '0'
and A.XXBH = #{xxbh , jdbcType=VARCHAR } and A.XXBH = #{xxbh , jdbcType=VARCHAR }
...@@ -156,7 +160,8 @@ ...@@ -156,7 +160,8 @@
A.CJR AS cjr, A.CJR AS cjr,
A.BZ AS bz, A.BZ AS bz,
A.RWBZ AS rwbz, A.RWBZ AS rwbz,
A.CJSJ AS cjsj A.CJSJ AS cjsj,
A.CCNR as ccnr
FROM FROM
<if test=" sfdrw == 'true'"> <if test=" sfdrw == 'true'">
( (
...@@ -191,7 +196,8 @@ ...@@ -191,7 +196,8 @@
A.CJR as cjr, A.CJR as cjr,
A.BZ as bz, A.BZ as bz,
A.RWBZ as rwbz, A.RWBZ as rwbz,
A.CJSJ as cjsj A.CJSJ as cjsj,
A.CCNR as ccnr
from AFIS_QUALITY_CCRW A where 1=1 from AFIS_QUALITY_CCRW A where 1=1
AND A.SCBZ = '0' AND RWBZ = '1' AND A.SCBZ = '0' AND RWBZ = '1'
and A.RWBH = #{rwbh , jdbcType=VARCHAR } and A.RWBH = #{rwbh , jdbcType=VARCHAR }
...@@ -209,7 +215,8 @@ ...@@ -209,7 +215,8 @@
RWBZ, RWBZ,
CJDWDM, CJDWDM,
CJR, CJR,
CJSJ CJSJ,
CCNR
) )
values ( values (
<if test="entity.xxbh != null and entity.xxbh != ''"> #{entity.xxbh , jdbcType=VARCHAR } </if> <if test="entity.xxbh != null and entity.xxbh != ''"> #{entity.xxbh , jdbcType=VARCHAR } </if>
...@@ -233,6 +240,8 @@ ...@@ -233,6 +240,8 @@
<if test="entity.cjr != null and entity.cjr != ''">, #{entity.cjr , jdbcType=VARCHAR } </if> <if test="entity.cjr != null and entity.cjr != ''">, #{entity.cjr , jdbcType=VARCHAR } </if>
<if test="entity.cjr == null or entity.cjr == ''">,NULL</if> <if test="entity.cjr == null or entity.cjr == ''">,NULL</if>
,SYSDATE ,SYSDATE
<if test="entity.ccnr != null and entity.ccnr != ''">, #{entity.ccnr , jdbcType=VARCHAR } </if>
<if test="entity.ccnr == null or entity.ccnr == ''">,NULL</if>
) )
</insert> </insert>
...@@ -246,6 +255,7 @@ ...@@ -246,6 +255,7 @@
<if test="entity.rwbz != null and entity.rwbz != ''"> RWBZ = #{entity.rwbz , jdbcType=VARCHAR }, </if> <if test="entity.rwbz != null and entity.rwbz != ''"> RWBZ = #{entity.rwbz , jdbcType=VARCHAR }, </if>
<if test="entity.gxdwdm != null and entity.gxdwdm != ''"> GXDWDM = #{entity.gxdwdm , jdbcType=VARCHAR }, </if> <if test="entity.gxdwdm != null and entity.gxdwdm != ''"> GXDWDM = #{entity.gxdwdm , jdbcType=VARCHAR }, </if>
<if test="entity.gxr != null and entity.gxr != ''"> GXR = #{entity.gxr , jdbcType=VARCHAR }, </if> <if test="entity.gxr != null and entity.gxr != ''"> GXR = #{entity.gxr , jdbcType=VARCHAR }, </if>
<if test="entity.ccnr != null and entity.ccnr != ''"> CCNR = #{entity.ccnr , jdbcType=VARCHAR }, </if>
GXSJ=SYSDATE GXSJ=SYSDATE
where SCBZ = '0' where SCBZ = '0'
<if test="entity.xxbh != null and entity.xxbh != ''"> AND XXBH = #{entity.xxbh , jdbcType=VARCHAR } </if> <if test="entity.xxbh != null and entity.xxbh != ''"> AND XXBH = #{entity.xxbh , jdbcType=VARCHAR } </if>
......
src/main/resources/mapper/AutoTbXwRycjSqlMap.xml
...@@ -390,8 +390,10 @@ ...@@ -390,8 +390,10 @@
</select> </select>
<select id="getRyxxByRybh" resultMap="baseMap" parameterType="map"> <select id="getRyxxByRybh" resultMap="baseMap" parameterType="map">
select * select cj.* ,
from TB_RY_RYCJ where (SCBZ='0' or SCBZ is null) AND (IFHB<![CDATA[<>]]>'1' OR IFHB IS NULL) and RYBH = #{rybh , jdbcType=VARCHAR } 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 }
</select> </select>
<select id="getRyxxByZjhm" resultMap="baseMap" parameterType="map"> <select id="getRyxxByZjhm" resultMap="baseMap" parameterType="map">
......
src/main/resources/static/xtba/zljc/js/zljc.js
...@@ -659,8 +659,7 @@ function saveZljc(jcjg){ ...@@ -659,8 +659,7 @@ function saveZljc(jcjg){
//window.open("saveJcjg?rybh="+$("#rybhStr").val()+"&zwbh="+$("#szzwbhStr").val()+"&RGdzw="+$("#RGdzw").val()+"&RPmzw="+$("#RPmzw").val()+"&RRx="+$("#RRx").val()+"&wzxx="+$("#wzxx").val()+"&bz="+$("#bz").val()+"&jcjg="+$("#jcjg").val()); //window.open("saveJcjg?rybh="+$("#rybhStr").val()+"&zwbh="+$("#szzwbhStr").val()+"&RGdzw="+$("#RGdzw").val()+"&RPmzw="+$("#RPmzw").val()+"&RRx="+$("#RRx").val()+"&wzxx="+$("#wzxx").val()+"&bz="+$("#bz").val()+"&jcjg="+$("#jcjg").val());
} }
function saveZlcc(jcjg) { function saveZlcc(jcjg,ccnr) {
debugger;
var wzxx = $("#wzxx").val(); var wzxx = $("#wzxx").val();
var gdzw = $("#RGdzw").val(); var gdzw = $("#RGdzw").val();
var pmzw = $("#RPmzw").val(); var pmzw = $("#RPmzw").val();
...@@ -670,15 +669,15 @@ function saveZlcc(jcjg) { ...@@ -670,15 +669,15 @@ function saveZlcc(jcjg) {
$.messager.alert('提示', "文字信息未检查完成！"); $.messager.alert('提示', "文字信息未检查完成！");
return; return;
} }
if (gdzw.indexOf("0") != -1) { if (gdzw.indexOf("0") != -1 && ccnr.indexOf("2") != -1) {
$.messager.alert('提示', "滚动指纹未检查完成！"); $.messager.alert('提示', "滚动指纹未检查完成！");
return; return;
} }
if (pmzw.indexOf("0") != -1) { if (pmzw.indexOf("0") != -1 && ccnr.indexOf("3") != -1) {
$.messager.alert('提示', "平面指纹未检查完成！"); $.messager.alert('提示', "平面指纹未检查完成！");
return; return;
} }
if (rx.indexOf("0") != -1) { if (rx.indexOf("0") != -1 && ccnr.indexOf("1") != -1) {
$.messager.alert('提示', "人像未检查完成！"); $.messager.alert('提示', "人像未检查完成！");
return; return;
} }
...@@ -686,8 +685,11 @@ function saveZlcc(jcjg) { ...@@ -686,8 +685,11 @@ function saveZlcc(jcjg) {
if (jcjg == "2" || jcjg == "0") { if (jcjg == "2" || jcjg == "0") {
var gdzwjcjg = (gdzw.split("1")).length-1; var gdzwjcjg = (gdzw.split("1")).length-1;
var pmzwjcjg = (pmzw.split("1")).length-1; var pmzwjcjg = (pmzw.split("1")).length-1;
if(pmzwjcjg <= 5|| gdzwjcjg <= 5){ if(gdzwjcjg <= 5 && ccnr.indexOf("2") != -1){
$.messager.alert('提示', "平面指纹或滚动指纹超过五项不合格！请重新提交！"); $.messager.alert('提示', "滚动指纹超过五项不合格！请重新提交！");
flag = false;
}else if(pmzwjcjg <= 5&& ccnr.indexOf("3") != -1){
$.messager.alert('提示', "平面指纹超过五项不合格！请重新提交！");
flag = false; flag = false;
} }
} }
......
src/main/resources/templates/zlcc/rwlist.html
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<input type="hidden" id="rwbh" name="rwbh" th:value="${rwbh}"/> <input type="hidden" id="rwbh" name="rwbh" th:value="${rwbh}"/>
<input type="hidden" id="xxbh" name="xxbh"/> <input type="hidden" id="xxbh" name="xxbh"/>
<input type="hidden" id="ccdw" name="ccdw"/> <input type="hidden" id="ccdw" name="ccdw"/>
<input type="hidden" id="ccnr" name="ccnr"/>
<input type="hidden" id="ccfs" name="ccfs"/> <input type="hidden" id="ccfs" name="ccfs"/>
<input type="hidden" id="ccsjQssjStr" name="ccsjQssjStr"/> <input type="hidden" id="ccsjQssjStr" name="ccsjQssjStr"/>
<input type="hidden" id="ccsjJzsjStr" name="ccsjJzsjStr"/> <input type="hidden" id="ccsjJzsjStr" name="ccsjJzsjStr"/>
...@@ -182,7 +183,8 @@ ...@@ -182,7 +183,8 @@
}else{ }else{
var rstStr = "<a href='javascript:void(0)' onclick='zlcc(\"" + xxbh + "\",\"1\")' class='easyui-linkbutton zdy-btn l-btn l-btn-small'>抽查</a>" + var rstStr = "<a href='javascript:void(0)' onclick='zlcc(\"" + xxbh + "\",\"1\")' class='easyui-linkbutton zdy-btn l-btn l-btn-small'>抽查</a>" +
"<a href='javascript:void(0)' onclick='newDialog(\"" + xxbh + "\")' class='easyui-linkbutton zdy-btn l-btn l-btn-small' >修改</a>" + "<a href='javascript:void(0)' onclick='newDialog(\"" + xxbh + "\")' class='easyui-linkbutton zdy-btn l-btn l-btn-small' >修改</a>" +
"<a href='javascript:void(0)' onclick='deleteRwxx(\"" + xxbh + "\")' class='easyui-linkbutton zdy-btn l-btn l-btn-small' >删除</a>"; "<a href='javascript:void(0)' onclick='deleteRwxx(\"" + xxbh + "\")' class='easyui-linkbutton zdy-btn l-btn l-btn-small' >删除</a>"+
"<a href='javascript:void(0)' onclick='zlcctj(\"" + xxbh + "\",\"" + rwbh + "\",\"false\")' class='easyui-linkbutton zdy-btn l-btn l-btn-small' >质量监控统计</a>";
} }
return rstStr; return rstStr;
}} }}
...@@ -274,7 +276,7 @@ ...@@ -274,7 +276,7 @@
url:'xj', url:'xj',
title:'新建', title:'新建',
width:700, width:700,
height:300, height:400,
cache:false, cache:false,
onClose:function(){ onClose:function(){
...@@ -283,27 +285,31 @@ ...@@ -283,27 +285,31 @@
{ {
//确定生成表头配置信息,并重新加载表格数据 //确定生成表头配置信息,并重新加载表格数据
text:'保存', text:'保存',
handler:function(){ handler:function(){debugger
var ccdw = $('#ccdw').val(); var ccdw = $('#ccdw').val();
var ccsjQssjStr = $('#ccsjQssjStr').val(); var ccsjQssjStr = $('#ccsjQssjStr').val();
var ccsjJzsjStr = $('#ccsjJzsjStr').val(); var ccsjJzsjStr = $('#ccsjJzsjStr').val();
var ccfs = $('#ccfs').val(); var ccfs = $('#ccfs').val();
var ccnr = $('#ccnr').val();
var flag = false; var flag = false;
if(ccdw ==null || ccdw =='' || ccsjQssjStr ==null || ccsjQssjStr ==''||ccsjJzsjStr ==null || ccsjJzsjStr =='' || ccfs ==null || ccfs ==''){ if(ccdw ==null || ccdw =='' || ccsjQssjStr ==null || ccsjQssjStr ==''||ccsjJzsjStr ==null
|| ccsjJzsjStr =='' || ccfs ==null || ccfs ==''|| ccnr ==null || ccnr ==''){
$.messager.alert('提示',"带*号必填项不能为空！") $.messager.alert('提示',"带*号必填项不能为空！")
}else if (ccdw !=null && ccdw !='' && ccsjQssjStr !=null && ccsjQssjStr !=''&&ccsjJzsjStr !=null }else if (ccdw !=null && ccdw !='' && ccsjQssjStr !=null && ccsjQssjStr !=''&&ccsjJzsjStr !=null
&& ccsjJzsjStr !='' && ccfs !=null && ccfs !=''){ && ccsjJzsjStr !='' && ccfs !=null && ccfs !='' && ccnr !=null && ccnr !=''){
flag = true; flag = true;
} }
if(flag) { if(flag) {
$.ajax({ $.ajax({
url: "doAddOrUpdateCcrw?xxbh=" + $('#xxbh').val() + "&ccdw=" + $('#ccdw').val() + "&fccsj=" + $('#ccsjQssjStr').val() + "&eccsj=" + $('#ccsjJzsjStr').val() + "&ccfs=" + $('#ccfs').val(), url: "doAddOrUpdateCcrw?xxbh=" + $('#xxbh').val() + "&ccdw=" + ccdw + "&fccsj=" + ccsjQssjStr
+ "&eccsj=" + ccsjJzsjStr + "&ccfs=" + ccfs+ "&ccnr=" + ccnr,
type: "POST", type: "POST",
success: function (data) { success: function (data) {
$('#ccdw').val(''); $('#ccdw').val('');
$('#ccsjQssjStr').val(''); $('#ccsjQssjStr').val('');
$('#ccsjJzsjStr').val(''); $('#ccsjJzsjStr').val('');
$('#ccfs').val(''); $('#ccfs').val('');
$('#ccnr').val('');
if (data) { if (data) {
$.messager.alert('提示', "任务信息保存成功！"); $.messager.alert('提示', "任务信息保存成功！");
doQuery(); doQuery();
...@@ -330,6 +336,10 @@ ...@@ -330,6 +336,10 @@
window.open("/toZlccList?xxbh="+xxbh+"&flg="+flg+"&rwbh="+rwbh+"&sfdrw="+sfdrw,'_blank'); window.open("/toZlccList?xxbh="+xxbh+"&flg="+flg+"&rwbh="+rwbh+"&sfdrw="+sfdrw,'_blank');
} }
function zlcctj(xxbh,rwbh,drw){
window.open("/toZlcctjList?xxbh="+xxbh+"&rwbh="+rwbh+"&drw="+drw,'_blank');
}
function rwxq(){ function rwxq(){
window.open("rwxq.html"); window.open("rwxq.html");
} }
......
src/main/resources/templates/zlcc/xj.html
...@@ -99,6 +99,19 @@ ...@@ -99,6 +99,19 @@
</span> </span>
</td> </td>
</tr> </tr>
<tr style="line-height: 60px;height: 60px;">
<td class="ar"><font class="red">*</font>抽查内容：</td>
<td colspan="3">
<span id="ccnr" class="textbox" style="border:none;height:60px;width: 100%;">
<input type="checkbox" onclick="checkboxCcnrOnclick(this)" name="ccnr" id="ccnr1" value="1"/><label for="ccnr1" class="label">人像</label>
<input type="checkbox" onclick="checkboxCcnrOnclick(this)" name="ccnr" id="ccnr2" value="2"/><label for="ccnr2" class="label">滚动指纹</label>
<input type="checkbox" onclick="checkboxCcnrOnclick(this)" name="ccnr" id="ccnr3" value="3"/><label for="ccnr3" class="label">平面指纹</label><br>
<input type="checkbox" onclick="checkboxCcnrOnclick(this)" name="ccnr" id="ccnr4" value="4"/><label for="ccnr4" class="label">足迹</label>
<input type="checkbox" onclick="checkboxCcnrOnclick(this)" name="ccnr" id="ccnr5" value="5"/><label for="ccnr5" class="label">虹膜</label>
<input type="checkbox" onclick="checkboxCcnrOnclick(this)" name="ccnr" id="ccnr6" value="6"/><label for="ccnr6" class="label">声纹</label>
</span>
</td>
</tr>
<tr> <tr>
<td class="ar"><font class="red">*</font>抽查份数：</td> <td class="ar"><font class="red">*</font>抽查份数：</td>
<td colspan="3"> <td colspan="3">
...@@ -116,15 +129,26 @@ ...@@ -116,15 +129,26 @@
<script type="text/javascript" src="static/xtba/zlcc/css/datepicker/calendar.js"></script> <script type="text/javascript" src="static/xtba/zlcc/css/datepicker/calendar.js"></script>
<script type="text/javascript"> <script type="text/javascript">
function checkboxOnclick(obj) { function checkboxCcnrOnclick(obj) {
var ccnr = document.getElementsByName("ccnr");
check_val = [];
for (k in ccnr) {
if (ccnr[k].checked)
check_val.push(ccnr[k].value);
}
window.parent.document.getElementById("ccnr").value = check_val;
// alert(obj.value+"------"+check_val);
}
function checkboxOnclick(obj){
var ccdw = document.getElementsByName("ccdw"); var ccdw = document.getElementsByName("ccdw");
check_val = []; check_val = [];
for (k in ccdw) { for(k in ccdw){
if (ccdw[k].checked) if(ccdw[k].checked)
check_val.push(ccdw[k].value); check_val.push(ccdw[k].value);
} }
window.parent.document.getElementById("ccdw").value = check_val; window.parent.document.getElementById("ccdw").value=check_val;
//alert(obj.value+"------"+check_val); // alert(obj.value+"------"+check_val);
} }
function onchangetext(name) { function onchangetext(name) {
...@@ -181,9 +205,19 @@ ...@@ -181,9 +205,19 @@
if (document.getElementById("ccdw" + ccdw[i])) { if (document.getElementById("ccdw" + ccdw[i])) {
document.getElementById("ccdw" + ccdw[i]).checked = true; document.getElementById("ccdw" + ccdw[i]).checked = true;
} else { } else {
alert("该id不存在！"); alert("该单位不存在！");
}
}
var ccnr = data.ccnr.split(",");
for (let i = 0; i < ccnr.length; i++) {
if (document.getElementById("ccnr" + ccnr[i])) {
document.getElementById("ccnr" + ccnr[i]).checked = true;
} else {
alert("该内容不存在！");
} }
} }
window.parent.document.getElementById("ccnr").value = data.ccnr;
window.parent.document.getElementById("ccdw").value = data.ccdw; window.parent.document.getElementById("ccdw").value = data.ccdw;
window.parent.document.getElementById("ccsjQssjStr").value = data.ccsjQssjStr; window.parent.document.getElementById("ccsjQssjStr").value = data.ccsjQssjStr;
window.parent.document.getElementById("ccsjJzsjStr").value = data.ccsjJzsjStr; window.parent.document.getElementById("ccsjJzsjStr").value = data.ccsjJzsjStr;
......
src/main/resources/templates/zlcc/zlcc.html
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
<input type="hidden" id="ccbhstr" name="ccbhstr" th:value="${ccrw.xxbh}"/> <input type="hidden" id="ccbhstr" name="ccbhstr" th:value="${ccrw.xxbh}"/>
<form name="zlccForm"> <form name="zlccForm">
<input type="hidden" id="ccbh" name="ccbh" th:value="${ccrw.xxbh}"/> <input type="hidden" id="ccbh" name="ccbh" th:value="${ccrw.xxbh}"/>
<input type="hidden" id="ccnr" name="ccnr" th:value="${ccrw.ccnr}"/>
<fieldset> <fieldset>
<legend>生成条件</legend> <legend>生成条件</legend>
<table> <table>
...@@ -427,9 +428,9 @@ ...@@ -427,9 +428,9 @@
function openNew(rybh, szzwbh, cjsj) { function openNew(rybh, szzwbh, cjsj) {
var rwbh = $('#rwbh').val(); var rwbh = $('#rwbh').val();
var ccnr = $('#ccnr').val();
// window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank'); // window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank');
// window.open("/toZlcc?rybh=" + rybh + "&szzwbh=" + szzwbh + "&ccbh=" + $("#ccbh").val()+ "&rwbh=" + rwbh, '_blank'); window.open("/toZlcc?rybh=" + rybh + "&szzwbh=" + szzwbh + "&ccbh=" + $("#ccbh").val()+ "&rwbh=" + rwbh+ "&ccnr=" + ccnr, '_blank');
var ccfs = $("#ccfs").val(); var ccfs = $("#ccfs").val();
var jcfs = $("#jcfs").val(); var jcfs = $("#jcfs").val();
if (parseInt(jcfs) >= parseInt(ccfs)) { if (parseInt(jcfs) >= parseInt(ccfs)) {
...@@ -456,7 +457,7 @@ ...@@ -456,7 +457,7 @@
alert("指纹库没有相关人员，请过一会再检查！") alert("指纹库没有相关人员，请过一会再检查！")
} }
} else { } else {
window.open("/toZlcc?rybh=" + rybh + "&szzwbh=" + szzwbh + "&ccbh=" + $("#ccbh").val()+ "&rwbh=" + rwbh, '_blank'); window.open("/toZlcc?rybh=" + rybh + "&szzwbh=" + szzwbh + "&ccbh=" + $("#ccbh").val()+ "&rwbh=" + rwbh+ "&ccnr=" + ccnr, '_blank');
//window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank'); //window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank');
} }
}, },
...@@ -515,7 +516,7 @@ ...@@ -515,7 +516,7 @@
$.messager.alert('提示', "指纹信息待入库，请稍后查看！"); $.messager.alert('提示', "指纹信息待入库，请稍后查看！");
} }
} else { } else {
window.open("/toZlcc?rybh=" + rybh + "&szzwbh=" + szzwbh + "&ifxq=1", '_blank'); window.open("/toZlcc?rybh=" + rybh + "&szzwbh=" + szzwbh + "&ifxq=1" + "&ccnr=" + $('#ccnr').val(), '_blank');
} }
}, },
error: function () { error: function () {
...@@ -552,6 +553,8 @@ ...@@ -552,6 +553,8 @@
wzxxjg +="<span class='bhg-span-c'>输入不完整</span><br>"; wzxxjg +="<span class='bhg-span-c'>输入不完整</span><br>";
} else if ("9" == wz[i]) { } else if ("9" == wz[i]) {
wzxxjg +="<span class='bhg-span-c'>表达不准确</span><br>"; wzxxjg +="<span class='bhg-span-c'>表达不准确</span><br>";
}else if ("2" == wz[i]) {
wzxxjg +="<span class='bhg-span-c'>其它</span><br>";
} }
} }
$("#wzxxjg").html(wzxxjg.substring(0, wzxxjg.lastIndexOf("<br>"))); $("#wzxxjg").html(wzxxjg.substring(0, wzxxjg.lastIndexOf("<br>")));
...@@ -583,6 +586,8 @@ ...@@ -583,6 +586,8 @@
zmrxjg += "<span class='bhg-span-c'>取景过大</span><br>"; zmrxjg += "<span class='bhg-span-c'>取景过大</span><br>";
} else if (zmrx[i] == "7") { } else if (zmrx[i] == "7") {
zmrxjg += "<span class='bhg-span-c'>没有身高标识</span><br>"; zmrxjg += "<span class='bhg-span-c'>没有身高标识</span><br>";
} else if (zmrx[i] == "8") {
zmrxjg += "<span class='bhg-span-c'>其它</span><br>";
} }
} }
// $("#zmrxjg").html("<span class='bhg-span-c'>不合格</span>"); // $("#zmrxjg").html("<span class='bhg-span-c'>不合格</span>");
...@@ -609,6 +614,8 @@ ...@@ -609,6 +614,8 @@
zcmrxjg += "<span class='bhg-span-c'>取景过大</span><br>"; zcmrxjg += "<span class='bhg-span-c'>取景过大</span><br>";
} else if (zcm[i] == "7") { } else if (zcm[i] == "7") {
zcmrxjg += "<span class='bhg-span-c'>没有身高标识</span><br>"; zcmrxjg += "<span class='bhg-span-c'>没有身高标识</span><br>";
}else if (zcm[i] == "8") {
zcmrxjg += "<span class='bhg-span-c'>其它</span><br>";
} }
} }
$("#zcmrxjg").html(zcmrxjg.substring(0, zcmrxjg.lastIndexOf("<br>"))); $("#zcmrxjg").html(zcmrxjg.substring(0, zcmrxjg.lastIndexOf("<br>")));
...@@ -634,6 +641,8 @@ ...@@ -634,6 +641,8 @@
ycmrxjg += "<span class='bhg-span-c'>取景过大</span><br>"; ycmrxjg += "<span class='bhg-span-c'>取景过大</span><br>";
} else if (ycm[i] == "7") { } else if (ycm[i] == "7") {
ycmrxjg += "<span class='bhg-span-c'>没有身高标识</span><br>"; ycmrxjg += "<span class='bhg-span-c'>没有身高标识</span><br>";
}else if (ycm[i] == "8") {
ycmrxjg += "<span class='bhg-span-c'>其它</span><br>";
} }
} }
$("#ycmrxjg").html(ycmrxjg.substring(0, ycmrxjg.lastIndexOf("<br>"))); $("#ycmrxjg").html(ycmrxjg.substring(0, ycmrxjg.lastIndexOf("<br>")));
...@@ -684,6 +693,8 @@ ...@@ -684,6 +693,8 @@
zwStr +="<span class='bhg-span-c'>不清晰</span><br>"; zwStr +="<span class='bhg-span-c'>不清晰</span><br>";
} else if (zw[i] == "5") { } else if (zw[i] == "5") {
zwStr +="<span class='bhg-span-c'>脱皮</span><br>"; zwStr +="<span class='bhg-span-c'>脱皮</span><br>";
}else if (zw[i] == "6") {
zwStr +="<span class='bhg-span-c'>其它</span><br>";
} }
} }
$("#"+name).html(zwStr); $("#"+name).html(zwStr);
......
src/main/resources/templates/zlcc/zlccxq.html
...@@ -303,6 +303,8 @@ ...@@ -303,6 +303,8 @@
rstStr += "<span class='bhg-btn'>输入不完整</span><br>"; rstStr += "<span class='bhg-btn'>输入不完整</span><br>";
}else if (ryxx[i] =="9"){ }else if (ryxx[i] =="9"){
rstStr += "<span class='bhg-btn'>表达不准确</span><br>"; rstStr += "<span class='bhg-btn'>表达不准确</span><br>";
}else if (ryxx[i] =="2"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -328,6 +330,8 @@ ...@@ -328,6 +330,8 @@
rstStr += "<span class='bhg-btn'>取景过大</span><br>"; rstStr += "<span class='bhg-btn'>取景过大</span><br>";
}else if(ycmzp[i] =="7"){ }else if(ycmzp[i] =="7"){
rstStr += "<span class='bhg-btn'>没有身高标识</span><br>"; rstStr += "<span class='bhg-btn'>没有身高标识</span><br>";
}else if(ycmzp[i] =="8"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -353,6 +357,8 @@ ...@@ -353,6 +357,8 @@
rstStr += "<span class='bhg-btn'>取景过大</span><br>"; rstStr += "<span class='bhg-btn'>取景过大</span><br>";
}else if(zmzp[i] =="7"){ }else if(zmzp[i] =="7"){
rstStr += "<span class='bhg-btn'>没有身高标识</span><br>"; rstStr += "<span class='bhg-btn'>没有身高标识</span><br>";
}else if(zmzp[i] =="8"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -378,6 +384,8 @@ ...@@ -378,6 +384,8 @@
rstStr += "<span class='bhg-btn'>取景过大</span><br>"; rstStr += "<span class='bhg-btn'>取景过大</span><br>";
}else if(zcmzp[i] =="7"){ }else if(zcmzp[i] =="7"){
rstStr += "<span class='bhg-btn'>没有身高标识</span><br>"; rstStr += "<span class='bhg-btn'>没有身高标识</span><br>";
}else if(zcmzp[i] =="8"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -399,6 +407,8 @@ ...@@ -399,6 +407,8 @@
rstStr += "<span class='bhg-btn'>不清晰</span><br>"; rstStr += "<span class='bhg-btn'>不清晰</span><br>";
}else if (ymz[i] =="5"){ }else if (ymz[i] =="5"){
rstStr += "<span class='bhg-btn'>脱皮</span><br>"; rstStr += "<span class='bhg-btn'>脱皮</span><br>";
}else if (ymz[i] =="6"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -420,6 +430,8 @@ ...@@ -420,6 +430,8 @@
rstStr += "<span class='bhg-btn'>不清晰</span><br>"; rstStr += "<span class='bhg-btn'>不清晰</span><br>";
}else if (ysz[i] =="5"){ }else if (ysz[i] =="5"){
rstStr += "<span class='bhg-btn'>脱皮</span><br>"; rstStr += "<span class='bhg-btn'>脱皮</span><br>";
}else if (ysz[i] =="6"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -441,6 +453,8 @@ ...@@ -441,6 +453,8 @@
rstStr += "<span class='bhg-btn'>不清晰</span><br>"; rstStr += "<span class='bhg-btn'>不清晰</span><br>";
}else if (yzz[i] =="5"){ }else if (yzz[i] =="5"){
rstStr += "<span class='bhg-btn'>脱皮</span><br>"; rstStr += "<span class='bhg-btn'>脱皮</span><br>";
}else if (yzz[i] =="6"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -462,6 +476,8 @@ ...@@ -462,6 +476,8 @@
rstStr += "<span class='bhg-btn'>不清晰</span><br>"; rstStr += "<span class='bhg-btn'>不清晰</span><br>";
}else if (yhz[i] =="5"){ }else if (yhz[i] =="5"){
rstStr += "<span class='bhg-btn'>脱皮</span><br>"; rstStr += "<span class='bhg-btn'>脱皮</span><br>";
}else if (yhz[i] =="6"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -483,6 +499,8 @@ ...@@ -483,6 +499,8 @@
rstStr += "<span class='bhg-btn'>不清晰</span><br>"; rstStr += "<span class='bhg-btn'>不清晰</span><br>";
}else if (yxz[i] =="5"){ }else if (yxz[i] =="5"){
rstStr += "<span class='bhg-btn'>脱皮</span><br>"; rstStr += "<span class='bhg-btn'>脱皮</span><br>";
}else if (yxz[i] =="6"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -504,6 +522,8 @@ ...@@ -504,6 +522,8 @@
rstStr += "<span class='bhg-btn'>不清晰</span><br>"; rstStr += "<span class='bhg-btn'>不清晰</span><br>";
}else if (zmz[i] =="5"){ }else if (zmz[i] =="5"){
rstStr += "<span class='bhg-btn'>脱皮</span><br>"; rstStr += "<span class='bhg-btn'>脱皮</span><br>";
}else if (zmz[i] =="6"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -525,6 +545,8 @@ ...@@ -525,6 +545,8 @@
rstStr += "<span class='bhg-btn'>不清晰</span><br>"; rstStr += "<span class='bhg-btn'>不清晰</span><br>";
}else if (zsz[i] =="5"){ }else if (zsz[i] =="5"){
rstStr += "<span class='bhg-btn'>脱皮</span><br>"; rstStr += "<span class='bhg-btn'>脱皮</span><br>";
}else if (zsz[i] =="6"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -546,6 +568,8 @@ ...@@ -546,6 +568,8 @@
rstStr += "<span class='bhg-btn'>不清晰</span><br>"; rstStr += "<span class='bhg-btn'>不清晰</span><br>";
}else if (zzz[i] =="5"){ }else if (zzz[i] =="5"){
rstStr += "<span class='bhg-btn'>脱皮</span><br>"; rstStr += "<span class='bhg-btn'>脱皮</span><br>";
}else if (zzz[i] =="6"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -567,6 +591,8 @@ ...@@ -567,6 +591,8 @@
rstStr += "<span class='bhg-btn'>不清晰</span><br>"; rstStr += "<span class='bhg-btn'>不清晰</span><br>";
}else if (zhz[i] =="5"){ }else if (zhz[i] =="5"){
rstStr += "<span class='bhg-btn'>脱皮</span><br>"; rstStr += "<span class='bhg-btn'>脱皮</span><br>";
}else if (zhz[i] =="6"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
...@@ -588,6 +614,8 @@ ...@@ -588,6 +614,8 @@
rstStr += "<span class='bhg-btn'>不清晰</span><br>"; rstStr += "<span class='bhg-btn'>不清晰</span><br>";
}else if (zxz[i] =="5"){ }else if (zxz[i] =="5"){
rstStr += "<span class='bhg-btn'>脱皮</span><br>"; rstStr += "<span class='bhg-btn'>脱皮</span><br>";
}else if (zxz[i] =="6"){
rstStr += "<span class='bhg-btn'>其它</span><br>";
} }
} }
return rstStr.substring(0, rstStr.lastIndexOf("<br>")); return rstStr.substring(0, rstStr.lastIndexOf("<br>"));
......
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