Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit a5a87cd0 authored by dahai's avatar dahai
Browse files
Options

里程碑--项目验收

parents ab263dd8 799c0320
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1461 additions and 215 deletions
src/main/java/com/yxproject/start/api/CardDetailedListApi.java
View file @ a5a87cd0
......@@ -24,11 +24,12 @@ public class CardDetailedListApi {
@Autowired
private CardDetailedListService cardDetailedListService;
Logger logger= Logger.getLogger(CardDetailedListApi.class);
Logger logger = Logger.getLogger(CardDetailedListApi.class);
/**
* 查询身份证详单
*通过身份证号
* 通过身份证号
*
* @param idCard 查询身份证详单
* @return
*/
......@@ -37,9 +38,9 @@ public class CardDetailedListApi {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<DetailReceiptListEntity> list = new ArrayList<DetailReceiptListEntity>();
try{
try {
list = cardDetailedListService.findCardDetailedListByIdCard(idCard);
} catch (Exception e){
} catch (Exception e) {
logger.error("身份证号：" + idCard);
logger.error("Exception 通过身份证号查询身份证详单异常", e);
}
......@@ -49,18 +50,19 @@ public class CardDetailedListApi {
/**
* 查询所有的身份证详单
*通过身份证号
* 通过身份证号
*
* @param idCard 查询身份证详单
* @return
*/
@RequestMapping("findAllCardDetailedList")
public List<Map<String,Object>> findAllCardDetailedList(@RequestParam("idCard") String idCard, HttpServletRequest requ) {
public List<Map<String, Object>> findAllCardDetailedList(@RequestParam("idCard") String idCard, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String,Object>> list = new ArrayList <>();
try{
List<Map<String, Object>> list = new ArrayList<>();
try {
list = cardDetailedListService.findAllCardDetailedListByIdCard(idCard);
} catch (Exception e){
} catch (Exception e) {
logger.error("身份证号：" + idCard);
logger.error("Exception 通过身份证号查询所有的身份证详单异常", e);
}
......@@ -68,5 +70,4 @@ public class CardDetailedListApi {
}
}
src/main/java/com/yxproject/start/api/ExportExcelApi.java
View file @ a5a87cd0
......@@ -32,7 +32,7 @@ public class ExportExcelApi {
@Autowired
private ReceiptService receiptService;
Logger logger= Logger.getLogger(ExportExcelApi.class);
Logger logger = Logger.getLogger(ExportExcelApi.class);
/**
* 导出公安网数据
......@@ -45,7 +45,7 @@ public class ExportExcelApi {
JSONArray jsonArray = JSONArray.fromObject(jsonObject.get("list"));
String isHistory = jsonObject.get("isHistory").toString();
String name = jsonObject.get("name").toString();
List<Map<String, Object>> mapList = detailReceiptListService.selectPostDetails(jsonArray, name,isHistory);
List<Map<String, Object>> mapList = detailReceiptListService.selectPostDetails(jsonArray, name, isHistory);
response.setContentType("application/x-download");
response.setCharacterEncoding("UTF-8");
String dateTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd");
......@@ -71,6 +71,7 @@ public class ExportExcelApi {
}
return null;
}
/**
* 导出交接单
*/
......@@ -83,10 +84,10 @@ public class ExportExcelApi {
String type = null;
Map<String, Object> map = null;
try {
jsonObject=JSONObject.fromObject(list);
type=jsonObject.get("type").toString();
jsonArray=JSONArray.fromObject(jsonObject.get("list"));
map=receiptService.selectReceiptList(jsonArray, Long.valueOf(type));
jsonObject = JSONObject.fromObject(list);
type = jsonObject.get("type").toString();
jsonArray = JSONArray.fromObject(jsonObject.get("list"));
map = receiptService.selectReceiptList(jsonArray, Long.valueOf(type));
// response.setContentType("application/x-download");
// response.setCharacterEncoding("UTF-8");
// String dateTime = DateFormatUtils.format(new Date(), "yyyy_MM_dd");
......@@ -110,7 +111,7 @@ public class ExportExcelApi {
// e.printStackTrace();
// }
// return null;
}catch (Exception e) {
} catch (Exception e) {
e.printStackTrace();
logger.error("异常参数：" + jsonObject);
logger.error("Exception 导出交接单异常", e);
......
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ a5a87cd0
......@@ -42,7 +42,7 @@ public class ExportXMLApi {
@Autowired
private FilesService filesService;
Logger logger= Logger.getLogger(ExportXMLApi.class);
Logger logger = Logger.getLogger(ExportXMLApi.class);
/**
* 导出制证数据包
......
src/main/java/com/yxproject/start/api/FailedCardApi.java
View file @ a5a87cd0
......@@ -35,7 +35,7 @@ public class FailedCardApi {
@Autowired
private TaskListService taskListService;
Logger logger= Logger.getLogger(FailedCardApi.class);
Logger logger = Logger.getLogger(FailedCardApi.class);
/**
* 查询所有废证类型
......@@ -46,10 +46,10 @@ public class FailedCardApi {
public List<FailedCardReasonDicEntity> selectFailedCardDic(HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<FailedCardReasonDicEntity> resultList = new ArrayList <FailedCardReasonDicEntity>();
List<FailedCardReasonDicEntity> resultList = new ArrayList<FailedCardReasonDicEntity>();
try {
resultList = failedCardService.selectFailedCardDic();
}catch (Exception e){
} catch (Exception e) {
logger.error("Exception 查询所有废证类型异常", e);
}
return resultList;
......@@ -70,7 +70,7 @@ public class FailedCardApi {
try {
jsonarray = JSONArray.fromObject(jsonStr);
for (Object o : jsonarray) {
String acceptNo = o.toString().replace("e", "E").replace("g", "G").replace("l","L");
String acceptNo = o.toString().replace("e", "E").replace("g", "G").replace("l", "L");
Map<String, Object> resultMap = failedCardService.selectInfoByCardId(acceptNo);
if (resultMap == null) {
resultMap = new LinkedHashMap<>();
......@@ -80,7 +80,7 @@ public class FailedCardApi {
}
resultList.add(resultMap);
}
}catch (Exception e){
} catch (Exception e) {
logger.error("身份证号或受理号：" + jsonarray);
logger.error("Exception 根据身份证号或受理号查询身份信息及组号异常", e);
}
......@@ -89,6 +89,7 @@ public class FailedCardApi {
/**
* 查询提交人上传的废证详情
*
* @param date 提交日期
* @param name 提交人姓名
* @param startDate 提交起始日期
......@@ -97,16 +98,17 @@ public class FailedCardApi {
* @return
*/
@RequestMapping("queryFailedCardInfo")
public List<Map<String, Object>> queryFailedCardInfo(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate, @RequestParam("name") String name, HttpServletRequest requ) {
public List<Map<String, Object>> queryFailedCardInfo(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("name") String name, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> failedCardEntities = new ArrayList <>();
failedCardEntities = failedCardService.selectFailedCardInfo(replaceDate(startDate),replaceDate(endDate), replaceNullString(name));
List<Map<String, Object>> failedCardEntities = new ArrayList<>();
failedCardEntities = failedCardService.selectFailedCardInfo(replaceDate(startDate), replaceDate(endDate), replaceNullString(name));
return failedCardEntities;
}
/**
* 删除提交人上传的废证详情
*
* @param failedCardId 废证ID
* @return
*/
......@@ -117,7 +119,7 @@ public class FailedCardApi {
boolean failedCardInfo = true;
try {
failedCardInfo = failedCardService.deleteFailedCardInfo(failedCardId);
}catch (Exception e){
} catch (Exception e) {
logger.error("废证ID：" + failedCardId);
logger.error("Exception 删除提交人上传的废证详情异常", e);
}
......@@ -137,7 +139,7 @@ public class FailedCardApi {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
JSONArray jsonarray = new JSONArray();
try{
try {
jsonarray = JSONArray.fromObject(jsonStr);
for (Object o : jsonarray) {
JSONObject jsonObject = (JSONObject) o;
......@@ -154,7 +156,7 @@ public class FailedCardApi {
int initiator = 5;
failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"), idMap.get("WORK_GROUP").toString(), name);
}
}catch (Exception e){
} catch (Exception e) {
logger.error("身份证号或受理号：" + jsonarray);
logger.error("Exception 添加废证异常", e);
}
......@@ -209,7 +211,7 @@ public class FailedCardApi {
specialCardEntity.setGroupNo(acceptNo.substring(0, 8));
failedCardService.addSpecialCard(specialCardEntity);
}
}catch (Exception e){
} catch (Exception e) {
logger.error("身份证号或受理号：" + jsonObject);
logger.error("Exception 生成余证异常", e);
}
......@@ -225,10 +227,10 @@ public class FailedCardApi {
public List<String> selectCardType(HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<String> result = new ArrayList <>();
List<String> result = new ArrayList<>();
try {
result = failedCardService.selectCardType();
}catch (Exception e){
} catch (Exception e) {
logger.error("Exception 查询所有证件类型异常", e);
}
return result;
......@@ -285,6 +287,7 @@ public class FailedCardApi {
}
return true;
}
/**
* 去除字符串中中线
*
......@@ -292,17 +295,19 @@ public class FailedCardApi {
* @return
*/
private String replaceDate(String str) {
return str.replace("-", "").replace(" ","").replace(":","");
return str.replace("-", "").replace(" ", "").replace(":", "");
}
/**
* 格式化受理组号
*
* @param acceptNo
* @return
*/
private String formateAcceptNo(String acceptNo){
return acceptNo.replace("e", "E").replace("g", "G").replace("l","L");
private String formateAcceptNo(String acceptNo) {
return acceptNo.replace("e", "E").replace("g", "G").replace("l", "L");
}
/**
* 字符串去除空格
*
......
src/main/java/com/yxproject/start/api/FilesAnalysisApi.java
View file @ a5a87cd0
......@@ -16,21 +16,22 @@ public class FilesAnalysisApi {
@Autowired
private PersonPostService personPostService;
Logger logger= Logger.getLogger(FilesAnalysisApi.class);
Logger logger = Logger.getLogger(FilesAnalysisApi.class);
/**
* 文件解析 修改解析状态
*
* @param fileId
* @param creatTime
* @return
*/
@RequestMapping("anailsis")
public boolean filesAnailsis(@RequestParam(value = "fileId") String fileId,@RequestParam(value = "creatTime") String creatTime, HttpServletRequest requ) {
public boolean filesAnailsis(@RequestParam(value = "fileId") String fileId, @RequestParam(value = "creatTime") String creatTime, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
try {
personPostService.updateIsPost(fileId,creatTime);
}catch (Exception e){
personPostService.updateIsPost(fileId, creatTime);
} catch (Exception e) {
logger.error("文件ID：" + fileId + "生成时间：" + creatTime);
logger.error("Exception 文件解析 修改解析状态异常", e);
}
......
src/main/java/com/yxproject/start/api/GreenPackageInformationApi.java
View file @ a5a87cd0
......@@ -21,24 +21,26 @@ public class GreenPackageInformationApi {
/**
* 查询提交的绿包信息表
*
* @param startDate 起始时间
* @param endDate 截至时间
* @param name 查询人姓名
* @return
*/
@RequestMapping("queryGreenPackageInformationFile")
public List<GreenPackageInformationFileEntity> queryGreenPackageInformationFileEntity(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("name") String name ){
public List<GreenPackageInformationFileEntity> queryGreenPackageInformationFileEntity(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("name") String name) {
List<GreenPackageInformationFileEntity> greenPackageInformationFileEntities = greenPackageInformationService.selectGreenPackageInformationFileEntity(replaceDate(startDate), replaceDate(endDate), replaceNullString(name));
return greenPackageInformationFileEntities;
}
/**
* 删除提交的绿包信息表
*
* @param id 流水号
* @return
*/
@RequestMapping("deleteGreenPackageInformationFile")
public boolean deleteGreenPackageInformationFileEntity(@RequestParam("id") String id ){
public boolean deleteGreenPackageInformationFileEntity(@RequestParam("id") String id) {
boolean b = greenPackageInformationService.deleteGreenPackageInformationFileEntity(id);
return b;
}
......
src/main/java/com/yxproject/start/api/InfoManagementApi.java
View file @ a5a87cd0
......@@ -21,10 +21,11 @@ public class InfoManagementApi {
@Autowired
private InfoManagementService infoManagementService;
Logger logger= Logger.getLogger(InfoManagementApi.class);
Logger logger = Logger.getLogger(InfoManagementApi.class);
/**
* 按条件查询制证信息数据
*
* @param beginFileName
* @param endFileName
* @param gajgMc
......@@ -35,13 +36,13 @@ public class InfoManagementApi {
* @return
*/
@RequestMapping("selectInfoManagement")
public List<NewFilesEntity>selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize, HttpServletRequest requ) {
public List<NewFilesEntity> selectInfoManagement(@Param("beginFileName") String beginFileName, @Param("endFileName") String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate") String beginDate, @Param("endDate") String endDate, @RequestParam("currPage") String currPage, @RequestParam("pageSize") String pageSize, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<NewFilesEntity> resultList = new ArrayList<NewFilesEntity>();
try {
infoManagementService.selectInfoManagement(beginFileName, endFileName, gajgMc, replaceDate(beginDate), replaceDate(endDate), Long.valueOf(currPage),Long.valueOf(pageSize));
}catch (Exception e){
infoManagementService.selectInfoManagement(beginFileName, endFileName, gajgMc, replaceDate(beginDate), replaceDate(endDate), Long.valueOf(currPage), Long.valueOf(pageSize));
} catch (Exception e) {
logger.error("起始文件名：" + beginFileName + "截止文件名：" + endFileName + "公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate + "页数：" + currPage + "行数：" + pageSize);
logger.error("Exception 按条件查询制证信息数据异常", e);
}
......@@ -51,6 +52,7 @@ public class InfoManagementApi {
/**
* 查询制证信息数据条数
*
* @param beginFileId 开始包号
* @param endFileId 结束包号
* @param gajgMc 派出所代码
......@@ -59,14 +61,14 @@ public class InfoManagementApi {
* @return
*/
@RequestMapping("selectCount")
public long selectCount(@Param("beginFileId")String beginFileId, @Param("endFileId")String endFileId, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, HttpServletRequest requ) {
public long selectCount(@Param("beginFileId") String beginFileId, @Param("endFileId") String endFileId, @Param("gajgMc") String gajgMc, @Param("beginDate") String beginDate, @Param("endDate") String endDate, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
long count= 0;
long count = 0;
try {
count = infoManagementService.count(beginFileId,endFileId,gajgMc,replaceDate(beginDate),replaceDate(endDate));
}catch (Exception e){
logger.error( "公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate);
count = infoManagementService.count(beginFileId, endFileId, gajgMc, replaceDate(beginDate), replaceDate(endDate));
} catch (Exception e) {
logger.error("公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate);
logger.error("Exception 查询制证信息数据条数异常", e);
}
return count;
......@@ -74,6 +76,7 @@ public class InfoManagementApi {
/**
* 删除制证信息数据
*
* @param beginFileName
* @param endFileName
* @param gajgMc
......@@ -83,15 +86,15 @@ public class InfoManagementApi {
*/
@RequestMapping("deleteInfo")
@Transactional(rollbackFor = Exception.class)
public boolean deleteInfo(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, HttpServletRequest requ) {
public boolean deleteInfo(@Param("beginFileName") String beginFileName, @Param("endFileName") String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate") String beginDate, @Param("endDate") String endDate, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
boolean result = true;
try {
result = infoManagementService.deleteInfo(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate));
result = infoManagementService.deleteInfo(beginFileName, endFileName, gajgMc, replaceDate(beginDate), replaceDate(endDate));
//更改新文件状态
infoManagementService.updatePackageNo(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate));
}catch (Exception e){
infoManagementService.updatePackageNo(beginFileName, endFileName, gajgMc, replaceDate(beginDate), replaceDate(endDate));
} catch (Exception e) {
logger.error("起始文件名：" + beginFileName + "截止文件名：" + endFileName + "公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate);
logger.error("Exception 删除制证信息数据异常", e);
}
......@@ -105,7 +108,7 @@ public class InfoManagementApi {
* @return
*/
private String replaceDate(String str) {
return str.replace("-", "").replace(" ","").replace(":","");
return str.replace("-", "").replace(" ", "").replace(":", "");
}
}
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ a5a87cd0
......@@ -72,6 +72,7 @@ public class ReceiptApi {
}
receiptListEntity.setFinishCount(Long.valueOf(resultDate.get("VALID_COUNT").toString()));
receiptListEntity.setQrCode(resultDate.get("ACCEPT_NO").toString());
map.put("qrCode",resultDate.get("ACCEPT_NO").toString());
receiptListEntity.setState((long) 0);
receiptListEntity.setCheckName(name);
//生成特证交接单
......@@ -89,6 +90,8 @@ public class ReceiptApi {
receiptService.createDetailedList(uploadNo, acceptNo2, name2, id, gajg_dm, receiptId, sex, signGovt);
map.put("show",true);
map.put("state",1);
map.put("count",1);
map.put("policeName",receiptService.selectPoliceName(gajg_dm));
map.put("msg","生成交接单");
map.put("id",S);
}catch (Exception e){
......@@ -102,8 +105,11 @@ public class ReceiptApi {
map.put("show",false);
map.put("state",2);
map.put("msg","已生成交接单");
List<Map<String, Object>> list = receiptService.selectQrCodeByCardID( id, beginDate, expireDate);
map.put("qrCode",(list.size()>0?list.get(0).get("QR_CODE"):null));
map.put("id",mapList.get(0).get("ID"));
map.put("checkName",mapList.get(0).get("CHECK_NAME"));
map.put("count",1);
map.put("policeName",mapList.get(0).get("GAJG_MC"));
}catch (Exception e){
logger.error("证件ID：" + id + "生成人姓名：" + name + "起始有效期：" + beginDate + "截止有效期" + expireDate);
......@@ -135,6 +141,7 @@ public class ReceiptApi {
}
receiptListEntity.setFinishCount((long) receiptListDate.size());
receiptListEntity.setQrCode(receiptListDate.get(i).get("GROUP_NO").toString());
map.put("qrCode",receiptListDate.get(i).get("GROUP_NO").toString());
// 状态0未复核
receiptListEntity.setState((long) 0);
receiptListEntity.setCheckName(name);
......@@ -149,7 +156,6 @@ public class ReceiptApi {
//查询这个受理号是否生成了详单
int receiptCount = receiptService.selectReceiptByAcceptNo(receiptListDate.get(n).get("ACCEPT_NO").toString());
//没有生成交接单详单
if (receiptCount == 0) {
Map<String, Object> detailedData = receiptService.selectDetailedData(receiptListDate.get(n).get("ACCEPT_NO").toString());
String uploadNo = (String) detailedData.get("UPLOAD_NO");
String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
......@@ -157,15 +163,21 @@ public class ReceiptApi {
String sex = (String) detailedData.get("SEX_NO");
String signGovt = (String) detailedData.get("SIGN_GOVT");
String gajg_dm = (String) detailedData.get("GAJG_DM");
map.put("policeName",receiptService.selectPoliceName(gajg_dm));
if (receiptCount == 0) {
int receiptId = Integer.parseInt((BigDecimal) detailedData.get("ID") + "");
//生成详单
receiptService.createDetailedList(uploadNo, acceptNo2, name2, receiptListDate.get(n).get("ID_NO").toString(), gajg_dm, receiptId, sex, signGovt);
} else {
//不做操作
}
}
map.put("show",true);
map.put("state",1);
map.put("count",receiptListDate.size());
map.put("id",receiptList);
}catch (Exception e){
logger.error("证件ID：" + id + "生成人姓名：" + name + "起始有效期：" + beginDate + "截止有效期" + expireDate);
......@@ -179,6 +191,9 @@ public class ReceiptApi {
map.put("msg","已生成交接单");
map.put("state",2);
map.put("id",mapList.get(0).get("ID"));
List<Map<String, Object>> list = receiptService.selectQrCodeByCardID(id, beginDate, expireDate);
map.put("qrCode",(list.size()>0?list.get(0).get("QR_CODE"):null));
map.put("count",receiptListDate.size());
map.put("checkName",mapList.get(0).get("CHECK_NAME"));
map.put("policeName",mapList.get(0).get("GAJG_MC"));
}catch (Exception e){
......@@ -356,7 +371,7 @@ public class ReceiptApi {
jsonArray = JSONArray.fromObject(jsonStr);
for (int i = 0; i < jsonArray.size(); i++) {
Map<String, Object> resultMap = (Map<String, Object>) jsonArray.get(i);
receiptService.updateDetail(formateAcceptNo(resultMap.get("acceptNo").toString()), resultMap.get("note").toString());
receiptService.updateDetail(formateAcceptNo(resultMap.get("acceptNo").toString()), resultMap.get("note").toString(), resultMap.get("name").toString());
}
}catch (Exception e) {
logger.error("备注信息：" + jsonStr );
......@@ -365,6 +380,17 @@ public class ReceiptApi {
return true;
}
/**
* 查询提前领取登记记录
*
* @return
*/
@RequestMapping("queryDetailNote")
public List<DetailReceiptListEntity> queryDetailNote(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate,@RequestParam("name") String name) {
List<DetailReceiptListEntity> detailReceiptListEntityList = receiptService.selectDetailNote(replaceDate(startDate), replaceDate(endDate), replaceNullString(name));
return detailReceiptListEntityList;
}
/**
* 生成交接单
......@@ -429,7 +455,7 @@ public class ReceiptApi {
/**
* 查询分局名称
*
* @param qrCode 派出所代码
* @param policeCode 派出所代码
* @return
*/
@RequestMapping("queryPoliceName")
......@@ -445,9 +471,7 @@ public class ReceiptApi {
}
return policeName;
}
public List<Map<String, Object>> queryPoliceName(@RequestParam("qrCode") String qrCode) {
return receiptService.queryPoliceName(qrCode);
}
/**
* 查询公安网数据
......
src/main/java/com/yxproject/start/api/ReportApi.java
View file @ a5a87cd0
......@@ -30,23 +30,24 @@ public class ReportApi {
@Autowired
private ReceiptService receiptService;
Logger logger= Logger.getLogger(ReportApi.class);
Logger logger = Logger.getLogger(ReportApi.class);
/**
* 查询报表
* 数据核验
*
* @param startDate 开始时间
* @param endDate 结束时间
* @return
*/
@RequestMapping("queryDataAuditingReport")
public List<Map<String, Object>> queryDataAuditingReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate,@RequestParam(value = "policeName") String policeName,@RequestParam(value = "policeCode") String policeCode, HttpServletRequest requ) {
public List<Map<String, Object>> queryDataAuditingReport(@RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "policeName") String policeName, @RequestParam(value = "policeCode") String policeCode, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>();
List<Map<String, Object>> mapList = new ArrayList<>();
try {
mapList = dataAuditingService.selectDataAuditingReport(replaceDate(startDate), replaceDate(endDate),policeName,policeCode);
}catch (Exception e){
mapList = dataAuditingService.selectDataAuditingReport(replaceDate(startDate), replaceDate(endDate), policeName, policeCode);
} catch (Exception e) {
logger.error("开始时间：" + startDate + "结束时间：" + endDate + "公安机关名称：" + policeName + "公安机关代码：" + policeCode);
logger.error("Exception 查询数据核验报表异常", e);
}
......@@ -56,18 +57,19 @@ public class ReportApi {
/**
* 查询报表
* 膜打印
*
* @param startDate 开始时间
* @param endDate 结束时间
* @return
*/
@RequestMapping("queryFilmPrintReport")
public List<Map<String, Object>> queryFilmPrintReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate, HttpServletRequest requ) {
public List<Map<String, Object>> queryFilmPrintReport(@RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>();
List<Map<String, Object>> mapList = new ArrayList<>();
try {
mapList = taskListService.selectFilmReport(replaceDate(startDate), replaceDate(endDate));
}catch (Exception e){
} catch (Exception e) {
logger.error("开始时间：" + startDate + "结束时间：" + endDate);
logger.error("Exception 查询膜打印报表异常", e);
}
......@@ -77,19 +79,20 @@ public class ReportApi {
/**
* 查询报表
* 工作组
*
* @param startDate 开始时间
* @param endDate 结束时间
* @param workGroup 工作组
* @return
*/
@RequestMapping("queryWorkGroupReport")
public List<Map<String,Object>> queryWorkGroupReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate,@RequestParam(value = "workGroup") String workGroup, HttpServletRequest requ) {
public List<Map<String, Object>> queryWorkGroupReport(@RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "workGroup") String workGroup, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>();
List<Map<String, Object>> mapList = new ArrayList<>();
try {
mapList = taskListService.selectWorkGroupReport(replaceDate(startDate), replaceDate(endDate), workGroup);
}catch (Exception e){
} catch (Exception e) {
logger.error("开始时间：" + startDate + "结束时间：" + endDate + "工作组：" + workGroup);
logger.error("Exception 查询工作组报表异常", e);
}
......@@ -99,19 +102,20 @@ public class ReportApi {
/**
* 查询报表
* 分拣
*
* @param startDate 开始时间
* @param endDate 结束时间
* @param name 分拣人员
* @return
*/
@RequestMapping("querySortingReport")
public List<Map<String, Object>> querySortingReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate,@RequestParam(value = "name") String name, HttpServletRequest requ) {
public List<Map<String, Object>> querySortingReport(@RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "name") String name, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>();
List<Map<String, Object>> mapList = new ArrayList<>();
try {
mapList = receiptService.selectReceiptReport(replaceDate(startDate), replaceDate(endDate), name);
}catch (Exception e){
} catch (Exception e) {
logger.error("开始时间：" + startDate + "结束时间：" + endDate + "分拣人员：" + name);
logger.error("Exception 查询分拣报表异常", e);
}
......@@ -121,18 +125,19 @@ public class ReportApi {
/**
* 查询报表
* 质检 仓库
*
* @param startDate 开始时间
* @param endDate 结束时间
* @return
*/
@RequestMapping("queryQualityCheckReport")
public List<Map<String, Object>> queryQualityCheckReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate, HttpServletRequest requ) {
public List<Map<String, Object>> queryQualityCheckReport(@RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>();
List<Map<String, Object>> mapList = new ArrayList<>();
try {
mapList = taskListService.selectQualityCheckReport(replaceDate(startDate), replaceDate(endDate));
}catch (Exception e){
} catch (Exception e) {
logger.error("开始时间：" + startDate + "结束时间：" + endDate);
logger.error("Exception 查询质检（仓库）报表异常", e);
}
......@@ -146,7 +151,7 @@ public class ReportApi {
* @return
*/
private String replaceDate(String str) {
return str.replace("-", "").replace(" ","").replace(":","");
return str.replace("-", "").replace(" ", "").replace(":", "");
}
......
src/main/java/com/yxproject/start/api/SelectApi.java
View file @ a5a87cd0
......@@ -26,7 +26,7 @@ public class SelectApi {
@Autowired
private SelectSerialNumberService selectSerialNumberService;
Logger logger= Logger.getLogger(SelectApi.class);
Logger logger = Logger.getLogger(SelectApi.class);
@RequestMapping(value = "selectByCard")
public Map<String, Object> selectByCard(@RequestParam("id") String id, HttpServletRequest requ) {
......@@ -70,7 +70,7 @@ public class SelectApi {
} else {
// return null;
}
}catch (Exception e){
} catch (Exception e) {
logger.error("传入的组号8位、受理号10位、身份证号18位、任务单号11位" + id);
logger.error("Exception SelectApi异常", e);
}
......@@ -79,11 +79,12 @@ public class SelectApi {
/**
* 格式化受理组号
*
* @param acceptNo
* @return
*/
private String formateAcceptNo(String acceptNo){
return acceptNo.replace("e", "E").replace("g", "G").replace("l","L");
private String formateAcceptNo(String acceptNo) {
return acceptNo.replace("e", "E").replace("g", "G").replace("l", "L");
}
}
src/main/java/com/yxproject/start/api/SpecialCardApi.java
View file @ a5a87cd0
......@@ -23,10 +23,11 @@ public class SpecialCardApi {
@Autowired
private SpecialCardService specialCardService;
Logger logger= Logger.getLogger(SpecialCardApi.class);
Logger logger = Logger.getLogger(SpecialCardApi.class);
/**
* 查询特殊证件详情
*
* @param groupNo 组号
* @return
*/
......@@ -37,8 +38,8 @@ public class SpecialCardApi {
List<Map> map = new ArrayList<>();
try {
map = specialCardService.selectSpecialCardByGroupNo(groupNo);
}catch (Exception e){
logger.error("组号：" + groupNo );
} catch (Exception e) {
logger.error("组号：" + groupNo);
logger.error("Exception 查询特殊证件详情异常", e);
}
return map;
......
src/main/java/com/yxproject/start/api/UpdateStateApi.java
View file @ a5a87cd0
......@@ -15,15 +15,15 @@ import javax.servlet.http.HttpServletRequest;
public class UpdateStateApi {
@Autowired
PreproPersonService preproPersonService;
Logger logger= Logger.getLogger(UpdateStateApi.class);
Logger logger = Logger.getLogger(UpdateStateApi.class);
@RequestMapping("updateState")
public boolean updateState(@RequestParam(value = "state") String state,@RequestParam(value = "acceptNo") String acceptNo, HttpServletRequest requ) {
public boolean updateState(@RequestParam(value = "state") String state, @RequestParam(value = "acceptNo") String acceptNo, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
try {
preproPersonService.uploadState(state,acceptNo);
}catch (Exception e){
preproPersonService.uploadState(state, acceptNo);
} catch (Exception e) {
logger.error("状态(是否打包)：" + state + "受理号：" + acceptNo);
logger.error("Exception updateState异常", e);
}
......
src/main/java/com/yxproject/start/api/UserApi.java
View file @ a5a87cd0
......@@ -25,7 +25,7 @@ import java.util.Map;
@RequestMapping("user")
public class UserApi {
Logger logger= Logger.getLogger(UserApi.class);
Logger logger = Logger.getLogger(UserApi.class);
@PostMapping("login")
public Map<String, Object> submitLogin(@RequestBody String jsonStr, HttpServletRequest requ) {
......@@ -64,7 +64,7 @@ public class UserApi {
}
@RequestMapping("logout")
public void logout( HttpServletRequest requ) {
public void logout(HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
try {
......@@ -72,7 +72,7 @@ public class UserApi {
if (subject.isAuthenticated()) {
subject.logout();
}
}catch (Exception e){
} catch (Exception e) {
logger.error("Exception 用户登出异常", e);
}
}
......
src/main/java/com/yxproject/start/api/UtilApi.java 0 → 100644
View file @ a5a87cd0
package com.yxproject.start.api;
import com.yxproject.start.service.UtilService;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
/**
* Created by Administrator on 2019/6/18.
*/
@RestController
@RequestMapping("UtilApi")
public class UtilApi {
@Autowired
UtilService utilService;
Logger logger= Logger.getLogger(UtilApi.class);
/**
* 更新受理库导入时间
* @return
*/
@RequestMapping("updateImportTime")
public boolean updateImportTime(HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
try {
utilService.updateImportTime();
}catch (Exception e){
logger.error("Exception 更新受理库导入时间异常", e);
}
return true;
}
/**
* 更新受理库处理标志
* @return
*/
@RequestMapping("updateDealFlag")
public boolean updateDealFlag(@RequestParam("dealFlag") String dealFlag, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
try {
utilService.updateDealFlag(dealFlag);
}catch (Exception e){
logger.error("处理标志：" + dealFlag);
logger.error("Exception 更新受理库处理标志异常", e);
}
return true;
}
}
src/main/java/com/yxproject/start/api/queryPreproPerson.java
View file @ a5a87cd0
......@@ -25,42 +25,42 @@ public class queryPreproPerson {
@Autowired
private PreproPersonService preproPersonService;
Logger logger= Logger.getLogger(queryPreproPerson.class);
Logger logger = Logger.getLogger(queryPreproPerson.class);
/**
* 查询制证数据
*/
@RequestMapping("queryPreproPerson")
// @RequiresPermissions("userInfo.add")//权限管理;
public Map<String,Object> printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state,@RequestParam("uploadDate")String uploadDate,@RequestParam("currPage")String currPage,@RequestParam("pageSize")String pageSize,@RequestParam("downloadState")String downloadState, HttpServletResponse response, HttpServletRequest requ) {
public Map<String, Object> printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard") String IDCard, @RequestParam("oldFile") String oldFile, @RequestParam("newFile") String newFile, @RequestParam("SSXQDM") String SSXQDM, @RequestParam("cardType") String cardType, @RequestParam("state") String state, @RequestParam("uploadDate") String uploadDate, @RequestParam("currPage") String currPage, @RequestParam("pageSize") String pageSize, @RequestParam("downloadState") String downloadState, HttpServletResponse response, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map<String,Object> map = null;
Map<String, Object> map = null;
try {
map = new LinkedHashMap<>();
List<Map<String, Object>> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),currPage,pageSize,downloadState);
List<Map<String, Object>> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate), currPage, pageSize, downloadState);
//todo
List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),downloadState);
map.put("total",preproPersonEntityList.size());
int youSum =0;
int puSum=0;
List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate), downloadState);
map.put("total", preproPersonEntityList.size());
int youSum = 0;
int puSum = 0;
int invaildCount = 0;
for (Map<String, Object> map1 :preproPersonEntityList){
if ("9".equals(map1.get("CARD_TYPE_ID")+"")){
for (Map<String, Object> map1 : preproPersonEntityList) {
if ("9".equals(map1.get("CARD_TYPE_ID") + "")) {
youSum++;
}else if ("0".equals(map1.get("CARD_TYPE_ID")+"")){
} else if ("0".equals(map1.get("CARD_TYPE_ID") + "")) {
puSum++;
}
if ("0".equals(map1.get("IS_VALID")+"")){
if ("0".equals(map1.get("IS_VALID") + "")) {
invaildCount++;
}
}
map.put("list",preproPersonEntities);
map.put("youSum",youSum);
map.put("puSum",puSum);
map.put("invaildCount",invaildCount);
}catch (Exception e){
logger.error("oldFile：" + uploadNo + "公民身份号码：" + IDCard+ "包号：" + oldFile+ "文件名：" + newFile+ "签发机关：" + SSXQDM+ "制证类型代码（9邮寄0大批）：" + cardType + "是否有效（1有效，0无效）：" + state + "上传时间：" + uploadDate+ "页数：" + currPage+ "条数：" + pageSize+ "生成时间：" + downloadState);
map.put("list", preproPersonEntities);
map.put("youSum", youSum);
map.put("puSum", puSum);
map.put("invaildCount", invaildCount);
} catch (Exception e) {
logger.error("oldFile：" + uploadNo + "公民身份号码：" + IDCard + "包号：" + oldFile + "文件名：" + newFile + "签发机关：" + SSXQDM + "制证类型代码（9邮寄0大批）：" + cardType + "是否有效（1有效，0无效）：" + state + "上传时间：" + uploadDate + "页数：" + currPage + "条数：" + pageSize + "生成时间：" + downloadState);
logger.error("Exception 查询制证数据异常", e);
}
return map;
......@@ -71,19 +71,19 @@ public class queryPreproPerson {
*/
@RequestMapping("updatePreproPerson")
// @RequiresPermissions("userInfo.add")//权限管理;
public Map<String,Object> updatePreproPerson(@RequestParam("id") String id, @RequestParam("isValid")String isValid, HttpServletResponse response, HttpServletRequest requ) {
public Map<String, Object> updatePreproPerson(@RequestParam("id") String id, @RequestParam("isValid") String isValid, HttpServletResponse response, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map<String,Object> map = null;
Map<String, Object> map = null;
try {
PreproPersonEntity preproPersonEntity = new PreproPersonEntity();
preproPersonEntity.setId(Long.valueOf(id));
preproPersonEntity.setIsValid(Long.valueOf(isValid));
preproPersonService.updatePreproPersonIsValid(preproPersonEntity);
map = new LinkedHashMap<>();
map.put("msg","成功更新制证数据是否有效");
} catch (Exception e){
logger.error("制证信息ID：" + id + "是否有效（1有效，0无效）：" + isValid );
map.put("msg", "成功更新制证数据是否有效");
} catch (Exception e) {
logger.error("制证信息ID：" + id + "是否有效（1有效，0无效）：" + isValid);
logger.error("Exception 更新制证数据是否有效异常", e);
}
return map;
......@@ -94,17 +94,17 @@ public class queryPreproPerson {
*/
@RequestMapping("queryPreproPersonCount")
// @RequiresPermissions("userInfo.add")//权限管理;
public Map<String,Object> queryPreproPersonCount(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state,@RequestParam("uploadDate")String uploadDate,@RequestParam("downloadState")String downloadState, HttpServletResponse response, HttpServletRequest requ) {
public Map<String, Object> queryPreproPersonCount(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard") String IDCard, @RequestParam("oldFile") String oldFile, @RequestParam("newFile") String newFile, @RequestParam("SSXQDM") String SSXQDM, @RequestParam("cardType") String cardType, @RequestParam("state") String state, @RequestParam("uploadDate") String uploadDate, @RequestParam("downloadState") String downloadState, HttpServletResponse response, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map<String,Object> map = null;
Map<String, Object> map = null;
try {
map = new LinkedHashMap<>();
//todo
List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),downloadState);
map.put("total",preproPersonEntityList.size());
}catch (Exception e){
logger.error("oldFile：" + uploadNo + "公民身份号码：" + IDCard+ "包号：" + oldFile+ "文件名：" + newFile+ "签发机关：" + SSXQDM+ "制证类型代码（9邮寄0大批）：" + cardType + "是否有效（1有效，0无效）：" + state + "上传时间：" + uploadDate+ "页数：" + "生成时间：" + downloadState);
List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate), downloadState);
map.put("total", preproPersonEntityList.size());
} catch (Exception e) {
logger.error("oldFile：" + uploadNo + "公民身份号码：" + IDCard + "包号：" + oldFile + "文件名：" + newFile + "签发机关：" + SSXQDM + "制证类型代码（9邮寄0大批）：" + cardType + "是否有效（1有效，0无效）：" + state + "上传时间：" + uploadDate + "页数：" + "生成时间：" + downloadState);
logger.error("Exception 查询制证数据总数异常", e);
}
return map;
......@@ -117,7 +117,7 @@ public class queryPreproPerson {
* @return
*/
private String replaceDate(String str) {
return str.replace("-", "").replace(" ","").replace(":","");
return str.replace("-", "").replace(" ", "").replace(":", "");
}
......
src/main/java/com/yxproject/start/mapper/CardDetailedListMapper.java
View file @ a5a87cd0
......@@ -21,22 +21,22 @@ public interface CardDetailedListMapper {
* 生成身份证详单
*/
@Insert("INSERT INTO DETAIL_RECEIPT_LIST (UPLOAD_NO,POLICE_CODE,CARD_ID,NAME)VALUES(#{uploadNo},#{policeCode},#{cardId},#{name})")
public boolean saveCardDetailedList(@Param("uploadNo")String uploadNo,@Param("policeCode")String policeCode,@Param("cardId")String cardId,@Param("name")String name);
public boolean saveCardDetailedList(@Param("uploadNo") String uploadNo, @Param("policeCode") String policeCode, @Param("cardId") String cardId, @Param("name") String name);
/**
*查询详单数据
* 查询详单数据
*/
@Select("select * from DETAIL_RECEIPT_LIST where CARD_ID = #{idCard}")
public List<DetailReceiptListEntity> findCardDetailedListByIdCard(@Param("idCard")String idCard);
public List<DetailReceiptListEntity> findCardDetailedListByIdCard(@Param("idCard") String idCard);
/**
*查询详单数据
* 查询详单数据
*/
@Select("select DETAIL_RECEIPT_LIST.*,RECEIPT_LIST.state,PROD_TRACE_T.DOWNLOAD_DATE,PROD_TRACE_T.ELECTRIC_WRITE_DATE,PROD_TRACE_T.CHECK_DATE from DETAIL_RECEIPT_LIST \n" +
"left join PROD_CARD_T@PRODYD_LINK ON PROD_CARD_T.ID_NO=DETAIL_RECEIPT_LIST.CARD_ID\n" +
"LEFT JOIN PROD_TRACE_T@PRODYD_LINK ON PROD_TRACE_T.ACCEPT_NO = PROD_CARD_T.ACCEPT_NO\n" +
"left join RECEIPT_LIST on RECEIPT_LIST.id = DETAIL_RECEIPT_LIST.RECEIPT_ID\n" +
"where RECEIPT_ID in (select RECEIPT_ID from DETAIL_RECEIPT_LIST where CARD_ID =#{idCard} )")
public List<Map<String,Object>> findAllCardDetailedListByIdCard(@Param("idCard")String idCard);
public List<Map<String, Object>> findAllCardDetailedListByIdCard(@Param("idCard") String idCard);
}
src/main/java/com/yxproject/start/mapper/DataAuditingMapper.java
View file @ a5a87cd0
......@@ -14,7 +14,7 @@ import java.util.Map;
public interface DataAuditingMapper {
@Insert("insert into Data_Auditing (POLICE_SUBSTATION,VALID_COUNT,inVALID_COUNT,submit_date) values (#{policeSubstation},#{validCount},#{invalidCount},sysdate) ")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "ID")
public boolean saveDataAuditingEntity(DataAuditingEntity dataAuditingEntity);
......@@ -30,7 +30,7 @@ public interface DataAuditingMapper {
" select ACCEPT_NO from ACC_ERROR_INFO_T@ACCUYD_LINK)\n" +
" and substr(ACCEPT_NO,0,8) in (#{groupNo})\n" +
" group by substr(UPLOAD_NO,0,9)) b on a.POLICE_SUBSTATION = b.POLICE_SUBSTATION ")
public List<Map<String,Object>> selectDataAuditingEntity(@Param("groupNo")String groupNo);
public List<Map<String, Object>> selectDataAuditingEntity(@Param("groupNo") String groupNo);
@Select("<script>" +
"select nvl(GAJG_DM.GAJG_MC,'000000000') GAJG_MC,DATA_AUDITING.POLICE_SUBSTATION,sum(DATA_AUDITING.VALID_COUNT) VALID_COUNT,\n" +
......@@ -41,14 +41,14 @@ public interface DataAuditingMapper {
"left join GAJG_DM on GAJG_DM.GAJG_DM = DATA_AUDITING.POLICE_SUBSTATION\n" +
"where 1=1 " +
" <if test = 'policeName != null' >" +
" and GAJG_DM.GAJG_MC like ${policeName}"+
" and GAJG_DM.GAJG_MC like ${policeName}" +
"</if>\n" +
" <if test = 'policeCode != null' >" +
" and DATA_AUDITING.POLICE_SUBSTATION like ${policeCode}"+
" and DATA_AUDITING.POLICE_SUBSTATION like ${policeCode}" +
"</if> " +
" and to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd') BETWEEN ${startDate} and ${endDate} \n" +
"group by nvl(GAJG_DM.GAJG_MC,'000000000'),DATA_AUDITING.POLICE_SUBSTATION, to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd'), CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"order by DATA_AUDITING.POLICE_SUBSTATION" +
"</script>")
public List<Map<String,Object>> selectDataAuditingReport(@Param("startDate")String startDate,@Param("endDate")String endDate,@Param("policeName")String policeName,@Param("policeCode")String policeCode);
public List<Map<String, Object>> selectDataAuditingReport(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("policeName") String policeName, @Param("policeCode") String policeCode);
}
src/main/java/com/yxproject/start/mapper/DeliveredFailedInfoMapper.java
View file @ a5a87cd0
......@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Options;
public interface DeliveredFailedInfoMapper {
@Insert("insert into DELIVERED_FAILED_INFO (WAYBILL_NUMBER,BACK_DATE,BACK_REASON,note,REGISTER_NAME,CARD_ID) \n" +
"VALUES (#{waybillNumber},sysdate,#{backReason},#{note},#{registerName},#{cardId})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "ID")
public boolean saveDeliveredFailedInfo(DeliveredFailedInfoEntity deliveredFailedInfoEntity);
}
src/main/java/com/yxproject/start/mapper/DeliveredImportDicMapper.java
View file @ a5a87cd0
......@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Options;
public interface DeliveredImportDicMapper {
@Insert("insert into DELIVERED_IMPORT_DIC (FILE_NAME,IMPORT_DATE,import_name,import_count) \n" +
"VALUES (#{fileName},sysdate,#{importName},#{importCount})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "ID")
public boolean saveDeliveredImportDic(DeliveredImportDicEntity deliveredImportDicEntity);
}
src/main/java/com/yxproject/start/mapper/DeliveredInfoMapper.java
View file @ a5a87cd0
......@@ -17,7 +17,7 @@ public interface DeliveredInfoMapper {
@Insert("insert into DELIVERED_INFO (WAYBILL_NUMBER,DEAL_DATE,DEAL_STATE,FILE_ID) \n" +
"VALUES (#{waybillNumber},sysdate,#{dealState},#{fileId})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "ID")
public boolean saveDeliveredInfo(DeliveredInfoEntity deliveredInfoEntity);
@Select("select to_char(PRINT_DATE,'yyyyMMdd') PRINT_DATE ,count(PERSON_POST.WAYBILL_NUMBER) post_Count,\n" +
......@@ -27,25 +27,26 @@ public interface DeliveredInfoMapper {
"left join DELIVERED_FAILED_INFO on PERSON_POST.WAYBILL_NUMBER = DELIVERED_FAILED_INFO.WAYBILL_NUMBER\n" +
"where to_char(PRINT_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" +
"group by to_char(PRINT_DATE,'yyyyMMdd')")
public List<Map<String,Object>> selectReport(@Param("startDate")String startDate,@Param("endDate") String endDate);
public List<Map<String, Object>> selectReport(@Param("startDate") String startDate, @Param("endDate") String endDate);
@Select("select * from DELIVERED_IMPORT_DIC where TO_CHAR(IMPORT_DATE,'yyyyMMdd') = #{date} ")
public List<DeliveredImportDicEntity> selectDeliveredByImportDate(@Param("date")String date);
public List<DeliveredImportDicEntity> selectDeliveredByImportDate(@Param("date") String date);
@Select("select DELIVERED_FAILED_INFO.*,DELIVERED_FAILED_REASON.REASON from DELIVERED_FAILED_INFO\n" +
"left join DELIVERED_FAILED_REASON on DELIVERED_FAILED_REASON.ID = DELIVERED_FAILED_INFO.BACK_REASON\n" +
"where to_char(back_date,'yyyyMMdd') = #{date}")
public List<Map<String,Object>> selectDeliveredFailedByRegisterDate(@Param("date")String date);
public List<Map<String, Object>> selectDeliveredFailedByRegisterDate(@Param("date") String date);
@Delete("delete from DELIVERED_INFO where FILE_ID = #{fileId}")
public boolean deleteDeliveredByFileId(@Param("fileId")long fileId);
public boolean deleteDeliveredByFileId(@Param("fileId") long fileId);
@Delete("delete from DELIVERED_IMPORT_DIC where id = #{fileId}")
public boolean deleteDeliveredImportDicByFileId(@Param("fileId")long fileId);
public boolean deleteDeliveredImportDicByFileId(@Param("fileId") long fileId);
@Delete("delete from DELIVERED_FAILED_INFO where id = #{id}")
public boolean deleteDeliveredFailedById(@Param("id")long id);
public boolean deleteDeliveredFailedById(@Param("id") long id);
@Select("select * from DELIVERED_FAILED_REASON ")
public List<DeliveredFailedReasonEntity> selectDeliveredFailedType();
}
src/main/java/com/yxproject/start/mapper/DetailReceiptListMapper.java
View file @ a5a87cd0
......@@ -17,6 +17,7 @@ import java.util.Map;
public interface DetailReceiptListMapper {
/**
* 查询导出制证数据
*
* @return
*/
@Select("select DETAIL_RECEIPT_LIST.id,DETAIL_RECEIPT_LIST.ACCEPT_NO,DETAIL_RECEIPT_LIST.NAME,DETAIL_RECEIPT_LIST.UPLOAD_NO,\n" +
......@@ -27,31 +28,34 @@ public interface DetailReceiptListMapper {
"where RECEIPT_LIST.id in (${str}) " +
" order by DETAIL_RECEIPT_LIST.ACCEPT_NO " +
"")
public List<Map<String,Object>> selectPostDetails(@Param("str")String str);
public List<Map<String, Object>> selectPostDetails(@Param("str") String str);
/**
* 更新下载公安网数据
*
* @return
*/
@Update("update RECEIPT_LIST set DOWNLOAD_DATE = sysdate ,DOWNLOAD_NAME = #{name}\n" +
"where RECEIPT_LIST.id in (${str}) ")
public List<Map<String,Object>> updateReceiptListEntityByCardId(@Param("str")String str, @Param("name")String name);
public List<Map<String, Object>> updateReceiptListEntityByCardId(@Param("str") String str, @Param("name") String name);
/**
* 查询详单信息
*
* @param cardId 身份证件号码
* @return
*/
@Select("select * from DETAIL_RECEIPT_LIST where CARD_ID = #{cardId} order by id desc")
public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardId);
/**
* 更新详单信息的交接单Id
*
* @return
*/
@Update("UPDATE DETAIL_RECEIPT_LIST set RECEIPT_ID = #{reciptId} where id =#{id}")
public boolean updateDetailReceiptList(@Param("id")long id, @Param("reciptId")long reciptId);
public boolean updateDetailReceiptList(@Param("id") long id, @Param("reciptId") long reciptId);
}
src/main/java/com/yxproject/start/mapper/FailedCardMapper.java
View file @ a5a87cd0
......@@ -16,6 +16,7 @@ public interface FailedCardMapper {
/**
* 查询废证字典表，拿到所有废证原因
*
* @return
*/
@Select("select * from FAILED_CARD_REASON_DIC ")
......@@ -23,6 +24,7 @@ public interface FailedCardMapper {
/**
* 根据身份证号查询详细信息
*
* @param cardId
* @return
*/
......@@ -30,17 +32,18 @@ public interface FailedCardMapper {
"PROD_CARD_T.SEX_NO,\n" +
"PROD_CARD_T.ID_NO,\n" +
"SPECIAL_CARD.SPECIAL_TYPE, " +
"FAILED_CARD_REASON_DIC.FAILED_CARD_REASON \n "+
"FAILED_CARD_REASON_DIC.FAILED_CARD_REASON \n " +
"FROM PROD_CARD_T@PRODYD_LINK\n" +
"left join SPECIAL_CARD on PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO " +
"left join failed_card on PROD_CARD_T.ACCEPT_NO = failed_card.ACCEPT_NO " +
" left join FAILED_CARD_REASON_DIC on failed_card.FAILED_CARD_REASON_ID =FAILED_CARD_REASON_DIC.FAILED_CARD_REASON_ID"+
" left join FAILED_CARD_REASON_DIC on failed_card.FAILED_CARD_REASON_ID =FAILED_CARD_REASON_DIC.FAILED_CARD_REASON_ID" +
" WHERE PROD_CARD_T.ID_NO=#{cardId} OR PROD_CARD_T.ACCEPT_NO=#{cardId}")
public Map<String,Object>selectInfoByCardId(@Param("cardId")String cardId);
public Map<String, Object> selectInfoByCardId(@Param("cardId") String cardId);
/**
* 生成废证
*
* @param failedCardReasonId 废证原因
* @param acceptNo 受理组号
* @param taskId 任务单ID
......@@ -51,7 +54,7 @@ public interface FailedCardMapper {
* @return
*/
@Insert("INSERT INTO FAILED_CARD (FAILED_CARD_REASON_ID,ACCEPT_NO,TASK_ID,STATE,INITIATOR,NOTE,work_group,name) VALUES (#{failedCardReasonId},#{acceptNo},#{taskId},0,#{initiator},#{note},#{workGroup},#{name})\n")
public boolean insertFailedCard(@Param("failedCardReasonId")String failedCardReasonId,@Param("acceptNo")String acceptNo,@Param("taskId")String taskId,@Param("initiator")String initiator,@Param("note")String note,@Param("workGroup")String workGroup,@Param("name")String name);
public boolean insertFailedCard(@Param("failedCardReasonId") String failedCardReasonId, @Param("acceptNo") String acceptNo, @Param("taskId") String taskId, @Param("initiator") String initiator, @Param("note") String note, @Param("workGroup") String workGroup, @Param("name") String name);
@Select("SELECT PROD_CARD_T.ACCEPT_NO,GROUP_NO.TASK_ID ,task.work_group\n" +
......@@ -59,7 +62,7 @@ public interface FailedCardMapper {
"LEFT JOIN GROUP_NO ON GROUP_NO=subStr(PROD_CARD_T.ACCEPT_NO,0,8) " +
"left join task on task.TASK_ID = group_no.TASK_ID\n" +
"WHERE PROD_CARD_T.ID_NO=#{cardId} or PROD_CARD_T.ACCEPT_NO=#{cardId}")
public Map<String,Object> selectCountIdByCardId(@Param("cardId") String cardId);
public Map<String, Object> selectCountIdByCardId(@Param("cardId") String cardId);
/*余证*/
@Update("update group_no \n" +
......@@ -67,23 +70,22 @@ public interface FailedCardMapper {
"where group_no.group_no=(select group_no from PROD_CARD_T@PRODYD_LINK \n" +
"left join group_no on group_no.GROUP_NO=subStr(PROD_CARD_T.ACCEPT_NO,0,8)\n" +
"where PROD_CARD_T.accept_no =#{acceptNo}) ")
public boolean specialCardAdd(@Param("acceptNo")String acceptNo);
public boolean specialCardAdd(@Param("acceptNo") String acceptNo);
@Insert("insert into SPECIAL_CARD (ACCEPT_NO,TASK_ID,SPECIAL_TYPE,GROUP_NO,INITIATOR,FILL_IN_DATE)\n" +
"values(\n" +
"#{acceptNo},#{taskId},1," +
"#{groupNo},#{initiator},sysdate)\n")
public boolean addSpecialCard( SpecialCardEntity specialCardEntity);
public boolean addSpecialCard(SpecialCardEntity specialCardEntity);
@Select("select prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,6) as COUNTY_CODE,task.CARD_TYPE\n" +
" ,task.work_group from prod_card_t@PRODYD_LINK\n" +
"left join group_no on subStr(prod_card_t.ACCEPT_NO,0,8)=group_no.group_no "+
"left join task on group_no.task_id = task.task_id "+
"left join group_no on subStr(prod_card_t.ACCEPT_NO,0,8)=group_no.group_no " +
"left join task on group_no.task_id = task.task_id " +
"where prod_card_t.accept_no=#{acceptNo} or prod_card_t.ID_NO=#{acceptNo}")
public Map<String,Object> selectTaskListDate(@Param("acceptNo") String acceptNo);
public Map<String, Object> selectTaskListDate(@Param("acceptNo") String acceptNo);
......@@ -100,32 +102,32 @@ public interface FailedCardMapper {
public List<String> selectGroupNo(@Param("cardIdList") String cardIdList);
@Select("select SPECIAL_CARD.SPECIAL_TYPE,prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,6) as COUNTY_CODE ," +
"SPECIAL_CARD.INITIATOR,PREPRO_PERSON.CARD_TYPE_ID\n" +
"from prod_card_t@PRODYD_LINK\n" +
"left join SPECIAL_CARD on prod_card_t.accept_no = SPECIAL_CARD.accept_no\n" +
"left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH=prod_card_t.UPLOAD_NO\n" +
"where prod_card_t.ID_NO=#{acceptNo}")
public Map<String,Object> selectTaskListById(@Param("id") String id);
public Map<String, Object> selectTaskListById(@Param("id") String id);
@Select("select prod_group_t.valid_count,prod_group_t.invalid_count from prod_group_t@PRODYD_LINK \n" +
"where group_no=#{groupNo}")
public Map<String,Object> selectGroupDate(@Param("groupNo") String groupNo);
public Map<String, Object> selectGroupDate(@Param("groupNo") String groupNo);
@Insert("insert into group_no (GROUP_NO,TASK_ID,VALID_COUNT,INVALID_COUNT)values(#{GROUP_NO},#{TASK_ID},#{VALID_COUNT},#{INVALID_COUNT})")
public boolean insertGroupNo(@Param("GROUP_NO")String GROUP_NO,@Param("TASK_ID")String TASK_ID,@Param("VALID_COUNT")long VALID_COUNT,@Param("INVALID_COUNT")long INVALID_COUNT);
public boolean insertGroupNo(@Param("GROUP_NO") String GROUP_NO, @Param("TASK_ID") String TASK_ID, @Param("VALID_COUNT") long VALID_COUNT, @Param("INVALID_COUNT") long INVALID_COUNT);
@Update("update FAILED_CARD set PRINT_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
public boolean updateFailedState1(FailedCardEntity failedCardEntity);
@Update("update FAILED_CARD set POSITION_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
public boolean updateFailedState2(FailedCardEntity failedCardEntity);
@Update("update FAILED_CARD set ALLOT_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
public boolean updateFailedState3(FailedCardEntity failedCardEntity);
@Update("update FAILED_CARD set FINISH_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
// public boolean updateFailedState4(FailedCardEntity failedCardEntity);
// @Update("update FAILED_CARD set FINISH_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
......@@ -146,10 +148,11 @@ public interface FailedCardMapper {
*/
@Select("select SPECIAL_CARD.ACCEPT_NO,SPECIAL_CARD.TASK_ID,task.work_group FROM SPECIAL_CARD left join task on task.TASK_ID = special_card.TASK_ID LEFT JOIN prod_card_t@PRODYD_LINK ON PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO" +
" WHERE PROD_CARD_T.ID_NO=#{id} or PROD_CARD_T.ACCEPT_NO=#{id}")
public Map<String,Object>selectDataById(String id);
public Map<String, Object> selectDataById(String id);
/**
* 查询提交人提交的废证详情
*
* @param date 提交日期
* @param name 提交人姓名
* @return
......@@ -162,11 +165,12 @@ public interface FailedCardMapper {
"left join PROD_CARD_T@prodyd_link on failed_card.ACCEPT_NO = prod_card_t.ACCEPT_NO\n" +
"left join FAILED_CARD_REASON_DIC on failed_card.FAILED_CARD_REASON_ID = FAILED_CARD_REASON_DIC.FAILED_CARD_REASON_ID " +
"where failed_card.name = #{name} and to_char(submit_date,'yyyyMMdd') between #{startDate} and #{endDate} order by failed_card.ACCEPT_NO")
public List<Map<String,Object>> selectFailedCardInfo(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("name")String name);
public List<Map<String, Object>> selectFailedCardInfo(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("name") String name);
/**
* 删除废证详情
*
* @param failedCardId 废证ID
* @return
*/
......
src/main/java/com/yxproject/start/mapper/FileNameDicMapper.java
View file @ a5a87cd0
......@@ -13,24 +13,27 @@ import java.util.List;
public interface FileNameDicMapper {
/**
* 保存个人邮寄信息字典表
*
* @param fileNameDicEntity
* @return
*/
@Insert("INSERT INTO FILE_NAME_DIC (FILE_NAME,UPLOAD_DATE,FORM_START_TIME,FORM_DEADLINE,state) VALUES (#{fileName},#{uploadDate},#{formStartTime},#{formDeadline},#{state})")
@Options(useGeneratedKeys=true, keyProperty="fileId", keyColumn="FILE_ID")
@Options(useGeneratedKeys = true, keyProperty = "fileId", keyColumn = "FILE_ID")
public void saveFileNameDic(FileNameDicEntity fileNameDicEntity);
/**
* 更新个人邮寄字典表的解析状态
* 更新为已解析
*
* @param fileId 文件ID
* @return
*/
@Update("Updata FILE_NAME_DIC.STATE = 1 WHERE FILE_ID = #{fileId}")
public boolean updataState(@Param("fileId")String fileId);
public boolean updataState(@Param("fileId") String fileId);
/**
* 按条件查询个人邮寄字典表
*
* @param fileName 文件名称
* @param analysisState 解析状态
* @return
......@@ -50,10 +53,11 @@ public interface FileNameDicMapper {
" </where>" +
" ) where rn BETWEEN #{minNum} and #{maxNum} " +
"</script>")
public List<FileNameDicEntity> queryFileNameDic(@Param("uploadDate")String uploadDate,@Param("fileName") String fileName, @Param("analysisState") long analysisState, @Param("maxNum") long maxNum, @Param("minNum") long minNum);
public List<FileNameDicEntity> queryFileNameDic(@Param("uploadDate") String uploadDate, @Param("fileName") String fileName, @Param("analysisState") long analysisState, @Param("maxNum") long maxNum, @Param("minNum") long minNum);
/**
* 按条件查询个人邮寄字典表数量
*
* @param fileName 文件名称
* @param analysisState 解析状态
* @return
......@@ -69,8 +73,8 @@ public interface FileNameDicMapper {
"<if test='fileName != null ' >" +
" and FILE_NAME = #{fileName}" +
"</if> </where> </script>")
public List<FileNameDicEntity> queryFileNameDicCount(@Param("uploadDate")String uploadDate,@Param("fileName") String fileName, @Param("analysisState") long analysisState);
public List<FileNameDicEntity> queryFileNameDicCount(@Param("uploadDate") String uploadDate, @Param("fileName") String fileName, @Param("analysisState") long analysisState);
@Delete("DELETE FROM FILE_NAME_DIC WHERE FILE_ID = #{fileId}")
public void deleteFileAndPostData(@Param("fileId")String fileId);
public void deleteFileAndPostData(@Param("fileId") String fileId);
}
src/main/java/com/yxproject/start/mapper/GreenPackageInformationMapper.java
View file @ a5a87cd0
......@@ -12,7 +12,7 @@ import java.util.Map;
*/
@Mapper
public interface GreenPackageInformationMapper {
@Select("select * from GAJG_DM where GAJG_MC like #{policeName}")
@Select("select * from GAJG_DM where GAJG_MC like ${policeName}")
public List<Map<String,Object>> selectPolice(@Param("policeName") String policeName);
@Insert("insert into GREEN_PACKAGE_INFORMATION (WAYBILL_NUMBER,POLICE_NAME,RECEIPT_DATE,file_id) VALUES(#{waybillNumber},#{policeName},#{receiptDate},#{fileId})")
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ a5a87cd0
......@@ -232,8 +232,8 @@ public interface ReceiptMapper {
public DetailReceiptListEntity selectDetailByAcceptNo(@Param("acceptNo") String acceptNo);
@Update("update DETAIL_RECEIPT_LIST set NOTE = #{note} WHERE ACCEPT_NO=#{acceptNo} or CARD_ID= #{acceptNo}")
public boolean updateDetail(@Param("acceptNo")String accept,@Param("note")String note);
@Update("update DETAIL_RECEIPT_LIST set NOTE = #{note},submit_date = sysdate,submit_name = #{name} WHERE ACCEPT_NO=#{acceptNo} or CARD_ID= #{acceptNo}")
public boolean updateDetail(@Param("acceptNo")String accept,@Param("note")String note,@Param("name")String name);
/**
* 更新交接单是否已打印
......@@ -269,4 +269,20 @@ public interface ReceiptMapper {
"where to_char(DOWNLOAD_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate}")
public List<Map<String, Object>> selectPoliceDataByDownLoadDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
@Select("<script> select * from DETAIL_RECEIPT_LIST " +
"where to_char(SUBMIT_DATE,'yyyyMMdd') between #{startDate} and #{endDate} " +
"<if test = 'name != null'> " +
" and SUBMIT_NAME = #{name} " +
" </if>" +
"</script>")
public List<DetailReceiptListEntity> selectDetailNote(@Param("startDate") String startDate,@Param("endDate") String endDate ,@Param("name")String name);
@Select("select RECEIPT_LIST.QR_CODE from RECEIPT_LIST \n" +
"left join DETAIL_RECEIPT_LIST on DETAIL_RECEIPT_LIST.RECEIPT_ID = RECEIPT_LIST.id\n" +
"where DETAIL_RECEIPT_LIST.CARD_ID = #{id}")
public List<Map<String, Object>> selectQrCodeByCardID(@Param("id") String id, @Param("beginDate")String beginDate, @Param("expireDate")String expireDate);
@Select("select * from GAJG_DM where GAJG_DM = #{policeCode} ")
public List<Map<String, Object>> selectPoliceName(@Param("policeCode") String policeCode);
}
src/main/java/com/yxproject/start/mapper/UtilMapper.java 0 → 100644
View file @ a5a87cd0
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
/**
* Created by Administrator on 2019/6/18.
*/
@Mapper
public interface UtilMapper {
/**
* 更新受理库导入时间
*/
@Update("UPDATE ACC_GROUP_T@ACCU_LINK SET IMPORT_TIME = SYSDATE")
public boolean updateImportTime();
/**
* 更新受理库处理标志
*/
@Update("UPDATE ACC_GROUP_T@ACCU_LINK SET SUBMIT_DATE = SYSDATE, DEAL_FLAG = #{dealFlag}")
public boolean updateDealFlag(String dealFlag);
}
src/main/java/com/yxproject/start/service/ReceiptService.java
View file @ a5a87cd0
......@@ -62,7 +62,9 @@ public interface ReceiptService {
public DetailReceiptListEntity selectDetailByAcceptNo(String acceptNo);
public boolean updateDetail(String accept,String note);
public boolean updateDetail(String accept,String note,String name);
public List<DetailReceiptListEntity> selectDetailNote(String startDate,String endDate,String name);
public Map<String, Object> selectReceiptList(List<Integer> stringList,long typeCode);
......@@ -84,4 +86,7 @@ public interface ReceiptService {
public List<Map<String,Object>> selectPoliceDataByDownLoadDate(String startDate,String endDate);
public List<Map<String,Object>> selectQrCodeByCardID(String id,String beginDate,String expireDate);
public String selectPoliceName(String policeCode);
}
src/main/java/com/yxproject/start/service/UtilService.java 0 → 100644
View file @ a5a87cd0
package com.yxproject.start.service;
/**
* Created by Administrator on 2019/6/18.
*/
public interface UtilService {
public boolean updateImportTime();
public boolean updateDealFlag( String dealFlag );
}
src/main/java/com/yxproject/start/service/impl/CardDetailedListServiceImpl.java
View file @ a5a87cd0
......@@ -25,16 +25,15 @@ public class CardDetailedListServiceImpl implements CardDetailedListService {
}
@Override
public List<Map<String,Object>> findAllCardDetailedListByIdCard(String idCard) {
List<Map<String,Object>> list = cardDetailedListMapper.findAllCardDetailedListByIdCard(idCard);
public List<Map<String, Object>> findAllCardDetailedListByIdCard(String idCard) {
List<Map<String, Object>> list = cardDetailedListMapper.findAllCardDetailedListByIdCard(idCard);
return list;
}
@Override
public boolean saveCardDetailedList(String uploadNo, String policeCode, String cardId, String name) {
cardDetailedListMapper.saveCardDetailedList(uploadNo,policeCode,cardId,name);
cardDetailedListMapper.saveCardDetailedList(uploadNo, policeCode, cardId, name);
return true;
}
}
src/main/java/com/yxproject/start/service/impl/DataAuditingServiceImpl.java
View file @ a5a87cd0
......@@ -24,7 +24,7 @@ public class DataAuditingServiceImpl implements DataAuditingService {
@Override
@Transactional
public boolean saveDataAuditingList(List<DataAuditingEntity> dataAuditingEntityList) {
for (DataAuditingEntity dataAuditingEntity:dataAuditingEntityList){
for (DataAuditingEntity dataAuditingEntity : dataAuditingEntityList) {
dataAuditingMapper.saveDataAuditingEntity(dataAuditingEntity);
}
return true;
......@@ -34,32 +34,33 @@ public class DataAuditingServiceImpl implements DataAuditingService {
public List<Map<String, Object>> selectDataAuditingList(String groupNo) {
return dataAuditingMapper.selectDataAuditingEntity(groupNo);
}
@Override
public List<Map<String, Object>> selectDataAuditingReport(String startDate,String endDate,String policeName,String policeCode) {
if ("".equals(policeName)){
policeName=null;
}else {
policeName="'" + policeName + "%'";
public List<Map<String, Object>> selectDataAuditingReport(String startDate, String endDate, String policeName, String policeCode) {
if ("".equals(policeName)) {
policeName = null;
} else {
policeName = "'" + policeName + "%'";
}
if ("".equals(policeCode)){
policeCode=null;
}else {
policeCode="'" + policeCode + "%'";
if ("".equals(policeCode)) {
policeCode = null;
} else {
policeCode = "'" + policeCode + "%'";
}
List<Map<String, Object>> maps = dataAuditingMapper.selectDataAuditingReport("'" + startDate + "'", "'" + endDate + "'", policeName, policeCode);
Map<String,Object> sumMap = new LinkedHashMap<>();
int validCount =0;
int invalidCount =0;
for (Map<String, Object> map :maps) {
validCount+=Integer.valueOf(map.get("VALID_COUNT").toString());
invalidCount+=Integer.valueOf(map.get("INVALID_COUNT").toString());
Map<String, Object> sumMap = new LinkedHashMap<>();
int validCount = 0;
int invalidCount = 0;
for (Map<String, Object> map : maps) {
validCount += Integer.valueOf(map.get("VALID_COUNT").toString());
invalidCount += Integer.valueOf(map.get("INVALID_COUNT").toString());
}
if (maps.size()>0){
sumMap.put("VALID_COUNT",validCount);
sumMap.put("INVALID_COUNT",invalidCount);
sumMap.put("GAJG_MC","北京制证中心");
sumMap.put("POLICE_SUBSTATION","合计");
sumMap.put("FAILURE_RATE",1-validCount/(validCount+invalidCount));
if (maps.size() > 0) {
sumMap.put("VALID_COUNT", validCount);
sumMap.put("INVALID_COUNT", invalidCount);
sumMap.put("GAJG_MC", "北京制证中心");
sumMap.put("POLICE_SUBSTATION", "合计");
sumMap.put("FAILURE_RATE", 1 - validCount / (validCount + invalidCount));
maps.add(sumMap);
}
return maps;
......
src/main/java/com/yxproject/start/service/impl/DeliveredServiceImpl.java
View file @ a5a87cd0
......@@ -36,7 +36,7 @@ public class DeliveredServiceImpl implements DeliveredService {
@Override
public boolean saveDeliveredInfoList(List<DeliveredInfoEntity> deliveredInfoEntityList) {
for (DeliveredInfoEntity deliveredInfoEntity: deliveredInfoEntityList) {
for (DeliveredInfoEntity deliveredInfoEntity : deliveredInfoEntityList) {
deliveredInfoMapper.saveDeliveredInfo(deliveredInfoEntity);
}
return true;
......@@ -44,7 +44,7 @@ public class DeliveredServiceImpl implements DeliveredService {
@Override
public boolean saveDeliveredFailedInfoList(List<DeliveredFailedInfoEntity> deliveredFailedInfoEntities) {
for (DeliveredFailedInfoEntity deliveredFailedInfoEntity :deliveredFailedInfoEntities){
for (DeliveredFailedInfoEntity deliveredFailedInfoEntity : deliveredFailedInfoEntities) {
deliveredFailedInfoMapper.saveDeliveredFailedInfo(deliveredFailedInfoEntity);
}
return false;
......
src/main/java/com/yxproject/start/service/impl/DetailReceiptListServiceImpl.java
View file @ a5a87cd0
......@@ -19,29 +19,30 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService {
private DetailReceiptListMapper detailReceiptListMapper;
@Override
public List<Map<String, Object>> selectPostDetails(List<Integer> stringList,String name,String isHistory) {
String str ="";
for (int i =0;i<stringList.size();i++){
if (i==stringList.size()-1){
str+=stringList.get(i);
}else {
str+=stringList.get(i)+",";
public List<Map<String, Object>> selectPostDetails(List<Integer> stringList, String name, String isHistory) {
String str = "";
for (int i = 0; i < stringList.size(); i++) {
if (i == stringList.size() - 1) {
str += stringList.get(i);
} else {
str += stringList.get(i) + ",";
}
}
// str+=")";
if ("0".equals(isHistory)){
detailReceiptListMapper.updateReceiptListEntityByCardId(str,name);
if ("0".equals(isHistory)) {
detailReceiptListMapper.updateReceiptListEntityByCardId(str, name);
}
return detailReceiptListMapper.selectPostDetails(str);
}
@Override
public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID) {
return detailReceiptListMapper.selectDetailReceiptListEntityByCardId(cardID);
}
@Override
public boolean updateDetailReceiptList(DetailReceiptListEntity detailReceiptListEntity,long reciptId) {
return detailReceiptListMapper.updateDetailReceiptList(detailReceiptListEntity.getId(),reciptId);
public boolean updateDetailReceiptList(DetailReceiptListEntity detailReceiptListEntity, long reciptId) {
return detailReceiptListMapper.updateDetailReceiptList(detailReceiptListEntity.getId(), reciptId);
}
}
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ a5a87cd0
......@@ -143,9 +143,9 @@ public class ReceiptServiceImpl implements ReceiptService {
}
@Override
public boolean updateDetail(String accept, String note) {
public boolean updateDetail(String accept,String note,String name) {
return receiptMapper.updateDetail(accept,note);
return receiptMapper.updateDetail(accept,note,name);
}
@Override
......@@ -341,6 +341,29 @@ public class ReceiptServiceImpl implements ReceiptService {
}
@Override
public List<DetailReceiptListEntity> selectDetailNote(String startDate, String endDate, String name) {
List<DetailReceiptListEntity> detailReceiptListEntityList = receiptMapper.selectDetailNote(startDate, endDate, name);
return detailReceiptListEntityList;
}
@Override
public List<Map<String, Object>> selectQrCodeByCardID(String id, String beginDate, String expireDate) {
List<Map<String, Object>> list = receiptMapper.selectQrCodeByCardID(id, beginDate, expireDate);
return list;
}
@Override
public String selectPoliceName(String policeCode) {
List<Map<String, Object>> list = receiptMapper.selectPoliceName(policeCode);
if (list.size()>0){
return list.get(0).get("GAJG_MC").toString();
}else {
return null ;
}
}
private List<Map<String, Object>> formateMap(List<Map<String, Object>> maplist) {
Map<String, Object> typeMap = new LinkedHashMap<>();
for (Map o : maplist) {
......
src/main/java/com/yxproject/start/service/impl/UtilServiceImpl.java 0 → 100644
View file @ a5a87cd0
package com.yxproject.start.service.impl;
import com.yxproject.start.mapper.UtilMapper;
import com.yxproject.start.service.UtilService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* Created by Administrator on 2019/6/18.
*/
@Service
public class UtilServiceImpl implements UtilService {
@Autowired
private UtilMapper utilMapper;
@Override
public boolean updateImportTime () {
utilMapper.updateImportTime();
return true;
}
@Override
public boolean updateDealFlag(String dealFlag) {
utilMapper.updateDealFlag(dealFlag);
return true;
}
}
src/main/resources/application.yml
View file @ a5a87cd0
......@@ -4,7 +4,7 @@ server:
spring:
datasource:
driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.10.208:1521:yingxin
url: jdbc:oracle:thin:@192.168.10.65:1521:yingxin
username: yingxin
password: yingxin
servlet:
......
src/main/resources/log4j.properties 0 → 100644
View file @ a5a87cd0
### 设置###
log4j.rootLogger = debug,stdout,D,E
log4j.appenderRefs = ${appenders}
log4j.appenderRef.console.ref = STDOUT
log4j.appenderRef.rollingFileAppender.ref = rollingFile
### 输出信息到控制台 ###
log4j.appender.stdout = org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target = System.out
log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n
### 输出DEBUG 级别以上的日志到=E://logs/error.log ###
log4j.appender.D = org.apache.log4j.DailyRollingFileAppender
log4j.appender.D.File = ./logs/debug.log
log4j.appender.D.Append = true
log4j.appender.D.Threshold = DEBUG
log4j.appender.D.layout = org.apache.log4j.PatternLayout
log4j.appender.D.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%X{ip}] [ %t:%r ] - [ %p ] %l %m%n
### 输出ERROR 级别以上的日志到=E://logs/error.log ###
log4j.appender.E = org.apache.log4j.DailyRollingFileAppender
log4j.appender.E.File =./logs/error.log
log4j.appender.E.Append = true
log4j.appender.E.Threshold = ERROR
log4j.appender.E.layout = org.apache.log4j.PatternLayout
log4j.appender.E.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%X{ip}] [ %t:%r ] - [ %p ] %l %m%n
###打印SQL###
log4j.logger.org.mybatis = DEBUG
log4j.logger.java.sql = DEBUG
log4j.logger.java.sql.Statement = DEBUG
log4j.logger.java.sql.ResultSet = DEBUG
log4j.logger.java.sql.PreparedStatement = DEBUG
### druid sql ###
log4j.logger.D.sql=stdout
log4j.logger.D.sql.DataSource=stdout
log4j.logger.D.sql.Connection=stdout
log4j.logger.D.sql.Statement=stdout
log4j.logger.D.sql.ResultSet=stdout
src/main/resources/static/newTheme/echarts/echarts.js 0 → 100644
View file @ a5a87cd0
This diff is collapsed.
src/main/resources/static/views/addBackCard/addBackCard.html 0 → 100644
View file @ a5a87cd0
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
/*清除浮动代码*/
.cl:after{display:block;clear:both;content:"";visibility:hidden;height:0}
.cl{zoom:1}
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box">
<strong class="box-header with-border">退回登记</strong>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom:10px;">
<tr>
<td width="200px">
<span>退回登记数量:</span>
</td>
<td width="200px">
<input style="" type="number" ng-model="backCount"></td>
<td>
<div style="text-align: left;">
<input type="submit" ng-click="createInputs(backCount)" class="btn btn-primary" value="确定">
</div>
</td>
<!--<form ng-submit="createInputs()" style="padding-left: 15px;">-->
<!--<span style="font-size:20px;">余证数量:</span>-->
<!--<input style="margin-top:20px;height: 30px;" type="number" ng-model="restCount">-->
<!--<input type="submit" class="btn btn-primary" value="确定">-->
<!--<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>-->
<!--</form>-->
</tr>
</table>
<div style="padding: 15px;" ng-if="arr.length>0">
<table class="table table-bordered">
<tr ng-repeat="item in arr">
<td>{{$index+1}}</td>
<td>
身份证号:
</td>
<td>
<input type="text" placeholder="请填写身份证号" class="{{$index}}" style="height: 34px;">
</td>
<td>
备注:
</td>
<td>
<input type="text" placeholder="备注" class="{{$index}}" style="height: 34px;">
</td>
</tr>
</table>
<div ng-if="arr.length>0" style="text-align: right;">
<button class="btn btn-primary" ng-click="addBackCard()">提交</button>
<button class="btn btn-danger" ng-click="cancelAddBackCard()">取消</button>
</div>
</div>
</div>
</div>
<div class="box">
<div class="box-header">
<strong>退回登记提交详情</strong>
</div>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="200px;">
<span>起始日期:</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate1" id="datepicker1" readonly/>
</td>
<td width="200px;">
<span>截止日期:</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate" id="datepicker2" readonly/>
</td>
<td>
<div style="text-align: left;">
<button class="btn btn-primary" ng-click="aselectBackInfo()">查询</button>
</div>
</td>
</tr>
</table>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="backInfo.length>0">
<thead>
<tr>
<th>NO.</th>
<th>受理组号</th>
<th>保存时间</th>
<th>提交人</th>
<th>状态</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in backInfo">
<td>{{$index+1}}</td>
<th>{{item.GROUP_NO}}</th>
<td>{{item.SUBMIT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.SUBMIT_NAME}}</td>
<td>{{item.TASK_STATE}}</td>
<td><a ng-click="deleteBack(item.GROUP_NO,item.TASK_ID)">删除</a></td>
</tr>
</tbody>
</table>
<div ng-if="backInfo.length==0">
<h4 style="padding-left: 10px;">暂无数据</h4>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/addBackCard/addBackCard.js 0 → 100644
View file @ a5a87cd0
'use strict';
angular.module('AvatarCheck.addBackCard', ['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/addBackCard', {
templateUrl: 'views/addBackCard/addBackCard.html' + urlTimeStamp(),
controller: 'addBackCardCtrl',
cache: false
});
}])
.controller('addBackCardCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-01");
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//查询退回登记
$scope.aselectBackInfo = function () {
var date1 = $('#datepicker1').val();
var date2 = $('#datepicker2').val();
if(date1==""){
date1=$scope.choseDate1;
}
if(date2==""){
date2=$scope.choseDate;
}
HttpService.aselectBackInfoData(date1,date2,$rootScope.loginData.name,function(data){
$scope.backInfo = data;
console.log($scope.backInfo)
})
};
if($rootScope.loginData.login == true){
$scope.aselectBackInfo();
}
$scope.createInputs = function(){
if($scope.backCount>0){
var count = $scope.backCount;
if(count>10){
count=10;
}
$scope.arr = [];
for (var i=0;i<count;i++){
$scope.arr.push(i);
}
}else{
MessageService.showAlert("请输入正确的数字")
}
};
$scope.cancelAddBackCard =function(){
$scope.arr = [];
}
var cancel=$scope.cancelAddBackCard;
var reGetData = $scope.aselectBackInfo;
$scope.addBackCard = function(){
var array = [];
for(var i=0;i<$scope.arr.length;i++){
for (var j=0;j<$("."+i).length;j++){
array.push($("."+i)[j].value)
}
}
var result = [];
console.log(array)
for (var i = 0, j = array.length; i < j; i += 2) {
result.push(array.slice(i, i + 2));
}
var list=[];
var count=0;
for (var i=0;i<result.length;i++){
if(result[i][0]==''){
count=count+1;
}else{
var json = {};
json.acceptNo=result[i][0];
json.note=result[i][1];
list.push(json)
}
}
if(count>0){
MessageService.showAlert("身份证或者受理号不能为空")
}else{
console.log(list);
ngDialog.open({
template: 'dialogs/confirmFailedCards.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) {
var idCardArr =[];
for(var i=0;i<list.length;i++){
idCardArr.push(list[i].cardId);
}
HttpService.getPersonInfo(idCardArr,function(data){
$scope.personInfo = data;
$scope.can = false;
for(var i=0;i<$scope.personInfo.length;i++){
if($scope.personInfo[i].SEX_NO==-1){
$scope.can = true;
}
}
console.log($scope.personInfo)
})
$scope.confirmAdd = function(){
console.log("list",list)
HttpService.addBackCardDataBySjhy(list,function(data){
$scope.closeThisDialog();
// MessageService.showAlert("添加成功");
reGetData();
cancel();
console.log(data)
})
}
}]
});
}
}
// $scope.addBackCard = function(){
// var array = [];
// var acceptList =[];
// var count = 0;
// for(var i=0;i<$scope.arr.length;i++){
// if($(".back")[i].value==''){
// count=count+1;
// }else{
// array.push($(".back")[i].value)
// var confirmJson={};
// confirmJson.name=$rootScope.loginData.name;
// confirmJson.acceptNo =$(".back")[i].value;
// acceptList.push(confirmJson)
// }
// }
// if(count>0){
// MessageService.showAlert("内容不能为空")
// }else{
// console.log("array:",array);
// ngDialog.open({
// template: 'dialogs/confirmRestCards.html' + urlTimeStamp(),
// width: 800,
// cache: false,
// closeByDocument:false,
// controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) {
// HttpService.getPersonInfo(array,function(data){
// $scope.personInfo = data;
// $scope.can = false;
// for(var i=0;i<$scope.personInfo.length;i++){
// if($scope.personInfo[i].SEX_NO==-1
// // ||$scope.personInfo[i].SPECIAL_TYPE==0||$scope.personInfo[i].SPECIAL_TYPE==1||$scope.personInfo[i].SPECIAL_TYPE==2||$scope.personInfo[i].SPECIAL_TYPE==3
// ){
// $scope.can = true;
// }
// }
// console.log($scope.personInfo)
// })
// $scope.confirmAdd = function(){
// console.log("acceptList",acceptList)
// HttpService.addBackCardDataBySjhy(acceptList,function(data){
// $scope.closeThisDialog();
// // MessageService.showAlert("添加成功");
// reGetData();
// cancel();
// console.log(data)
// })
// }
// }]
// });
// }
//
// }
$scope.deleteBack = function(groupNo,taskid) {
ngDialog.open({
template: 'dialogs/confirmDeleteBack.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.groupNo = groupNo;
$scope.confirmDelete = function () {
HttpService.deleteBackCard(taskid,function(data) {
$scope.closeThisDialog();
reGetData();
})
};
}]
});
}
});
\ No newline at end of file
src/main/resources/static/views/blank/blank.html 0 → 100644
View file @ a5a87cd0
<section class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box ">
<div class="box-header">
<strong>制证统计</strong>
<div class="pull-right">
<select class="form-control select2">
<option value="2019">2019年</option>
</select>
</div>
</div>
<div class="box box-primary">
<div style="text-align: center;">
<!--通过率统计图-->
<div class="row" >
<div class="col-md-12">
<div class="yx-div-header"></div>
<div id="diagram_item_ratio_certification" style="height:500px;"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
\ No newline at end of file
src/main/resources/static/views/blank/blank.js 0 → 100644
View file @ a5a87cd0
'use strict';
angular.module('AvatarCheck.blank', ['ngRoute', 'AvatarCheck.http', 'tm.pagination'])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/blank', {
templateUrl: 'views/blank/blank.html' + urlTimeStamp(),
controller: 'blankCtrl',
cache: false
});
}])
.controller('blankCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter,$location) {
if($rootScope.loginData.login==false){
$location.path("/login")
}
$scope.loadCertificationDiagram = function(){
HttpService.loadCertificationDiagram(
function (data) {
console.log("统计图：",data)
var myChart = echarts.init(document.getElementById('diagram_item_ratio_certification'));
myChart.setOption(buildDiagramDataCheckItemRatioProv('制证生产', data));
},
function (err) {
console.log("report query response got error", err);
}
)
};
$scope.loadCertificationDiagram();
});
\ No newline at end of file
src/main/resources/static/views/dataCheckReport/dataCheckReport.html 0 → 100644
View file @ a5a87cd0
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
.select2-search__field {
height:30px;
}
.ul li{
cursor: pointer;
}
.table .colSpan{
column-span: 5;
}
.page-list .pagination {float:left;}
.page-list .pagination span {cursor: pointer;}
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
.page-list .pagination .separate span:hover {background: none;}
.page-list .page-total {float:left; margin: 25px 20px;}
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
.page-list .page-total input {width: 40px; padding-left:3px;}
.page-list .page-total select {width: 50px;}
.page-list:after {
display: block;
clear: both;
content: ""
}
.page-list{
zoom: 1
}
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box">
<div class="box-header">
<strong>核验报表详情</strong>
</div>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>起始日期:</td>
<td>
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text"
class="form-control pull-right"
ng-model="choseDate"
id="datepicker1" readonly/>
</div>
</td>
<td>截止日期:</td>
<td>
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text"
class="form-control pull-right"
ng-model="choseDate"
id="datepicker2" readonly/>
</div>
</td>
<td>制证类型:</td>
<td style="text-align: left;">
<select class="form-control select2" id="cardType">
<option value="">--请选择制证类型--</option>
<option value="{{type.cardTypeId}}" ng-repeat="type in typeList">{{type.cardType}}</option>
</select>
</td>
</tr>
<tr>
<td>单位代码:</td>
<td>
<input type="text" class="form-control" ng-model="policeCode" placeholder="单位代码">
</td>
<td>单位名称:</td>
<td>
<input type="text" class="form-control" ng-model="policeName" placeholder="单位名称">
</td>
<td>
<div style="text-align: left;">
<button class="btn btn-primary" ng-click="searchReportData()">查询</button>
</div>
</td>
</tr>
</table>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<h4 ng-if="dataCheckList.length==0">暂无数据</h4>
<table class="table table-bordered table-hover postTable" ng-if="dataCheckList.length>0">
<thead>
<tr>
<th>单位代码</th>
<th>单位名称</th>
<th>制证类型</th>
<th>制证数量</th>
<th>不合格数</th>
<th>不合格率</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in dataCheckList" ng-class="{true: 'bg-gray', false: ''}[item.POLICE_SUBSTATION=='合计']">
<td>{{item.POLICE_SUBSTATION}}</td>
<td>{{item.GAJG_MC}}</td>
<td>{{item.CARD_TYPE}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.INVALID_COUNT}}</td>
<td>{{item.FAILURE_RATE}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/dataCheckReport/dataCheckReport.js 0 → 100644
View file @ a5a87cd0
'use strict';
angular.module("AvatarCheck.dataCheckReport",['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider){
$routeProvider.when('/dataCheckReport', {
templateUrl: 'views/dataCheckReport/dataCheckReport.html' + urlTimeStamp(),
controller: 'dataCheckReportCtrl',
cache: false
});
}])
.controller('dataCheckReportCtrl', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
var getTypeList = function(){
HttpService.getTypeList(function(data){
$scope.typeList = data;
console.log(data)
})
};
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.searchReportData=function () {
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
var cardType = $("#cardType").val();
if(cardType==''){
cardType = -1;
}
HttpService.queryDataCheckReport(date1,date2,$scope.policeCode,$scope.policeName,cardType,function (data) {
$scope.dataCheckList = data;
console.log($scope.dataCheckList);
})
};
if($rootScope.loginData.login==true){
getTypeList();
$scope.searchReportData();
}
});
\ No newline at end of file
src/main/resources/static/views/downloadGongan/downloadGongan.html 0 → 100644
View file @ a5a87cd0
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box-header" style="border-bottom: 1px solid #e0e0e0;">
<strong>公安网反馈信息</strong>
<div class="box-tools pull-right" >
<span>交接日期：</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="doSearchGongan()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body" ng-if="isHistory==0">
<div class="table-responsive mailbox-messages">
<div class="mailbox-messages">
<table ng-if="gonganData.length>0" class="table table-hover postTable">
<thead>
<tr>
<th width="10%"><input type="checkbox" ng-model="all"></th>
<th width="30%">日期</th>
<th width="20%">证件数量</th>
<th width="10%">操作</th>
</tr>
</thead>
<tbody ng-repeat="item in gonganData">
<tr style="background-color: #eee">
<td><input type="checkbox" ng-checked="all" class="check" ng-click="checkAllPolice($event,item.date)"></td>
<td>{{item.date | myDateFilterByHour}}</td>
<td>{{item.count}}</td>
<td><a ng-click="showPoliceList($index)">派出所列表</a></td>
</tr>
<tr ng-show="$index==taskId">
<td colspan="7" style="padding: 0;">
<table class="table" style="margin-bottom: 0;">
<thead>
<tr>
<th></th>
<th>NO.</th>
<th>派出所代码</th>
<th>派出所名称</th>
<th>封签编号</th>
<th>证件数量</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="police in item.list">
<td><input type="checkbox" ng-checked="all" name="checkPolice{{item.date}}" value="{{police.ID}}" class="checkPoliceBox"></td>
<td>{{$index+1}}</td>
<td>{{police.POLICE_CODE}}</td>
<td>{{police.GAJG_MC}}</td>
<td>{{police.QR_CODE}}</td>
<td>{{police.FINISH_COUNT}}</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.table -->
<div class="box-footer" ng-if="gonganData.length>0">
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="downloadGongan()">下载公安网反馈信息</button>
</div>
</div>
<div ng-if="gonganData.length==0">
<h4>暂无数据</h4>
</div>
</div>
</div>
<!-- /.mail-box-messages -->
<div class="box-body" ng-if="isHistory==1">
<div class="table-responsive mailbox-messages">
<div class="mailbox-messages">
<table ng-if="gonganHistoryData.length>0" class="table table-hover postTable">
<thead>
<tr>
<th width="10%"><input type="checkbox" ng-model="all"></th>
<th width="30%">日期</th>
<th width="20%">证件数量</th>
<th width="10%">操作</th>
</tr>
</thead>
<tbody ng-repeat="item in gonganHistoryData">
<tr style="background-color: #eee">
<td><input type="checkbox" ng-checked="all" class="check" ng-click="checkAllPolice($event,item.date)"></td>
<td>{{item.date | myDateFilterByHour}}</td>
<td>{{item.count}}</td>
<td><a ng-click="showPoliceList($index)">派出所列表</a></td>
</tr>
<tr ng-show="$index==taskId">
<td colspan="7" style="padding: 0;">
<table class="table" style="margin-bottom: 0;">
<thead>
<tr>
<th></th>
<th>NO.</th>
<th>派出所代码</th>
<th>派出所名称</th>
<th>封签编号</th>
<th>证件数量</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="police in item.list">
<td><input type="checkbox" ng-checked="all" name="checkPolice{{item.date}}" value="{{police.ID}}" class="checkPoliceBox"></td>
<td>{{$index+1}}</td>
<td>{{police.POLICE_CODE}}</td>
<td>{{police.GAJG_MC}}</td>
<td>{{police.QR_CODE}}</td>
<td>{{police.FINISH_COUNT}}</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.table -->
<div class="box-footer" ng-if="gonganHistoryData.length>0">
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="downloadGongan()">下载公安网反馈信息</button>
</div>
</div>
<div ng-if="gonganHistoryData.length==0">
<h4>暂无数据</h4>
</div>
</div>
</div>
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
</div>
</div>
src/main/resources/static/views/downloadGongan/downloadGongan.js 0 → 100644
View file @ a5a87cd0
'use strict';
angular.module('AvatarCheck.downloadGongan', ['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/downloadGongan', {
templateUrl: 'views/downloadGongan/downloadGongan.html' + urlTimeStamp(),
controller: 'downloadGonganCtrl',
cache: false
});
}])
.controller('downloadGonganCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.isHistory = 0;
//Date picker
$('#datepicker1').datetimepicker({
minView:'month',
language: 'zh-CN',
format: 'yyyy-MM-dd',
todayBtn: 1,
autoclose: 1
});
$('#datepicker2').datetimepicker({
minView:'month',
language: 'zh-CN',
format: 'yyyy-MM-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-01");
$scope.downloadGongan = function(){
var json={
list:[],
name:$rootScope.loginData.name,
isHistory:$scope.isHistory
};
var checks = $(".checkPoliceBox:checked");
for (var i=0;i<checks.length;i++){
json.list.push(checks[i].value)
}
console.log(json);
if(json.list.length==0){
MessageService.showAlert("请选择要下载的分局或派出所")
}else{
HttpService.printExcelData(json,function (data) {
$scope.doSearchGongan();
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
a.click();
})
}
};
$scope.taskId=-1;
$scope.showPoliceList = function(index) {
if($scope.taskId==-1){
$scope.taskId=index;
}else{
$scope.taskId=-1
}
};
$scope.currentTab = 0;
$scope.func = function (index) {
// $scope.taskId=-1;
for (var idx in $scope.gonganData) {
if (index == idx) {
$scope.gonganData[idx].isActive = true;
} else {
$scope.gonganData[idx].isActive = false;
}
}
for (var idx in $scope.gonganHistoryData) {
if (index == idx) {
$scope.gonganHistoryData[idx].isActive = true;
} else {
$scope.gonganHistoryData[idx].isActive = false;
}
}
$scope.currentTab = index;
};
$scope.doSearchGongan = function () {
$scope.isHistory = 0;
var startDate=$('#datepicker1').val();
var endDate=$('#datepicker2').val();
if(startDate==''){
startDate=$filter("date")(new Date(), "yyyy-MM-01");
}
if(endDate==''){
endDate=$filter("date")(new Date(), "yyyy-MM-dd");
}
HttpService.getGongan(startDate,endDate,function(data){
$scope.gonganData=data;
for(var i=0;i<$scope.gonganData.length;i++){
if(i==$scope.currentTab){
$scope.gonganData[i].isActive=true;
}else{
$scope.gonganData[i].isActive=false;
}
}
console.log($scope.gonganData,"点击查询公安网反馈");
})
};
if($rootScope.loginData.login==true){
$scope.doSearchGongan();
}
$scope.searchHistory = function () {
$scope.isHistory = 1;
var startDate=$('#datepicker1').val();
var endDate=$('#datepicker2').val();
HttpService.getHistoryGongan(startDate,endDate,function(data){
$scope.gonganHistoryData=data;
for(var i=0;i<$scope.gonganHistoryData.length;i++){
if(i==$scope.currentTab){
$scope.gonganHistoryData[i].isActive=true;
}else{
$scope.gonganHistoryData[i].isActive=false;
}
}
console.log($scope.gonganHistoryData);
})
}
$scope.checkAllPolice = function ($event,date) {
console.log(date)
var checkAllPolice = $event.target;
var checkbox =document.getElementsByName("checkPolice"+date);
console.log(checkbox.length);
for(var i=0;i<checkbox.length;i++){
if(checkAllPolice.checked) {
checkbox[i].checked = true;
}else {
checkbox[i].checked = false;
}
}
};
});
\ No newline at end of file
src/main/resources/static/views/updatePass/updatePass.html 0 → 100644
View file @ a5a87cd0
<div class="content row">
<div class="col-md-6" style="margin-top:17px;">
<div class="box" >
<strong class="box-header">密码修改</strong>
<div class="box box-primary">
<div class="box-body">
<div class="row">
<div class="col-lg-10">
<form name="pwd" class="form-validation">
<div class="form-group">
<p><strong>旧密码:</strong>
<label ng-show="pwd.password.$error.required &&
pwd.password.$touched" class="text-danger">旧密码不可为空</label>
<label ng-show="(pwd.password.$error.minlength||
pwd.password.$error.maxlength) && pwd.password.$touched" class="text-danger">密码应在6-16位之间</label>
</p>
<input type="text"
name="password"
class="form-control"
ng-model="password"
ng-minlength="6"
ng-maxlength="16"
placeholder="请输入旧密码"
width="50%"
required/>
</div>
<div class="form-group">
<p><strong>新密码:</strong>
<label ng-show="pwd.newPwd.$error.required &&
pwd.newPwd.$touched" class="text-danger">新密码不可为空</label>
<label ng-show="(pwd.newPwd.$error.minlength||
pwd.newPwd.$error.maxlength) && pwd.newPwd.$touched" class="text-danger">密码应在6-16位之间</label>
</p>
<input type="password"
name="newPwd"
class="form-control"
ng-model="newPwd"
ng-minlength="6"
ng-maxlength="16"
placeholder="请输入新密码"
width="50%"
required/>
</div>
<div class="form-group">
<p> <strong>确认密码:</strong>
<label ng-show="pwd.confirmPwd.$error.required &&
pwd.confirmPwd.$touched" class="text-danger">确认密码不可为空</label>
<label>
<label ng-show="newPwd!=confirmPwd" class="text-danger">两次密码输入不一致</label>
</label>
</p>
<input type="password"
name="confirmPwd"
class="form-control"
ng-model="confirmPwd"
placeholder="请输入确认密码"
width="50%"
required/>
</div>
</form>
</div>
</div>
<div class="row">
<div class="form-group" style="padding-left:15px;">
<input data-loading-text="loading..." style="width: 100px;" class="btn btn-primary" type="submit" ng-click="updPassword(password,newPwd)" value="提 交"/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
src/main/resources/static/views/updatePass/updatePass.js 0 → 100644
View file @ a5a87cd0
'use strict';
angular.module('AvatarCheck.updatePass', ['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function($routeProvider) {
$routeProvider.when('/updatePass', {
templateUrl: 'views/updatePass/updatePass.html' + urlTimeStamp(),
controller: 'updatePassCtrl',
cache:false
});
}])
.controller('updatePassCtrl',function($scope,HttpService,MessageService) {
$scope.updPassword = function (password,newPwd) {
HttpService.updatePass(password,newPwd,function(data){
console.log(data)
if(data.string=='-1'){
MessageService.showAlert("旧密码输入有误，请重新输入");
}
if(data.string=='0'){
MessageService.showAlert("修改失败");
}
if(data.string=='1'){
MessageService.showAlertAndLogout("修改成功，请重新登录");
}
})
}
});
\ 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