Skip to content

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

push

parent f97ca76b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 301 additions and 266 deletions
src/main/java/com/yxproject/start/api/CardDetailedListApi.java
View file @ 7ba0b811
...@@ -24,11 +24,12 @@ public class CardDetailedListApi { ...@@ -24,11 +24,12 @@ public class CardDetailedListApi {
@Autowired @Autowired
private CardDetailedListService cardDetailedListService; private CardDetailedListService cardDetailedListService;
Logger logger= Logger.getLogger(CardDetailedListApi.class); Logger logger = Logger.getLogger(CardDetailedListApi.class);
/** /**
* 查询身份证详单 * 查询身份证详单
*通过身份证号 * 通过身份证号
*
* @param idCard 查询身份证详单 * @param idCard 查询身份证详单
* @return * @return
*/ */
...@@ -37,9 +38,9 @@ public class CardDetailedListApi { ...@@ -37,9 +38,9 @@ public class CardDetailedListApi {
String remoteAddr = requ.getRemoteAddr(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
List<DetailReceiptListEntity> list = new ArrayList<DetailReceiptListEntity>(); List<DetailReceiptListEntity> list = new ArrayList<DetailReceiptListEntity>();
try{ try {
list = cardDetailedListService.findCardDetailedListByIdCard(idCard); list = cardDetailedListService.findCardDetailedListByIdCard(idCard);
} catch (Exception e){ } catch (Exception e) {
logger.error("身份证号：" + idCard); logger.error("身份证号：" + idCard);
logger.error("Exception 通过身份证号查询身份证详单异常", e); logger.error("Exception 通过身份证号查询身份证详单异常", e);
} }
...@@ -49,18 +50,19 @@ public class CardDetailedListApi { ...@@ -49,18 +50,19 @@ public class CardDetailedListApi {
/** /**
* 查询所有的身份证详单 * 查询所有的身份证详单
*通过身份证号 * 通过身份证号
*
* @param idCard 查询身份证详单 * @param idCard 查询身份证详单
* @return * @return
*/ */
@RequestMapping("findAllCardDetailedList") @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
List<Map<String,Object>> list = new ArrayList <>(); List<Map<String, Object>> list = new ArrayList<>();
try{ try {
list = cardDetailedListService.findAllCardDetailedListByIdCard(idCard); list = cardDetailedListService.findAllCardDetailedListByIdCard(idCard);
} catch (Exception e){ } catch (Exception e) {
logger.error("身份证号：" + idCard); logger.error("身份证号：" + idCard);
logger.error("Exception 通过身份证号查询所有的身份证详单异常", e); logger.error("Exception 通过身份证号查询所有的身份证详单异常", e);
} }
...@@ -68,5 +70,4 @@ public class CardDetailedListApi { ...@@ -68,5 +70,4 @@ public class CardDetailedListApi {
} }
} }
src/main/java/com/yxproject/start/api/ExportExcelApi.java
View file @ 7ba0b811
...@@ -32,7 +32,7 @@ public class ExportExcelApi { ...@@ -32,7 +32,7 @@ public class ExportExcelApi {
@Autowired @Autowired
private ReceiptService receiptService; private ReceiptService receiptService;
Logger logger= Logger.getLogger(ExportExcelApi.class); Logger logger = Logger.getLogger(ExportExcelApi.class);
/** /**
* 导出公安网数据 * 导出公安网数据
...@@ -45,7 +45,7 @@ public class ExportExcelApi { ...@@ -45,7 +45,7 @@ public class ExportExcelApi {
JSONArray jsonArray = JSONArray.fromObject(jsonObject.get("list")); JSONArray jsonArray = JSONArray.fromObject(jsonObject.get("list"));
String isHistory = jsonObject.get("isHistory").toString(); String isHistory = jsonObject.get("isHistory").toString();
String name = jsonObject.get("name").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.setContentType("application/x-download");
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
String dateTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd"); String dateTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd");
...@@ -71,6 +71,7 @@ public class ExportExcelApi { ...@@ -71,6 +71,7 @@ public class ExportExcelApi {
} }
return null; return null;
} }
/** /**
* 导出交接单 * 导出交接单
*/ */
...@@ -83,10 +84,10 @@ public class ExportExcelApi { ...@@ -83,10 +84,10 @@ public class ExportExcelApi {
String type = null; String type = null;
Map<String, Object> map = null; Map<String, Object> map = null;
try { try {
jsonObject=JSONObject.fromObject(list); jsonObject = JSONObject.fromObject(list);
type=jsonObject.get("type").toString(); type = jsonObject.get("type").toString();
jsonArray=JSONArray.fromObject(jsonObject.get("list")); jsonArray = JSONArray.fromObject(jsonObject.get("list"));
map=receiptService.selectReceiptList(jsonArray, Long.valueOf(type)); map = receiptService.selectReceiptList(jsonArray, Long.valueOf(type));
// response.setContentType("application/x-download"); // response.setContentType("application/x-download");
// response.setCharacterEncoding("UTF-8"); // response.setCharacterEncoding("UTF-8");
// String dateTime = DateFormatUtils.format(new Date(), "yyyy_MM_dd"); // String dateTime = DateFormatUtils.format(new Date(), "yyyy_MM_dd");
...@@ -110,7 +111,7 @@ public class ExportExcelApi { ...@@ -110,7 +111,7 @@ public class ExportExcelApi {
// e.printStackTrace(); // e.printStackTrace();
// } // }
// return null; // return null;
}catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("异常参数：" + jsonObject); logger.error("异常参数：" + jsonObject);
logger.error("Exception 导出交接单异常", e); logger.error("Exception 导出交接单异常", e);
......
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ 7ba0b811
...@@ -42,7 +42,7 @@ public class ExportXMLApi { ...@@ -42,7 +42,7 @@ public class ExportXMLApi {
@Autowired @Autowired
private FilesService filesService; 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 @ 7ba0b811
...@@ -35,7 +35,7 @@ public class FailedCardApi { ...@@ -35,7 +35,7 @@ public class FailedCardApi {
@Autowired @Autowired
private TaskListService taskListService; private TaskListService taskListService;
Logger logger= Logger.getLogger(FailedCardApi.class); Logger logger = Logger.getLogger(FailedCardApi.class);
/** /**
* 查询所有废证类型 * 查询所有废证类型
...@@ -46,10 +46,10 @@ public class FailedCardApi { ...@@ -46,10 +46,10 @@ public class FailedCardApi {
public List<FailedCardReasonDicEntity> selectFailedCardDic(HttpServletRequest requ) { public List<FailedCardReasonDicEntity> selectFailedCardDic(HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
List<FailedCardReasonDicEntity> resultList = new ArrayList <FailedCardReasonDicEntity>(); List<FailedCardReasonDicEntity> resultList = new ArrayList<FailedCardReasonDicEntity>();
try { try {
resultList = failedCardService.selectFailedCardDic(); resultList = failedCardService.selectFailedCardDic();
}catch (Exception e){ } catch (Exception e) {
logger.error("Exception 查询所有废证类型异常", e); logger.error("Exception 查询所有废证类型异常", e);
} }
return resultList; return resultList;
...@@ -70,7 +70,7 @@ public class FailedCardApi { ...@@ -70,7 +70,7 @@ public class FailedCardApi {
try { try {
jsonarray = JSONArray.fromObject(jsonStr); jsonarray = JSONArray.fromObject(jsonStr);
for (Object o : jsonarray) { 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); Map<String, Object> resultMap = failedCardService.selectInfoByCardId(acceptNo);
if (resultMap == null) { if (resultMap == null) {
resultMap = new LinkedHashMap<>(); resultMap = new LinkedHashMap<>();
...@@ -80,7 +80,7 @@ public class FailedCardApi { ...@@ -80,7 +80,7 @@ public class FailedCardApi {
} }
resultList.add(resultMap); resultList.add(resultMap);
} }
}catch (Exception e){ } catch (Exception e) {
logger.error("身份证号或受理号：" + jsonarray); logger.error("身份证号或受理号：" + jsonarray);
logger.error("Exception 根据身份证号或受理号查询身份信息及组号异常", e); logger.error("Exception 根据身份证号或受理号查询身份信息及组号异常", e);
} }
...@@ -89,24 +89,26 @@ public class FailedCardApi { ...@@ -89,24 +89,26 @@ public class FailedCardApi {
/** /**
* 查询提交人上传的废证详情 * 查询提交人上传的废证详情
* @param date 提交日期 *
* @param name 提交人姓名 * @param date 提交日期
* @param name 提交人姓名
* @param startDate 提交起始日期 * @param startDate 提交起始日期
* @param endDate 提交结束日期 * @param endDate 提交结束日期
* @param requ * @param requ
* @return * @return
*/ */
@RequestMapping("queryFailedCardInfo") @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
List<Map<String, Object>> failedCardEntities = new ArrayList <>(); List<Map<String, Object>> failedCardEntities = new ArrayList<>();
failedCardEntities = failedCardService.selectFailedCardInfo(replaceDate(startDate),replaceDate(endDate), replaceNullString(name)); failedCardEntities = failedCardService.selectFailedCardInfo(replaceDate(startDate), replaceDate(endDate), replaceNullString(name));
return failedCardEntities; return failedCardEntities;
} }
/** /**
* 删除提交人上传的废证详情 * 删除提交人上传的废证详情
*
* @param failedCardId 废证ID * @param failedCardId 废证ID
* @return * @return
*/ */
...@@ -117,7 +119,7 @@ public class FailedCardApi { ...@@ -117,7 +119,7 @@ public class FailedCardApi {
boolean failedCardInfo = true; boolean failedCardInfo = true;
try { try {
failedCardInfo = failedCardService.deleteFailedCardInfo(failedCardId); failedCardInfo = failedCardService.deleteFailedCardInfo(failedCardId);
}catch (Exception e){ } catch (Exception e) {
logger.error("废证ID：" + failedCardId); logger.error("废证ID：" + failedCardId);
logger.error("Exception 删除提交人上传的废证详情异常", e); logger.error("Exception 删除提交人上传的废证详情异常", e);
} }
...@@ -137,7 +139,7 @@ public class FailedCardApi { ...@@ -137,7 +139,7 @@ public class FailedCardApi {
String remoteAddr = requ.getRemoteAddr(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
JSONArray jsonarray = new JSONArray(); JSONArray jsonarray = new JSONArray();
try{ try {
jsonarray = JSONArray.fromObject(jsonStr); jsonarray = JSONArray.fromObject(jsonStr);
for (Object o : jsonarray) { for (Object o : jsonarray) {
JSONObject jsonObject = (JSONObject) o; JSONObject jsonObject = (JSONObject) o;
...@@ -154,7 +156,7 @@ public class FailedCardApi { ...@@ -154,7 +156,7 @@ public class FailedCardApi {
int initiator = 5; 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); 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("身份证号或受理号：" + jsonarray);
logger.error("Exception 添加废证异常", e); logger.error("Exception 添加废证异常", e);
} }
...@@ -183,7 +185,7 @@ public class FailedCardApi { ...@@ -183,7 +185,7 @@ public class FailedCardApi {
taskEntity = new TaskEntity(); taskEntity = new TaskEntity();
for (int i = 0; i < jsonarray.size(); i++) { for (int i = 0; i < jsonarray.size(); i++) {
/*查询生成任务单需要的数据*/ /*查询生成任务单需要的数据*/
Map<String, Object> resultMap = failedCardService.selectTaskListDate((String) jsonarray.get(i)); Map<String, Object> resultMap = failedCardService.selectTaskListDate((String) jsonarray.get(i));
String countyCode = resultMap.get("COUNTY_CODE").toString(); String countyCode = resultMap.get("COUNTY_CODE").toString();
Long cardType = Long.valueOf((BigDecimal) resultMap.get("CARD_TYPE") + ""); Long cardType = Long.valueOf((BigDecimal) resultMap.get("CARD_TYPE") + "");
...@@ -197,11 +199,11 @@ public class FailedCardApi { ...@@ -197,11 +199,11 @@ public class FailedCardApi {
} else { } else {
taskEntity.setWorkGroup(Long.valueOf(resultMap.get("WORK_GROUP") + "")); taskEntity.setWorkGroup(Long.valueOf(resultMap.get("WORK_GROUP") + ""));
} }
/*特证数+1*/ /*特证数+1*/
failedCardService.specialCardAdd(acceptNo); failedCardService.specialCardAdd(acceptNo);
/*生成新任务单*/ /*生成新任务单*/
taskListService.saveTask(taskEntity); taskListService.saveTask(taskEntity);
/*特证表添加特证*/ /*特证表添加特证*/
SpecialCardEntity specialCardEntity = new SpecialCardEntity(); SpecialCardEntity specialCardEntity = new SpecialCardEntity();
specialCardEntity.setAcceptNo(acceptNo); specialCardEntity.setAcceptNo(acceptNo);
specialCardEntity.setInitiator(name); specialCardEntity.setInitiator(name);
...@@ -209,7 +211,7 @@ public class FailedCardApi { ...@@ -209,7 +211,7 @@ public class FailedCardApi {
specialCardEntity.setGroupNo(acceptNo.substring(0, 8)); specialCardEntity.setGroupNo(acceptNo.substring(0, 8));
failedCardService.addSpecialCard(specialCardEntity); failedCardService.addSpecialCard(specialCardEntity);
} }
}catch (Exception e){ } catch (Exception e) {
logger.error("身份证号或受理号：" + jsonObject); logger.error("身份证号或受理号：" + jsonObject);
logger.error("Exception 生成余证异常", e); logger.error("Exception 生成余证异常", e);
} }
...@@ -225,10 +227,10 @@ public class FailedCardApi { ...@@ -225,10 +227,10 @@ public class FailedCardApi {
public List<String> selectCardType(HttpServletRequest requ) { public List<String> selectCardType(HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
List<String> result = new ArrayList <>(); List<String> result = new ArrayList<>();
try { try {
result = failedCardService.selectCardType(); result = failedCardService.selectCardType();
}catch (Exception e){ } catch (Exception e) {
logger.error("Exception 查询所有证件类型异常", e); logger.error("Exception 查询所有证件类型异常", e);
} }
return result; return result;
...@@ -285,6 +287,7 @@ public class FailedCardApi { ...@@ -285,6 +287,7 @@ public class FailedCardApi {
} }
return true; return true;
} }
/** /**
* 去除字符串中中线 * 去除字符串中中线
* *
...@@ -292,17 +295,19 @@ public class FailedCardApi { ...@@ -292,17 +295,19 @@ public class FailedCardApi {
* @return * @return
*/ */
private String replaceDate(String str) { private String replaceDate(String str) {
return str.replace("-", "").replace(" ","").replace(":",""); return str.replace("-", "").replace(" ", "").replace(":", "");
} }
/** /**
* 格式化受理组号 * 格式化受理组号
*
* @param acceptNo * @param acceptNo
* @return * @return
*/ */
private String formateAcceptNo(String acceptNo){ private String formateAcceptNo(String acceptNo) {
return acceptNo.replace("e", "E").replace("g", "G").replace("l","L"); return acceptNo.replace("e", "E").replace("g", "G").replace("l", "L");
} }
/** /**
* 字符串去除空格 * 字符串去除空格
* *
......
src/main/java/com/yxproject/start/api/FilesAnalysisApi.java
View file @ 7ba0b811
...@@ -14,23 +14,24 @@ import javax.servlet.http.HttpServletRequest; ...@@ -14,23 +14,24 @@ import javax.servlet.http.HttpServletRequest;
@RequestMapping("FilesAnalysis") @RequestMapping("FilesAnalysis")
public class FilesAnalysisApi { public class FilesAnalysisApi {
@Autowired @Autowired
private PersonPostService personPostService; private PersonPostService personPostService;
Logger logger= Logger.getLogger(FilesAnalysisApi.class); Logger logger = Logger.getLogger(FilesAnalysisApi.class);
/** /**
* 文件解析 修改解析状态 * 文件解析 修改解析状态
*
* @param fileId * @param fileId
* @param creatTime * @param creatTime
* @return * @return
*/ */
@RequestMapping("anailsis") @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
try { try {
personPostService.updateIsPost(fileId,creatTime); personPostService.updateIsPost(fileId, creatTime);
}catch (Exception e){ } catch (Exception e) {
logger.error("文件ID：" + fileId + "生成时间：" + creatTime); logger.error("文件ID：" + fileId + "生成时间：" + creatTime);
logger.error("Exception 文件解析 修改解析状态异常", e); logger.error("Exception 文件解析 修改解析状态异常", e);
} }
......
src/main/java/com/yxproject/start/api/GreenPackageInformationApi.java
View file @ 7ba0b811
...@@ -21,24 +21,26 @@ public class GreenPackageInformationApi { ...@@ -21,24 +21,26 @@ public class GreenPackageInformationApi {
/** /**
* 查询提交的绿包信息表 * 查询提交的绿包信息表
*
* @param startDate 起始时间 * @param startDate 起始时间
* @param endDate 截至时间 * @param endDate 截至时间
* @param name 查询人姓名 * @param name 查询人姓名
* @return * @return
*/ */
@RequestMapping("queryGreenPackageInformationFile") @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)); List<GreenPackageInformationFileEntity> greenPackageInformationFileEntities = greenPackageInformationService.selectGreenPackageInformationFileEntity(replaceDate(startDate), replaceDate(endDate), replaceNullString(name));
return greenPackageInformationFileEntities; return greenPackageInformationFileEntities;
} }
/** /**
* 删除提交的绿包信息表 * 删除提交的绿包信息表
* @param id 流水号 *
* @param id 流水号
* @return * @return
*/ */
@RequestMapping("deleteGreenPackageInformationFile") @RequestMapping("deleteGreenPackageInformationFile")
public boolean deleteGreenPackageInformationFileEntity(@RequestParam("id") String id ){ public boolean deleteGreenPackageInformationFileEntity(@RequestParam("id") String id) {
boolean b = greenPackageInformationService.deleteGreenPackageInformationFileEntity(id); boolean b = greenPackageInformationService.deleteGreenPackageInformationFileEntity(id);
return b; return b;
} }
......
src/main/java/com/yxproject/start/api/InfoManagementApi.java
View file @ 7ba0b811
...@@ -21,10 +21,11 @@ public class InfoManagementApi { ...@@ -21,10 +21,11 @@ public class InfoManagementApi {
@Autowired @Autowired
private InfoManagementService infoManagementService; private InfoManagementService infoManagementService;
Logger logger= Logger.getLogger(InfoManagementApi.class); Logger logger = Logger.getLogger(InfoManagementApi.class);
/** /**
* 按条件查询制证信息数据 * 按条件查询制证信息数据
*
* @param beginFileName * @param beginFileName
* @param endFileName * @param endFileName
* @param gajgMc * @param gajgMc
...@@ -35,13 +36,13 @@ public class InfoManagementApi { ...@@ -35,13 +36,13 @@ public class InfoManagementApi {
* @return * @return
*/ */
@RequestMapping("selectInfoManagement") @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
List<NewFilesEntity> resultList = new ArrayList<NewFilesEntity>(); List<NewFilesEntity> resultList = new ArrayList<NewFilesEntity>();
try { try {
infoManagementService.selectInfoManagement(beginFileName, endFileName, gajgMc, replaceDate(beginDate), replaceDate(endDate), Long.valueOf(currPage),Long.valueOf(pageSize)); infoManagementService.selectInfoManagement(beginFileName, endFileName, gajgMc, replaceDate(beginDate), replaceDate(endDate), Long.valueOf(currPage), Long.valueOf(pageSize));
}catch (Exception e){ } catch (Exception e) {
logger.error("起始文件名：" + beginFileName + "截止文件名：" + endFileName + "公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate + "页数：" + currPage + "行数：" + pageSize); logger.error("起始文件名：" + beginFileName + "截止文件名：" + endFileName + "公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate + "页数：" + currPage + "行数：" + pageSize);
logger.error("Exception 按条件查询制证信息数据异常", e); logger.error("Exception 按条件查询制证信息数据异常", e);
} }
...@@ -51,22 +52,23 @@ public class InfoManagementApi { ...@@ -51,22 +52,23 @@ public class InfoManagementApi {
/** /**
* 查询制证信息数据条数 * 查询制证信息数据条数
*
* @param beginFileId 开始包号 * @param beginFileId 开始包号
* @param endFileId 结束包号 * @param endFileId 结束包号
* @param gajgMc 派出所代码 * @param gajgMc 派出所代码
* @param beginDate 开始时间 * @param beginDate 开始时间
* @param endDate 结束时间 * @param endDate 结束时间
* @return * @return
*/ */
@RequestMapping("selectCount") @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
long count= 0; long count = 0;
try { try {
count = infoManagementService.count(beginFileId,endFileId,gajgMc,replaceDate(beginDate),replaceDate(endDate)); count = infoManagementService.count(beginFileId, endFileId, gajgMc, replaceDate(beginDate), replaceDate(endDate));
}catch (Exception e){ } catch (Exception e) {
logger.error( "公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate); logger.error("公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate);
logger.error("Exception 查询制证信息数据条数异常", e); logger.error("Exception 查询制证信息数据条数异常", e);
} }
return count; return count;
...@@ -74,6 +76,7 @@ public class InfoManagementApi { ...@@ -74,6 +76,7 @@ public class InfoManagementApi {
/** /**
* 删除制证信息数据 * 删除制证信息数据
*
* @param beginFileName * @param beginFileName
* @param endFileName * @param endFileName
* @param gajgMc * @param gajgMc
...@@ -83,15 +86,15 @@ public class InfoManagementApi { ...@@ -83,15 +86,15 @@ public class InfoManagementApi {
*/ */
@RequestMapping("deleteInfo") @RequestMapping("deleteInfo")
@Transactional(rollbackFor = Exception.class) @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
boolean result = true; boolean result = true;
try { 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)); infoManagementService.updatePackageNo(beginFileName, endFileName, gajgMc, replaceDate(beginDate), replaceDate(endDate));
}catch (Exception e){ } catch (Exception e) {
logger.error("起始文件名：" + beginFileName + "截止文件名：" + endFileName + "公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate); logger.error("起始文件名：" + beginFileName + "截止文件名：" + endFileName + "公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate);
logger.error("Exception 删除制证信息数据异常", e); logger.error("Exception 删除制证信息数据异常", e);
} }
...@@ -105,7 +108,7 @@ public class InfoManagementApi { ...@@ -105,7 +108,7 @@ public class InfoManagementApi {
* @return * @return
*/ */
private String replaceDate(String str) { private String replaceDate(String str) {
return str.replace("-", "").replace(" ","").replace(":",""); return str.replace("-", "").replace(" ", "").replace(":", "");
} }
} }
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ 7ba0b811
...@@ -42,7 +42,7 @@ public class ReadExcelApi { ...@@ -42,7 +42,7 @@ public class ReadExcelApi {
@Autowired @Autowired
FileNameDicService fileNameDicService; FileNameDicService fileNameDicService;
Logger logger= Logger.getLogger(ReadExcelApi.class); Logger logger = Logger.getLogger(ReadExcelApi.class);
/** /**
* 导入个人邮寄信息表 * 导入个人邮寄信息表
...@@ -51,7 +51,7 @@ public class ReadExcelApi { ...@@ -51,7 +51,7 @@ public class ReadExcelApi {
@Consumes(MediaType.MULTIPART_FORM_DATA) @Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean ReadPersonPost(@RequestParam("formStartTime") String startDate,@RequestParam("formDeadLine") String endDate, HttpServletResponse resp, HttpServletRequest requ) { public boolean ReadPersonPost(@RequestParam("formStartTime") String startDate, @RequestParam("formDeadLine") String endDate, HttpServletResponse resp, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
YXJSONResponse yxresp = new YXJSONResponse(); YXJSONResponse yxresp = new YXJSONResponse();
...@@ -81,7 +81,7 @@ public class ReadExcelApi { ...@@ -81,7 +81,7 @@ public class ReadExcelApi {
Iterator<String> iter = multiRequest.getFileNames(); Iterator<String> iter = multiRequest.getFileNames();
while (iter.hasNext()) { while (iter.hasNext()) {
List<MultipartFile> fileRows = multiRequest.getFiles(iter.next().toString()); List<MultipartFile> fileRows = multiRequest.getFiles(iter.next().toString());
for (MultipartFile item :fileRows){ for (MultipartFile item : fileRows) {
try { try {
// 如果fileitem中封装的是普通输入项的数据 // 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件 // 如果fileitem中封装的是上传文件
...@@ -91,7 +91,7 @@ public class ReadExcelApi { ...@@ -91,7 +91,7 @@ public class ReadExcelApi {
// 如果fileitem中封装的是普通输入项的数据 // 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件 // 如果fileitem中封装的是上传文件
// 得到上传的文件名称 // 得到上传的文件名称
filename = item.getOriginalFilename(); filename = item.getOriginalFilename();
File file = null; File file = null;
try { try {
file = File.createTempFile("prefix", "_" + item.getOriginalFilename()); file = File.createTempFile("prefix", "_" + item.getOriginalFilename());
...@@ -109,7 +109,7 @@ public class ReadExcelApi { ...@@ -109,7 +109,7 @@ public class ReadExcelApi {
fileNameDicEntity.setUploadDate(simpleDateFormat.format(new Date())); fileNameDicEntity.setUploadDate(simpleDateFormat.format(new Date()));
fileNameDicEntity.setFormStartTime(replaceDate(startDate)); fileNameDicEntity.setFormStartTime(replaceDate(startDate));
fileNameDicEntity.setFormDeadline(replaceDate(endDate)); fileNameDicEntity.setFormDeadline(replaceDate(endDate));
fileNameDicEntity.setState((long)0); fileNameDicEntity.setState((long) 0);
fileNameDicService.saveFileNameDic(fileNameDicEntity); fileNameDicService.saveFileNameDic(fileNameDicEntity);
//保存个人邮寄信息 //保存个人邮寄信息
List<PersonPostEntity> entityList = new ArrayList<>(); List<PersonPostEntity> entityList = new ArrayList<>();
...@@ -143,7 +143,7 @@ public class ReadExcelApi { ...@@ -143,7 +143,7 @@ public class ReadExcelApi {
personPostEntity.setLatticeMouthInformation((String) list2.get(19)); personPostEntity.setLatticeMouthInformation((String) list2.get(19));
personPostEntity.setNatureOfTheInternal((String) list2.get(20)); personPostEntity.setNatureOfTheInternal((String) list2.get(20));
personPostEntity.setNatureOfTheInformation((String) list2.get(21)); personPostEntity.setNatureOfTheInformation((String) list2.get(21));
personPostEntity.setFirstWhite(list2.get(22).toString().substring(5,27 ) ); personPostEntity.setFirstWhite(list2.get(22).toString().substring(5, 27));
personPostEntity.setFileId(fileNameDicEntity.getFileId()); personPostEntity.setFileId(fileNameDicEntity.getFileId());
entityList.add(personPostEntity); entityList.add(personPostEntity);
} }
...@@ -169,10 +169,10 @@ public class ReadExcelApi { ...@@ -169,10 +169,10 @@ public class ReadExcelApi {
} }
} }
} }
}catch (Exception e){ } catch (Exception e) {
logger.error("上传文件名" + filename + "起始时间" + startDate + "截止时间" + endDate); logger.error("上传文件名" + filename + "起始时间" + startDate + "截止时间" + endDate);
logger.error("Exception 导入个人邮寄信息表异常", e); logger.error("Exception 导入个人邮寄信息表异常", e);
}finally { } finally {
} }
return true; return true;
...@@ -180,21 +180,22 @@ public class ReadExcelApi { ...@@ -180,21 +180,22 @@ public class ReadExcelApi {
/** /**
* 查询个人邮寄解析信息 * 查询个人邮寄解析信息
* @param fileName 文件名称 *
* @param fileName 文件名称
* @param analysisState 解析状态 * @param analysisState 解析状态
* @param currPage 当前页 * @param currPage 当前页
* @param pageSize 每页数量 * @param pageSize 每页数量
* @return * @return
*/ */
@RequestMapping("queryPersonPost") @RequestMapping("queryPersonPost")
public String queryPersonPost(@RequestParam("fileName") String fileName,@RequestParam("analysisState") String analysisState,@RequestParam("uploadDate") String uploadDate, @RequestParam("currPage") String currPage,@RequestParam("pageSize") String pageSize, HttpServletRequest requ) { public String queryPersonPost(@RequestParam("fileName") String fileName, @RequestParam("analysisState") String analysisState, @RequestParam("uploadDate") String uploadDate, @RequestParam("currPage") String currPage, @RequestParam("pageSize") String pageSize, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
try { try {
List<FileNameDicEntity> fileNameDicEntities = fileNameDicService.queryFileNameDic(replaceDate(uploadDate),replaceNullString(fileName), Long.valueOf(analysisState), Long.valueOf(currPage), Long.valueOf(pageSize)); List<FileNameDicEntity> fileNameDicEntities = fileNameDicService.queryFileNameDic(replaceDate(uploadDate), replaceNullString(fileName), Long.valueOf(analysisState), Long.valueOf(currPage), Long.valueOf(pageSize));
yxjsonResponse.outPutSuccess(fileNameDicEntities); yxjsonResponse.outPutSuccess(fileNameDicEntities);
}catch (Exception e){ } catch (Exception e) {
logger.error("文件名：" + fileName + "是否解析1-解析，0-未解析：" + analysisState + "上传时间：" + uploadDate + "页数：" + currPage + "条数：" + pageSize); logger.error("文件名：" + fileName + "是否解析1-解析，0-未解析：" + analysisState + "上传时间：" + uploadDate + "页数：" + currPage + "条数：" + pageSize);
logger.error("Exception 查询个人邮寄解析信息异常", e); logger.error("Exception 查询个人邮寄解析信息异常", e);
} }
...@@ -203,19 +204,20 @@ public class ReadExcelApi { ...@@ -203,19 +204,20 @@ public class ReadExcelApi {
/** /**
* 查询个人邮寄解析信息总数量 * 查询个人邮寄解析信息总数量
* @param fileName 文件名称 *
* @param fileName 文件名称
* @param analysisState 解析状态 * @param analysisState 解析状态
* @return * @return
*/ */
@RequestMapping("queryPersonPostCount") @RequestMapping("queryPersonPostCount")
public String queryPersonPostCount(@RequestParam("fileName") String fileName,@RequestParam("analysisState") String analysisState,@RequestParam("uploadDate") String uploadDate, HttpServletRequest requ) { public String queryPersonPostCount(@RequestParam("fileName") String fileName, @RequestParam("analysisState") String analysisState, @RequestParam("uploadDate") String uploadDate, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
try { try {
int i = fileNameDicService.queryFileNameDicCount(replaceDate(uploadDate),replaceNullString(fileName), Long.valueOf(analysisState)); int i = fileNameDicService.queryFileNameDicCount(replaceDate(uploadDate), replaceNullString(fileName), Long.valueOf(analysisState));
yxjsonResponse.outPutSuccess(i+""); yxjsonResponse.outPutSuccess(i + "");
}catch (Exception e){ } catch (Exception e) {
logger.error("文件名：" + fileName + "是否解析1-解析，0-未解析：" + analysisState + "上传时间：" + uploadDate); logger.error("文件名：" + fileName + "是否解析1-解析，0-未解析：" + analysisState + "上传时间：" + uploadDate);
logger.error("Exception 查询个人邮寄解析信息总数量异常", e); logger.error("Exception 查询个人邮寄解析信息总数量异常", e);
} }
...@@ -224,32 +226,33 @@ public class ReadExcelApi { ...@@ -224,32 +226,33 @@ public class ReadExcelApi {
@RequestMapping("deleteByFileId") @RequestMapping("deleteByFileId")
public Map<String,String> deleteFileById(@RequestParam("fileId")String fileId, HttpServletRequest requ) { public Map<String, String> deleteFileById(@RequestParam("fileId") String fileId, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
Map<String,String> map = null; Map<String, String> map = null;
try { try {
map = new HashMap<>(); map = new HashMap<>();
fileNameDicService.deleteFileByFileId(fileId); fileNameDicService.deleteFileByFileId(fileId);
map.put("msg","删除成功"); map.put("msg", "删除成功");
}catch (Exception e){ } catch (Exception e) {
logger.error("文件名：" + fileId); logger.error("文件名：" + fileId);
logger.error("Exception 通过file_ID删除个人邮寄解析信息异常", e); logger.error("Exception 通过file_ID删除个人邮寄解析信息异常", e);
} }
return map; return map;
} }
private String replaceDate(String str){ private String replaceDate(String str) {
return str.replace("-",""); return str.replace("-", "");
} }
/** /**
* 字符串去除空格 * 字符串去除空格
*
* @param str 原始字符串 * @param str 原始字符串
* @return 返回新的字符串 * @return 返回新的字符串
*/ */
private String replaceNullString(String str) { private String replaceNullString(String str) {
if (str == ""){ if (str == "") {
return null; return null;
} else return str; } else return str;
} }
......
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ 7ba0b811
...@@ -440,7 +440,7 @@ public class ReceiptApi { ...@@ -440,7 +440,7 @@ public class ReceiptApi {
/** /**
* 查询分局名称 * 查询分局名称
* *
* @param qrCode 派出所代码 * @param policeCode 派出所代码
* @return * @return
*/ */
@RequestMapping("queryPoliceName") @RequestMapping("queryPoliceName")
...@@ -456,9 +456,7 @@ public class ReceiptApi { ...@@ -456,9 +456,7 @@ public class ReceiptApi {
} }
return policeName; 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 @ 7ba0b811
...@@ -30,23 +30,24 @@ public class ReportApi { ...@@ -30,23 +30,24 @@ public class ReportApi {
@Autowired @Autowired
private ReceiptService receiptService; private ReceiptService receiptService;
Logger logger= Logger.getLogger(ReportApi.class); Logger logger = Logger.getLogger(ReportApi.class);
/** /**
* 查询报表 * 查询报表
* 数据核验 * 数据核验
*
* @param startDate 开始时间 * @param startDate 开始时间
* @param endDate 结束时间 * @param endDate 结束时间
* @return * @return
*/ */
@RequestMapping("queryDataAuditingReport") @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>(); List<Map<String, Object>> mapList = new ArrayList<>();
try { try {
mapList = dataAuditingService.selectDataAuditingReport(replaceDate(startDate), replaceDate(endDate),policeName,policeCode); mapList = dataAuditingService.selectDataAuditingReport(replaceDate(startDate), replaceDate(endDate), policeName, policeCode);
}catch (Exception e){ } catch (Exception e) {
logger.error("开始时间：" + startDate + "结束时间：" + endDate + "公安机关名称：" + policeName + "公安机关代码：" + policeCode); logger.error("开始时间：" + startDate + "结束时间：" + endDate + "公安机关名称：" + policeName + "公安机关代码：" + policeCode);
logger.error("Exception 查询数据核验报表异常", e); logger.error("Exception 查询数据核验报表异常", e);
} }
...@@ -56,18 +57,19 @@ public class ReportApi { ...@@ -56,18 +57,19 @@ public class ReportApi {
/** /**
* 查询报表 * 查询报表
* 膜打印 * 膜打印
*
* @param startDate 开始时间 * @param startDate 开始时间
* @param endDate 结束时间 * @param endDate 结束时间
* @return * @return
*/ */
@RequestMapping("queryFilmPrintReport") @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>(); List<Map<String, Object>> mapList = new ArrayList<>();
try { try {
mapList = taskListService.selectFilmReport(replaceDate(startDate), replaceDate(endDate)); mapList = taskListService.selectFilmReport(replaceDate(startDate), replaceDate(endDate));
}catch (Exception e){ } catch (Exception e) {
logger.error("开始时间：" + startDate + "结束时间：" + endDate); logger.error("开始时间：" + startDate + "结束时间：" + endDate);
logger.error("Exception 查询膜打印报表异常", e); logger.error("Exception 查询膜打印报表异常", e);
} }
...@@ -77,19 +79,20 @@ public class ReportApi { ...@@ -77,19 +79,20 @@ public class ReportApi {
/** /**
* 查询报表 * 查询报表
* 工作组 * 工作组
*
* @param startDate 开始时间 * @param startDate 开始时间
* @param endDate 结束时间 * @param endDate 结束时间
* @param workGroup 工作组 * @param workGroup 工作组
* @return * @return
*/ */
@RequestMapping("queryWorkGroupReport") @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>(); List<Map<String, Object>> mapList = new ArrayList<>();
try { try {
mapList = taskListService.selectWorkGroupReport(replaceDate(startDate), replaceDate(endDate), workGroup); mapList = taskListService.selectWorkGroupReport(replaceDate(startDate), replaceDate(endDate), workGroup);
}catch (Exception e){ } catch (Exception e) {
logger.error("开始时间：" + startDate + "结束时间：" + endDate + "工作组：" + workGroup); logger.error("开始时间：" + startDate + "结束时间：" + endDate + "工作组：" + workGroup);
logger.error("Exception 查询工作组报表异常", e); logger.error("Exception 查询工作组报表异常", e);
} }
...@@ -99,19 +102,20 @@ public class ReportApi { ...@@ -99,19 +102,20 @@ public class ReportApi {
/** /**
* 查询报表 * 查询报表
* 分拣 * 分拣
*
* @param startDate 开始时间 * @param startDate 开始时间
* @param endDate 结束时间 * @param endDate 结束时间
* @param name 分拣人员 * @param name 分拣人员
* @return * @return
*/ */
@RequestMapping("querySortingReport") @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>(); List<Map<String, Object>> mapList = new ArrayList<>();
try { try {
mapList = receiptService.selectReceiptReport(replaceDate(startDate), replaceDate(endDate), name); mapList = receiptService.selectReceiptReport(replaceDate(startDate), replaceDate(endDate), name);
}catch (Exception e){ } catch (Exception e) {
logger.error("开始时间：" + startDate + "结束时间：" + endDate + "分拣人员：" + name); logger.error("开始时间：" + startDate + "结束时间：" + endDate + "分拣人员：" + name);
logger.error("Exception 查询分拣报表异常", e); logger.error("Exception 查询分拣报表异常", e);
} }
...@@ -121,18 +125,19 @@ public class ReportApi { ...@@ -121,18 +125,19 @@ public class ReportApi {
/** /**
* 查询报表 * 查询报表
* 质检 仓库 * 质检 仓库
*
* @param startDate 开始时间 * @param startDate 开始时间
* @param endDate 结束时间 * @param endDate 结束时间
* @return * @return
*/ */
@RequestMapping("queryQualityCheckReport") @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>(); List<Map<String, Object>> mapList = new ArrayList<>();
try { try {
mapList = taskListService.selectQualityCheckReport(replaceDate(startDate), replaceDate(endDate)); mapList = taskListService.selectQualityCheckReport(replaceDate(startDate), replaceDate(endDate));
}catch (Exception e){ } catch (Exception e) {
logger.error("开始时间：" + startDate + "结束时间：" + endDate); logger.error("开始时间：" + startDate + "结束时间：" + endDate);
logger.error("Exception 查询质检（仓库）报表异常", e); logger.error("Exception 查询质检（仓库）报表异常", e);
} }
...@@ -146,7 +151,7 @@ public class ReportApi { ...@@ -146,7 +151,7 @@ public class ReportApi {
* @return * @return
*/ */
private String replaceDate(String str) { 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 @ 7ba0b811
...@@ -26,7 +26,7 @@ public class SelectApi { ...@@ -26,7 +26,7 @@ public class SelectApi {
@Autowired @Autowired
private SelectSerialNumberService selectSerialNumberService; private SelectSerialNumberService selectSerialNumberService;
Logger logger= Logger.getLogger(SelectApi.class); Logger logger = Logger.getLogger(SelectApi.class);
@RequestMapping(value = "selectByCard") @RequestMapping(value = "selectByCard")
public Map<String, Object> selectByCard(@RequestParam("id") String id, HttpServletRequest requ) { public Map<String, Object> selectByCard(@RequestParam("id") String id, HttpServletRequest requ) {
...@@ -70,7 +70,7 @@ public class SelectApi { ...@@ -70,7 +70,7 @@ public class SelectApi {
} else { } else {
// return null; // return null;
} }
}catch (Exception e){ } catch (Exception e) {
logger.error("传入的组号8位、受理号10位、身份证号18位、任务单号11位" + id); logger.error("传入的组号8位、受理号10位、身份证号18位、任务单号11位" + id);
logger.error("Exception SelectApi异常", e); logger.error("Exception SelectApi异常", e);
} }
...@@ -79,11 +79,12 @@ public class SelectApi { ...@@ -79,11 +79,12 @@ public class SelectApi {
/** /**
* 格式化受理组号 * 格式化受理组号
*
* @param acceptNo * @param acceptNo
* @return * @return
*/ */
private String formateAcceptNo(String acceptNo){ private String formateAcceptNo(String acceptNo) {
return acceptNo.replace("e", "E").replace("g", "G").replace("l","L"); return acceptNo.replace("e", "E").replace("g", "G").replace("l", "L");
} }
} }
src/main/java/com/yxproject/start/api/SpecialCardApi.java
View file @ 7ba0b811
...@@ -23,10 +23,11 @@ public class SpecialCardApi { ...@@ -23,10 +23,11 @@ public class SpecialCardApi {
@Autowired @Autowired
private SpecialCardService specialCardService; private SpecialCardService specialCardService;
Logger logger= Logger.getLogger(SpecialCardApi.class); Logger logger = Logger.getLogger(SpecialCardApi.class);
/** /**
* 查询特殊证件详情 * 查询特殊证件详情
*
* @param groupNo 组号 * @param groupNo 组号
* @return * @return
*/ */
...@@ -37,8 +38,8 @@ public class SpecialCardApi { ...@@ -37,8 +38,8 @@ public class SpecialCardApi {
List<Map> map = new ArrayList<>(); List<Map> map = new ArrayList<>();
try { try {
map = specialCardService.selectSpecialCardByGroupNo(groupNo); map = specialCardService.selectSpecialCardByGroupNo(groupNo);
}catch (Exception e){ } catch (Exception e) {
logger.error("组号：" + groupNo ); logger.error("组号：" + groupNo);
logger.error("Exception 查询特殊证件详情异常", e); logger.error("Exception 查询特殊证件详情异常", e);
} }
return map; return map;
......
src/main/java/com/yxproject/start/api/UpdateStateApi.java
View file @ 7ba0b811
...@@ -15,15 +15,15 @@ import javax.servlet.http.HttpServletRequest; ...@@ -15,15 +15,15 @@ import javax.servlet.http.HttpServletRequest;
public class UpdateStateApi { public class UpdateStateApi {
@Autowired @Autowired
PreproPersonService preproPersonService; PreproPersonService preproPersonService;
Logger logger= Logger.getLogger(UpdateStateApi.class); Logger logger = Logger.getLogger(UpdateStateApi.class);
@RequestMapping("updateState") @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
try { try {
preproPersonService.uploadState(state,acceptNo); preproPersonService.uploadState(state, acceptNo);
}catch (Exception e){ } catch (Exception e) {
logger.error("状态(是否打包)：" + state + "受理号：" + acceptNo); logger.error("状态(是否打包)：" + state + "受理号：" + acceptNo);
logger.error("Exception updateState异常", e); logger.error("Exception updateState异常", e);
} }
......
src/main/java/com/yxproject/start/api/UserApi.java
View file @ 7ba0b811
...@@ -25,7 +25,7 @@ import java.util.Map; ...@@ -25,7 +25,7 @@ import java.util.Map;
@RequestMapping("user") @RequestMapping("user")
public class UserApi { public class UserApi {
Logger logger= Logger.getLogger(UserApi.class); Logger logger = Logger.getLogger(UserApi.class);
@PostMapping("login") @PostMapping("login")
public Map<String, Object> submitLogin(@RequestBody String jsonStr, HttpServletRequest requ) { public Map<String, Object> submitLogin(@RequestBody String jsonStr, HttpServletRequest requ) {
...@@ -64,7 +64,7 @@ public class UserApi { ...@@ -64,7 +64,7 @@ public class UserApi {
} }
@RequestMapping("logout") @RequestMapping("logout")
public void logout( HttpServletRequest requ) { public void logout(HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
try { try {
...@@ -72,7 +72,7 @@ public class UserApi { ...@@ -72,7 +72,7 @@ public class UserApi {
if (subject.isAuthenticated()) { if (subject.isAuthenticated()) {
subject.logout(); subject.logout();
} }
}catch (Exception e){ } catch (Exception e) {
logger.error("Exception 用户登出异常", e); logger.error("Exception 用户登出异常", e);
} }
} }
......
src/main/java/com/yxproject/start/api/queryPreproPerson.java
View file @ 7ba0b811
...@@ -25,42 +25,42 @@ public class queryPreproPerson { ...@@ -25,42 +25,42 @@ public class queryPreproPerson {
@Autowired @Autowired
private PreproPersonService preproPersonService; private PreproPersonService preproPersonService;
Logger logger= Logger.getLogger(queryPreproPerson.class); Logger logger = Logger.getLogger(queryPreproPerson.class);
/** /**
* 查询制证数据 * 查询制证数据
*/ */
@RequestMapping("queryPreproPerson") @RequestMapping("queryPreproPerson")
// @RequiresPermissions("userInfo.add")//权限管理; // @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
Map<String,Object> map = null; Map<String, Object> map = null;
try { try {
map = new LinkedHashMap<>(); 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 //todo
List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),downloadState); List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate), downloadState);
map.put("total",preproPersonEntityList.size()); map.put("total", preproPersonEntityList.size());
int youSum =0; int youSum = 0;
int puSum=0; int puSum = 0;
int invaildCount = 0; int invaildCount = 0;
for (Map<String, Object> map1 :preproPersonEntityList){ for (Map<String, Object> map1 : preproPersonEntityList) {
if ("9".equals(map1.get("CARD_TYPE_ID")+"")){ if ("9".equals(map1.get("CARD_TYPE_ID") + "")) {
youSum++; youSum++;
}else if ("0".equals(map1.get("CARD_TYPE_ID")+"")){ } else if ("0".equals(map1.get("CARD_TYPE_ID") + "")) {
puSum++; puSum++;
} }
if ("0".equals(map1.get("IS_VALID")+"")){ if ("0".equals(map1.get("IS_VALID") + "")) {
invaildCount++; invaildCount++;
} }
} }
map.put("list",preproPersonEntities); map.put("list", preproPersonEntities);
map.put("youSum",youSum); map.put("youSum", youSum);
map.put("puSum",puSum); map.put("puSum", puSum);
map.put("invaildCount",invaildCount); map.put("invaildCount", invaildCount);
}catch (Exception e){ } catch (Exception e) {
logger.error("oldFile：" + uploadNo + "公民身份号码：" + IDCard+ "包号：" + oldFile+ "文件名：" + newFile+ "签发机关：" + SSXQDM+ "制证类型代码（9邮寄0大批）：" + cardType + "是否有效（1有效，0无效）：" + state + "上传时间：" + uploadDate+ "页数：" + currPage+ "条数：" + pageSize+ "生成时间：" + downloadState); logger.error("oldFile：" + uploadNo + "公民身份号码：" + IDCard + "包号：" + oldFile + "文件名：" + newFile + "签发机关：" + SSXQDM + "制证类型代码（9邮寄0大批）：" + cardType + "是否有效（1有效，0无效）：" + state + "上传时间：" + uploadDate + "页数：" + currPage + "条数：" + pageSize + "生成时间：" + downloadState);
logger.error("Exception 查询制证数据异常", e); logger.error("Exception 查询制证数据异常", e);
} }
return map; return map;
...@@ -71,19 +71,19 @@ public class queryPreproPerson { ...@@ -71,19 +71,19 @@ public class queryPreproPerson {
*/ */
@RequestMapping("updatePreproPerson") @RequestMapping("updatePreproPerson")
// @RequiresPermissions("userInfo.add")//权限管理; // @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
Map<String,Object> map = null; Map<String, Object> map = null;
try { try {
PreproPersonEntity preproPersonEntity = new PreproPersonEntity(); PreproPersonEntity preproPersonEntity = new PreproPersonEntity();
preproPersonEntity.setId(Long.valueOf(id)); preproPersonEntity.setId(Long.valueOf(id));
preproPersonEntity.setIsValid(Long.valueOf(isValid)); preproPersonEntity.setIsValid(Long.valueOf(isValid));
preproPersonService.updatePreproPersonIsValid(preproPersonEntity); preproPersonService.updatePreproPersonIsValid(preproPersonEntity);
map = new LinkedHashMap<>(); map = new LinkedHashMap<>();
map.put("msg","成功更新制证数据是否有效"); map.put("msg", "成功更新制证数据是否有效");
} catch (Exception e){ } catch (Exception e) {
logger.error("制证信息ID：" + id + "是否有效（1有效，0无效）：" + isValid ); logger.error("制证信息ID：" + id + "是否有效（1有效，0无效）：" + isValid);
logger.error("Exception 更新制证数据是否有效异常", e); logger.error("Exception 更新制证数据是否有效异常", e);
} }
return map; return map;
...@@ -94,17 +94,17 @@ public class queryPreproPerson { ...@@ -94,17 +94,17 @@ public class queryPreproPerson {
*/ */
@RequestMapping("queryPreproPersonCount") @RequestMapping("queryPreproPersonCount")
// @RequiresPermissions("userInfo.add")//权限管理; // @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(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
Map<String,Object> map = null; Map<String, Object> map = null;
try { try {
map = new LinkedHashMap<>(); map = new LinkedHashMap<>();
//todo //todo
List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),downloadState); List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate), downloadState);
map.put("total",preproPersonEntityList.size()); map.put("total", preproPersonEntityList.size());
}catch (Exception e){ } catch (Exception e) {
logger.error("oldFile：" + uploadNo + "公民身份号码：" + IDCard+ "包号：" + oldFile+ "文件名：" + newFile+ "签发机关：" + SSXQDM+ "制证类型代码（9邮寄0大批）：" + cardType + "是否有效（1有效，0无效）：" + state + "上传时间：" + uploadDate+ "页数：" + "生成时间：" + downloadState); logger.error("oldFile：" + uploadNo + "公民身份号码：" + IDCard + "包号：" + oldFile + "文件名：" + newFile + "签发机关：" + SSXQDM + "制证类型代码（9邮寄0大批）：" + cardType + "是否有效（1有效，0无效）：" + state + "上传时间：" + uploadDate + "页数：" + "生成时间：" + downloadState);
logger.error("Exception 查询制证数据总数异常", e); logger.error("Exception 查询制证数据总数异常", e);
} }
return map; return map;
...@@ -117,7 +117,7 @@ public class queryPreproPerson { ...@@ -117,7 +117,7 @@ public class queryPreproPerson {
* @return * @return
*/ */
private String replaceDate(String str) { 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 @ 7ba0b811
...@@ -21,22 +21,22 @@ public interface CardDetailedListMapper { ...@@ -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})") @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}") @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" + @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_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 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" + "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} )") "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 @ 7ba0b811
...@@ -14,7 +14,7 @@ import java.util.Map; ...@@ -14,7 +14,7 @@ import java.util.Map;
public interface DataAuditingMapper { public interface DataAuditingMapper {
@Insert("insert into Data_Auditing (POLICE_SUBSTATION,VALID_COUNT,inVALID_COUNT,submit_date) values (#{policeSubstation},#{validCount},#{invalidCount},sysdate) ") @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); public boolean saveDataAuditingEntity(DataAuditingEntity dataAuditingEntity);
...@@ -30,7 +30,7 @@ public interface DataAuditingMapper { ...@@ -30,7 +30,7 @@ public interface DataAuditingMapper {
" select ACCEPT_NO from ACC_ERROR_INFO_T@ACCUYD_LINK)\n" + " select ACCEPT_NO from ACC_ERROR_INFO_T@ACCUYD_LINK)\n" +
" and substr(ACCEPT_NO,0,8) in (#{groupNo})\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 ") " 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("<script>" +
"select nvl(GAJG_DM.GAJG_MC,'000000000') GAJG_MC,DATA_AUDITING.POLICE_SUBSTATION,sum(DATA_AUDITING.VALID_COUNT) VALID_COUNT,\n" + "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 { ...@@ -41,14 +41,14 @@ public interface DataAuditingMapper {
"left join GAJG_DM on GAJG_DM.GAJG_DM = DATA_AUDITING.POLICE_SUBSTATION\n" + "left join GAJG_DM on GAJG_DM.GAJG_DM = DATA_AUDITING.POLICE_SUBSTATION\n" +
"where 1=1 " + "where 1=1 " +
" <if test = 'policeName != null' >" + " <if test = 'policeName != null' >" +
" and GAJG_DM.GAJG_MC like ${policeName}"+ " and GAJG_DM.GAJG_MC like ${policeName}" +
"</if>\n" + "</if>\n" +
" <if test = 'policeCode != null' >" + " <if test = 'policeCode != null' >" +
" and DATA_AUDITING.POLICE_SUBSTATION like ${policeCode}"+ " and DATA_AUDITING.POLICE_SUBSTATION like ${policeCode}" +
"</if> " + "</if> " +
" and to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd') BETWEEN ${startDate} and ${endDate} \n" + " 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" + "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" + "order by DATA_AUDITING.POLICE_SUBSTATION" +
"</script>") "</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 @ 7ba0b811
...@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Options; ...@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Options;
public interface DeliveredFailedInfoMapper { public interface DeliveredFailedInfoMapper {
@Insert("insert into DELIVERED_FAILED_INFO (WAYBILL_NUMBER,BACK_DATE,BACK_REASON,note,REGISTER_NAME,CARD_ID) \n" + @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})") "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); public boolean saveDeliveredFailedInfo(DeliveredFailedInfoEntity deliveredFailedInfoEntity);
} }
src/main/java/com/yxproject/start/mapper/DeliveredImportDicMapper.java
View file @ 7ba0b811
...@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Options; ...@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Options;
public interface DeliveredImportDicMapper { public interface DeliveredImportDicMapper {
@Insert("insert into DELIVERED_IMPORT_DIC (FILE_NAME,IMPORT_DATE,import_name,import_count) \n" + @Insert("insert into DELIVERED_IMPORT_DIC (FILE_NAME,IMPORT_DATE,import_name,import_count) \n" +
"VALUES (#{fileName},sysdate,#{importName},#{importCount})") "VALUES (#{fileName},sysdate,#{importName},#{importCount})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID") @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "ID")
public boolean saveDeliveredImportDic(DeliveredImportDicEntity deliveredImportDicEntity); public boolean saveDeliveredImportDic(DeliveredImportDicEntity deliveredImportDicEntity);
} }
src/main/java/com/yxproject/start/mapper/DeliveredInfoMapper.java
View file @ 7ba0b811
...@@ -17,8 +17,8 @@ public interface DeliveredInfoMapper { ...@@ -17,8 +17,8 @@ public interface DeliveredInfoMapper {
@Insert("insert into DELIVERED_INFO (WAYBILL_NUMBER,DEAL_DATE,DEAL_STATE,FILE_ID) \n" + @Insert("insert into DELIVERED_INFO (WAYBILL_NUMBER,DEAL_DATE,DEAL_STATE,FILE_ID) \n" +
"VALUES (#{waybillNumber},sysdate,#{dealState},#{fileId})") "VALUES (#{waybillNumber},sysdate,#{dealState},#{fileId})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID") @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "ID")
public boolean saveDeliveredInfo(DeliveredInfoEntity deliveredInfoEntity); public boolean saveDeliveredInfo(DeliveredInfoEntity deliveredInfoEntity);
@Select("select to_char(PRINT_DATE,'yyyyMMdd') PRINT_DATE ,count(PERSON_POST.WAYBILL_NUMBER) post_Count,\n" + @Select("select to_char(PRINT_DATE,'yyyyMMdd') PRINT_DATE ,count(PERSON_POST.WAYBILL_NUMBER) post_Count,\n" +
"sum(decode(DELIVERED_INFO.WAYBILL_NUMBER,null,0,1)) DELIVERED_count,\n" + "sum(decode(DELIVERED_INFO.WAYBILL_NUMBER,null,0,1)) DELIVERED_count,\n" +
...@@ -27,25 +27,26 @@ public interface DeliveredInfoMapper { ...@@ -27,25 +27,26 @@ public interface DeliveredInfoMapper {
"left join DELIVERED_FAILED_INFO on PERSON_POST.WAYBILL_NUMBER = DELIVERED_FAILED_INFO.WAYBILL_NUMBER\n" + "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" + "where to_char(PRINT_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" +
"group by to_char(PRINT_DATE,'yyyyMMdd')") "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} ") @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" + @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" + "left join DELIVERED_FAILED_REASON on DELIVERED_FAILED_REASON.ID = DELIVERED_FAILED_INFO.BACK_REASON\n" +
"where to_char(back_date,'yyyyMMdd') = #{date}") "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}") @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}") @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}") @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 ") @Select("select * from DELIVERED_FAILED_REASON ")
public List<DeliveredFailedReasonEntity> selectDeliveredFailedType(); public List<DeliveredFailedReasonEntity> selectDeliveredFailedType();
} }
src/main/java/com/yxproject/start/mapper/DetailReceiptListMapper.java
View file @ 7ba0b811
...@@ -17,6 +17,7 @@ import java.util.Map; ...@@ -17,6 +17,7 @@ import java.util.Map;
public interface DetailReceiptListMapper { public interface DetailReceiptListMapper {
/** /**
* 查询导出制证数据 * 查询导出制证数据
*
* @return * @return
*/ */
@Select("select DETAIL_RECEIPT_LIST.id,DETAIL_RECEIPT_LIST.ACCEPT_NO,DETAIL_RECEIPT_LIST.NAME,DETAIL_RECEIPT_LIST.UPLOAD_NO,\n" + @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 { ...@@ -27,31 +28,34 @@ public interface DetailReceiptListMapper {
"where RECEIPT_LIST.id in (${str}) " + "where RECEIPT_LIST.id in (${str}) " +
" order by DETAIL_RECEIPT_LIST.ACCEPT_NO " + " 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 * @return
*/ */
@Update("update RECEIPT_LIST set DOWNLOAD_DATE = sysdate ,DOWNLOAD_NAME = #{name}\n" + @Update("update RECEIPT_LIST set DOWNLOAD_DATE = sysdate ,DOWNLOAD_NAME = #{name}\n" +
"where RECEIPT_LIST.id in (${str}) ") "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 身份证件号码 * @param cardId 身份证件号码
* @return * @return
*/ */
@Select("select * from DETAIL_RECEIPT_LIST where CARD_ID = #{cardId} order by id desc") @Select("select * from DETAIL_RECEIPT_LIST where CARD_ID = #{cardId} order by id desc")
public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardId); public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardId);
/** /**
* 更新详单信息的交接单Id * 更新详单信息的交接单Id
*
* @return * @return
*/ */
@Update("UPDATE DETAIL_RECEIPT_LIST set RECEIPT_ID = #{reciptId} where id =#{id}") @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 @ 7ba0b811
...@@ -16,6 +16,7 @@ public interface FailedCardMapper { ...@@ -16,6 +16,7 @@ public interface FailedCardMapper {
/** /**
* 查询废证字典表，拿到所有废证原因 * 查询废证字典表，拿到所有废证原因
*
* @return * @return
*/ */
@Select("select * from FAILED_CARD_REASON_DIC ") @Select("select * from FAILED_CARD_REASON_DIC ")
...@@ -23,6 +24,7 @@ public interface FailedCardMapper { ...@@ -23,6 +24,7 @@ public interface FailedCardMapper {
/** /**
* 根据身份证号查询详细信息 * 根据身份证号查询详细信息
*
* @param cardId * @param cardId
* @return * @return
*/ */
...@@ -30,28 +32,29 @@ public interface FailedCardMapper { ...@@ -30,28 +32,29 @@ public interface FailedCardMapper {
"PROD_CARD_T.SEX_NO,\n" + "PROD_CARD_T.SEX_NO,\n" +
"PROD_CARD_T.ID_NO,\n" + "PROD_CARD_T.ID_NO,\n" +
"SPECIAL_CARD.SPECIAL_TYPE, " + "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" + "FROM PROD_CARD_T@PRODYD_LINK\n" +
"left join SPECIAL_CARD on PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO " + "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 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}") " 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 failedCardReasonId 废证原因
* @param acceptNo 受理组号 * @param acceptNo 受理组号
* @param taskId 任务单ID * @param taskId 任务单ID
* @param initiator 发起工序 * @param initiator 发起工序
* @param note 备注 * @param note 备注
* @param workGroup 工作组 * @param workGroup 工作组
* @param name 提交人姓名 * @param name 提交人姓名
* @return * @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") @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" + @Select("SELECT PROD_CARD_T.ACCEPT_NO,GROUP_NO.TASK_ID ,task.work_group\n" +
...@@ -59,7 +62,7 @@ public interface FailedCardMapper { ...@@ -59,7 +62,7 @@ public interface FailedCardMapper {
"LEFT JOIN GROUP_NO ON GROUP_NO=subStr(PROD_CARD_T.ACCEPT_NO,0,8) " + "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" + "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}") "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" + @Update("update group_no \n" +
...@@ -67,23 +70,22 @@ public interface FailedCardMapper { ...@@ -67,23 +70,22 @@ public interface FailedCardMapper {
"where group_no.group_no=(select group_no from PROD_CARD_T@PRODYD_LINK \n" + "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" + "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}) ") "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" + @Insert("insert into SPECIAL_CARD (ACCEPT_NO,TASK_ID,SPECIAL_TYPE,GROUP_NO,INITIATOR,FILL_IN_DATE)\n" +
"values(\n" + "values(\n" +
"#{acceptNo},#{taskId},1," + "#{acceptNo},#{taskId},1," +
"#{groupNo},#{initiator},sysdate)\n") "#{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" + @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" + " ,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 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 task on group_no.task_id = task.task_id " +
"where prod_card_t.accept_no=#{acceptNo} or prod_card_t.ID_NO=#{acceptNo}") "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 { ...@@ -100,32 +102,32 @@ public interface FailedCardMapper {
public List<String> selectGroupNo(@Param("cardIdList") String cardIdList); 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 ," + @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" + "SPECIAL_CARD.INITIATOR,PREPRO_PERSON.CARD_TYPE_ID\n" +
"from prod_card_t@PRODYD_LINK\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 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" + "left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH=prod_card_t.UPLOAD_NO\n" +
"where prod_card_t.ID_NO=#{acceptNo}") "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" + @Select("select prod_group_t.valid_count,prod_group_t.invalid_count from prod_group_t@PRODYD_LINK \n" +
"where group_no=#{groupNo}") "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})") @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}") @Update("update FAILED_CARD set PRINT_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
public boolean updateFailedState1(FailedCardEntity failedCardEntity); public boolean updateFailedState1(FailedCardEntity failedCardEntity);
@Update("update FAILED_CARD set POSITION_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}") @Update("update FAILED_CARD set POSITION_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
public boolean updateFailedState2(FailedCardEntity failedCardEntity); public boolean updateFailedState2(FailedCardEntity failedCardEntity);
@Update("update FAILED_CARD set ALLOT_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}") @Update("update FAILED_CARD set ALLOT_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
public boolean updateFailedState3(FailedCardEntity failedCardEntity); public boolean updateFailedState3(FailedCardEntity failedCardEntity);
@Update("update FAILED_CARD set FINISH_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}") @Update("update FAILED_CARD set FINISH_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
// public boolean updateFailedState4(FailedCardEntity failedCardEntity); // public boolean updateFailedState4(FailedCardEntity failedCardEntity);
// @Update("update FAILED_CARD set FINISH_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}") // @Update("update FAILED_CARD set FINISH_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
...@@ -146,10 +148,11 @@ public interface FailedCardMapper { ...@@ -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" + @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}") " 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 date 提交日期
* @param name 提交人姓名 * @param name 提交人姓名
* @return * @return
...@@ -162,11 +165,12 @@ public interface FailedCardMapper { ...@@ -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 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 " + "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") "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 * @param failedCardId 废证ID
* @return * @return
*/ */
......
src/main/java/com/yxproject/start/mapper/FileNameDicMapper.java
View file @ 7ba0b811
...@@ -13,25 +13,28 @@ import java.util.List; ...@@ -13,25 +13,28 @@ import java.util.List;
public interface FileNameDicMapper { public interface FileNameDicMapper {
/** /**
* 保存个人邮寄信息字典表 * 保存个人邮寄信息字典表
*
* @param fileNameDicEntity * @param fileNameDicEntity
* @return * @return
*/ */
@Insert("INSERT INTO FILE_NAME_DIC (FILE_NAME,UPLOAD_DATE,FORM_START_TIME,FORM_DEADLINE,state) VALUES (#{fileName},#{uploadDate},#{formStartTime},#{formDeadline},#{state})") @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); public void saveFileNameDic(FileNameDicEntity fileNameDicEntity);
/** /**
* 更新个人邮寄字典表的解析状态 * 更新个人邮寄字典表的解析状态
* 更新为已解析 * 更新为已解析
*
* @param fileId 文件ID * @param fileId 文件ID
* @return * @return
*/ */
@Update("Updata FILE_NAME_DIC.STATE = 1 WHERE FILE_ID = #{fileId}") @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 fileName 文件名称
* @param analysisState 解析状态 * @param analysisState 解析状态
* @return * @return
*/ */
...@@ -50,11 +53,12 @@ public interface FileNameDicMapper { ...@@ -50,11 +53,12 @@ public interface FileNameDicMapper {
" </where>" + " </where>" +
" ) where rn BETWEEN #{minNum} and #{maxNum} " + " ) where rn BETWEEN #{minNum} and #{maxNum} " +
"</script>") "</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 fileName 文件名称
* @param analysisState 解析状态 * @param analysisState 解析状态
* @return * @return
*/ */
...@@ -69,8 +73,8 @@ public interface FileNameDicMapper { ...@@ -69,8 +73,8 @@ public interface FileNameDicMapper {
"<if test='fileName != null ' >" + "<if test='fileName != null ' >" +
" and FILE_NAME = #{fileName}" + " and FILE_NAME = #{fileName}" +
"</if> </where> </script>") "</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}") @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 @ 7ba0b811
...@@ -12,7 +12,7 @@ import java.util.Map; ...@@ -12,7 +12,7 @@ import java.util.Map;
*/ */
@Mapper @Mapper
public interface GreenPackageInformationMapper { 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); 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})") @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/service/impl/CardDetailedListServiceImpl.java
View file @ 7ba0b811
...@@ -20,21 +20,20 @@ public class CardDetailedListServiceImpl implements CardDetailedListService { ...@@ -20,21 +20,20 @@ public class CardDetailedListServiceImpl implements CardDetailedListService {
@Override @Override
public List<DetailReceiptListEntity> findCardDetailedListByIdCard(String idCard) { public List<DetailReceiptListEntity> findCardDetailedListByIdCard(String idCard) {
List<DetailReceiptListEntity> list = cardDetailedListMapper.findCardDetailedListByIdCard(idCard); List<DetailReceiptListEntity> list = cardDetailedListMapper.findCardDetailedListByIdCard(idCard);
return list; return list;
} }
@Override @Override
public List<Map<String,Object>> findAllCardDetailedListByIdCard(String idCard) { public List<Map<String, Object>> findAllCardDetailedListByIdCard(String idCard) {
List<Map<String,Object>> list = cardDetailedListMapper.findAllCardDetailedListByIdCard(idCard); List<Map<String, Object>> list = cardDetailedListMapper.findAllCardDetailedListByIdCard(idCard);
return list; return list;
} }
@Override @Override
public boolean saveCardDetailedList(String uploadNo, String policeCode, String cardId, String name) { 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; return true;
} }
} }
src/main/java/com/yxproject/start/service/impl/DataAuditingServiceImpl.java
View file @ 7ba0b811
...@@ -24,7 +24,7 @@ public class DataAuditingServiceImpl implements DataAuditingService { ...@@ -24,7 +24,7 @@ public class DataAuditingServiceImpl implements DataAuditingService {
@Override @Override
@Transactional @Transactional
public boolean saveDataAuditingList(List<DataAuditingEntity> dataAuditingEntityList) { public boolean saveDataAuditingList(List<DataAuditingEntity> dataAuditingEntityList) {
for (DataAuditingEntity dataAuditingEntity:dataAuditingEntityList){ for (DataAuditingEntity dataAuditingEntity : dataAuditingEntityList) {
dataAuditingMapper.saveDataAuditingEntity(dataAuditingEntity); dataAuditingMapper.saveDataAuditingEntity(dataAuditingEntity);
} }
return true; return true;
...@@ -34,32 +34,33 @@ public class DataAuditingServiceImpl implements DataAuditingService { ...@@ -34,32 +34,33 @@ public class DataAuditingServiceImpl implements DataAuditingService {
public List<Map<String, Object>> selectDataAuditingList(String groupNo) { public List<Map<String, Object>> selectDataAuditingList(String groupNo) {
return dataAuditingMapper.selectDataAuditingEntity(groupNo); return dataAuditingMapper.selectDataAuditingEntity(groupNo);
} }
@Override @Override
public List<Map<String, Object>> selectDataAuditingReport(String startDate,String endDate,String policeName,String policeCode) { public List<Map<String, Object>> selectDataAuditingReport(String startDate, String endDate, String policeName, String policeCode) {
if ("".equals(policeName)){ if ("".equals(policeName)) {
policeName=null; policeName = null;
}else { } else {
policeName="'" + policeName + "%'"; policeName = "'" + policeName + "%'";
} }
if ("".equals(policeCode)){ if ("".equals(policeCode)) {
policeCode=null; policeCode = null;
}else { } else {
policeCode="'" + policeCode + "%'"; policeCode = "'" + policeCode + "%'";
} }
List<Map<String, Object>> maps = dataAuditingMapper.selectDataAuditingReport("'" + startDate + "'", "'" + endDate + "'", policeName, policeCode); List<Map<String, Object>> maps = dataAuditingMapper.selectDataAuditingReport("'" + startDate + "'", "'" + endDate + "'", policeName, policeCode);
Map<String,Object> sumMap = new LinkedHashMap<>(); Map<String, Object> sumMap = new LinkedHashMap<>();
int validCount =0; int validCount = 0;
int invalidCount =0; int invalidCount = 0;
for (Map<String, Object> map :maps) { for (Map<String, Object> map : maps) {
validCount+=Integer.valueOf(map.get("VALID_COUNT").toString()); validCount += Integer.valueOf(map.get("VALID_COUNT").toString());
invalidCount+=Integer.valueOf(map.get("INVALID_COUNT").toString()); invalidCount += Integer.valueOf(map.get("INVALID_COUNT").toString());
} }
if (maps.size()>0){ if (maps.size() > 0) {
sumMap.put("VALID_COUNT",validCount); sumMap.put("VALID_COUNT", validCount);
sumMap.put("INVALID_COUNT",invalidCount); sumMap.put("INVALID_COUNT", invalidCount);
sumMap.put("GAJG_MC","北京制证中心"); sumMap.put("GAJG_MC", "北京制证中心");
sumMap.put("POLICE_SUBSTATION","合计"); sumMap.put("POLICE_SUBSTATION", "合计");
sumMap.put("FAILURE_RATE",1-validCount/(validCount+invalidCount)); sumMap.put("FAILURE_RATE", 1 - validCount / (validCount + invalidCount));
maps.add(sumMap); maps.add(sumMap);
} }
return maps; return maps;
......
src/main/java/com/yxproject/start/service/impl/DeliveredServiceImpl.java
View file @ 7ba0b811
...@@ -36,7 +36,7 @@ public class DeliveredServiceImpl implements DeliveredService { ...@@ -36,7 +36,7 @@ public class DeliveredServiceImpl implements DeliveredService {
@Override @Override
public boolean saveDeliveredInfoList(List<DeliveredInfoEntity> deliveredInfoEntityList) { public boolean saveDeliveredInfoList(List<DeliveredInfoEntity> deliveredInfoEntityList) {
for (DeliveredInfoEntity deliveredInfoEntity: deliveredInfoEntityList) { for (DeliveredInfoEntity deliveredInfoEntity : deliveredInfoEntityList) {
deliveredInfoMapper.saveDeliveredInfo(deliveredInfoEntity); deliveredInfoMapper.saveDeliveredInfo(deliveredInfoEntity);
} }
return true; return true;
...@@ -44,7 +44,7 @@ public class DeliveredServiceImpl implements DeliveredService { ...@@ -44,7 +44,7 @@ public class DeliveredServiceImpl implements DeliveredService {
@Override @Override
public boolean saveDeliveredFailedInfoList(List<DeliveredFailedInfoEntity> deliveredFailedInfoEntities) { public boolean saveDeliveredFailedInfoList(List<DeliveredFailedInfoEntity> deliveredFailedInfoEntities) {
for (DeliveredFailedInfoEntity deliveredFailedInfoEntity :deliveredFailedInfoEntities){ for (DeliveredFailedInfoEntity deliveredFailedInfoEntity : deliveredFailedInfoEntities) {
deliveredFailedInfoMapper.saveDeliveredFailedInfo(deliveredFailedInfoEntity); deliveredFailedInfoMapper.saveDeliveredFailedInfo(deliveredFailedInfoEntity);
} }
return false; return false;
......
src/main/java/com/yxproject/start/service/impl/DetailReceiptListServiceImpl.java
View file @ 7ba0b811
...@@ -14,34 +14,35 @@ import java.util.Map; ...@@ -14,34 +14,35 @@ import java.util.Map;
* 2019/3/9 14:55 * 2019/3/9 14:55
*/ */
@Service @Service
public class DetailReceiptListServiceImpl implements DetailReceiptListService { public class DetailReceiptListServiceImpl implements DetailReceiptListService {
@Autowired @Autowired
private DetailReceiptListMapper detailReceiptListMapper; private DetailReceiptListMapper detailReceiptListMapper;
@Override @Override
public List<Map<String, Object>> selectPostDetails(List<Integer> stringList,String name,String isHistory) { public List<Map<String, Object>> selectPostDetails(List<Integer> stringList, String name, String isHistory) {
String str =""; String str = "";
for (int i =0;i<stringList.size();i++){ for (int i = 0; i < stringList.size(); i++) {
if (i==stringList.size()-1){ if (i == stringList.size() - 1) {
str+=stringList.get(i); str += stringList.get(i);
}else { } else {
str+=stringList.get(i)+","; str += stringList.get(i) + ",";
} }
} }
// str+=")"; // str+=")";
if ("0".equals(isHistory)){ if ("0".equals(isHistory)) {
detailReceiptListMapper.updateReceiptListEntityByCardId(str,name); detailReceiptListMapper.updateReceiptListEntityByCardId(str, name);
} }
return detailReceiptListMapper.selectPostDetails(str); return detailReceiptListMapper.selectPostDetails(str);
} }
@Override @Override
public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID) { public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID) {
return detailReceiptListMapper.selectDetailReceiptListEntityByCardId(cardID); return detailReceiptListMapper.selectDetailReceiptListEntityByCardId(cardID);
} }
@Override @Override
public boolean updateDetailReceiptList(DetailReceiptListEntity detailReceiptListEntity,long reciptId) { public boolean updateDetailReceiptList(DetailReceiptListEntity detailReceiptListEntity, long reciptId) {
return detailReceiptListMapper.updateDetailReceiptList(detailReceiptListEntity.getId(),reciptId); return detailReceiptListMapper.updateDetailReceiptList(detailReceiptListEntity.getId(), reciptId);
} }
} }
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