Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit f85f3ad6 authored by liboyang's avatar liboyang
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents a145ed63 a29661c3
Hide whitespace changes
Inline Side-by-side
Showing with 783 additions and 152 deletions
src/main/java/com/yxproject/start/api/CardDetailedListApi.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.api;
import com.yxproject.start.entity.CardDetailedListEntity;
import com.yxproject.start.service.CardDetailedListService;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
* @auther zhangyusheng
* 2019/3/1 21:24
*/
@RestController
@RequestMapping("cardDetailedList")
public class CardDetailedListApi {
@Autowired
private CardDetailedListService cardDetailedListService;
/**
* 按条件查询身份证详单
* @param jsonStr
* @return
*/
@RequestMapping("findCardDetailedList")
public List<CardDetailedListEntity> findCardDetailedList(String jsonStr){
JSONObject jsonObject = JSONObject.fromObject(jsonStr);
String applicantName = jsonObject.getString("applicantName");
String orderNumber = jsonObject.getString("orderNumber");
String state = jsonObject.getString("state");
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
List<String> getToCounty = new ArrayList<>();
getToCounty.add(jsonObject.getString("getToCounty"));
String uploadDate = jsonObject.getString("uploadDate");
String firstIndex = jsonObject.getString("firstIndex");
String pageSize = jsonObject.getString("pageSize");
List<CardDetailedListEntity> list = new ArrayList<>();
//TODO
// List<CardDetailedListEntity> list = cardDetailedListService.findCardDetailedList(applicantName,orderNumber,state,latticeMouthInformation,getToCounty,uploadDate,firstIndex,pageSize);
return list;
}
}
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ f85f3ad6
......@@ -37,7 +37,6 @@ public class ReadExcelApi {
PersonPostService personPostService;
@Autowired
FileNameDicService fileNameDicService;
Boolean result = null;
/**
* 导入个人邮寄信息表
......@@ -46,7 +45,7 @@ public class ReadExcelApi {
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(MediaType.APPLICATION_JSON)
@Transactional(rollbackFor = Exception.class)
public String ReadPersonPost(HttpServletResponse resp, HttpServletRequest requ) {
public boolean ReadPersonPost(HttpServletResponse resp, HttpServletRequest requ) {
YXJSONResponse yxresp = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
String filename = "";
......@@ -68,7 +67,7 @@ public class ReadExcelApi {
//将当前上下文初始化给 CommonsMutipartResolver （多部分解析器）
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
requ.getSession().getServletContext());
// 判断是否是多数据段提交格式
// 判断是否是多数据段提交格式
if (multipartResolver.isMultipart(requ)) {
MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;
Iterator<String> iter = multiRequest.getFileNames();
......@@ -159,97 +158,11 @@ public class ReadExcelApi {
}
// list = upload.parseRequest(requ);
//
// for (FileItem item : list) {
// File file =null;
// try {
// // 如果fileitem中封装的是普通输入项的数据
// if (item.isFormField()) {
// String name = item.getFieldName();
// // 解决普通输入项的数据的中文乱码问题
// String value = item.getString("UTF-8");
// map.put(name, value);
// } else {
// // 如果fileitem中封装的是上传文件
// // 得到上传的文件名称，
// filename = item.getName();
//
// if (filename == null || filename.trim().equals("")) {
// continue;
// }
// InputStream in = item.getInputStream();
// OutputStream os = new FileOutputStream(file);
// int bytesRead = 0;
// byte[] buffer = new byte[8192];
// while ((bytesRead = in.read(buffer, 0, 8192)) != -1) {
// os.write(buffer, 0, bytesRead);
// }
// os.close();
// in.close();
// }
// ReadExcel readExcel = new ReadExcel();
// List list1 = readExcel.readExcel(file);
// //保存EXCEL文件信息
// FileNameDicEntity fileNameDicEntity = new FileNameDicEntity();
// fileNameDicEntity.setFileName(filename);
// fileNameDicEntity.setUploadDate(new Date());
// //保存个人邮寄信息
// long fileID = fileNameDicService.saveFileNameDic(fileNameDicEntity);
// List<PersonPostEntity> entityList= new ArrayList<PersonPostEntity>();
// for (int i = 0; i < list1.size(); i++){
// PersonPostEntity personPostEntity = new PersonPostEntity();
// List list2 = (List) list1.get(i);
// //跳过空行和第一行
// if (list2 == null||i==0){
// continue;
// }
// personPostEntity.setBackWaybillNumber((String) list2.get(0));
// personPostEntity.setOrderNumber((String) list2.get(1));
// personPostEntity.setCreateDate((Time) list2.get(2));
// personPostEntity.setOpenid((String) list2.get(3));
// personPostEntity.setWcPlayOrderNumber((String) list2.get(4));
// personPostEntity.setPlayState((String) list2.get(5));
// personPostEntity.setOrderState((String) list2.get(6));
// personPostEntity.setApplicantName((String) list2.get(7));
// personPostEntity.setSenderName((String) list2.get(8));
// personPostEntity.setSenderPhone((String) list2.get(9));
// personPostEntity.setSenderAddress((String) list2.get(10));
// personPostEntity.setRecipientName((String) list2.get(11));
// personPostEntity.setRecipientPhone((String) list2.get(12));
// personPostEntity.setRecipientAddress((String) list2.get(13));
// personPostEntity.setOrderBlankNumber((String) list2.get(14));
// personPostEntity.setGetToProvince((String) list2.get(15));
// personPostEntity.setGetToCity((String) list2.get(16));
// personPostEntity.setGetToCounty((String) list2.get(17));
// personPostEntity.setBusinessType((String) list2.get(18));
// personPostEntity.setLatticeMouthInformation((String) list2.get(19));
// personPostEntity.setNatureOfTheInternal((String) list2.get(20));
// personPostEntity.setNatureOfTheInformation((String) list2.get(21));
// personPostEntity.setFirstWhite((String) list2.get(22));
// personPostEntity.setFileId(fileID);
// entityList.add(personPostEntity);
// }
// boolean b = personPostService.savePersonPost(entityList);
// } catch (UnsupportedEncodingException e) {
// e.printStackTrace();
// yxresp.outPutError("UnsupportedEncodingException", "上传文件时发现文件编码错误:" + e.getMessage());
// continue;
// } catch (IOException e) {
// e.printStackTrace();
// yxresp.outPutError("IOException", "上传文件时发生IO错误:" + e.getMessage());
// continue;
// } catch (Exception e) {
// e.printStackTrace();
// yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
// continue;
// }
// }
} catch (Exception e) {
e.printStackTrace();
yxresp.outPutError("FileUploadException", "文件上载发生异常:" + e.getMessage());
} finally {
return yxresp.toJSONString();
return true;
}
}
}
......@@ -258,6 +171,6 @@ public class ReadExcelApi {
}finally {
}
return null;
return true;
}
}
\ No newline at end of file
src/main/java/com/yxproject/start/api/ImportXmlApi.java → src/main/java/com/yxproject/start/api/ReadXmlApi.java
View file @ f85f3ad6
......@@ -11,6 +11,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.dom4j.DocumentException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
......@@ -33,7 +34,7 @@ import java.util.Map;
@RestController
@RequestMapping("importXML")
public class ImportXmlApi {
public class ReadXmlApi {
@Autowired
private ImportXmlService importXmlService;
......@@ -45,10 +46,11 @@ public class ImportXmlApi {
* @return 成功返回 上传完成 失败返回 异常信息
*/
@RequestMapping("getXMLToCheck")
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(MediaType.APPLICATION_JSON)
@RequestMapping("getXMLToCheck")
public String getXMLToCheck(@Context HttpServletResponse resp, @Context HttpServletRequest requ) {
@Transactional(rollbackFor = Exception.class)
public boolean getXMLToCheck(@Context HttpServletResponse resp, @Context HttpServletRequest requ) {
YXJSONResponse yxresp = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
String filename = "";
......@@ -110,7 +112,7 @@ public class ImportXmlApi {
e.printStackTrace();
yxresp.outPutError("FileUploadException", "文件上传发生异常:" + e.getMessage());
} finally {
return yxresp.toJSONString();
return true;
}
}
......
src/main/java/com/yxproject/start/api/ReceiptListApi.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @auther zhangyusheng
* 2019/3/1 21:39
*/
@RestController
@RequestMapping("receiptList")
public class ReceiptListApi {
}
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ f85f3ad6
......@@ -6,10 +6,11 @@ import com.yxproject.start.entity.TaskList.TaskListEntity;
import com.yxproject.start.service.TaskListService;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
* @author Administrator
......@@ -24,6 +25,7 @@ public class TaskListApi {
/**
* 查询以区为单位的制证数量
* 受理库
* @param submitDate
* @return
*/
......@@ -36,6 +38,7 @@ public class TaskListApi {
/**
* 查询以派出所为单位的制证数量
* 受理库
* @param submitDate
* @param countyCode
* @return
......@@ -49,6 +52,7 @@ public class TaskListApi {
/**
* 生成任务单
* 受理库
* @param submitDate
* @param countyCode
* @param Gajg
......@@ -62,7 +66,8 @@ public class TaskListApi {
}
/**
* 更改任务单状态(用于任务单下发)
* 更改任务单状态
* (用于任务单下发)
* @param taskId
* @return
*/
......
src/main/java/com/yxproject/start/api/UpdateStateApi.java
View file @ f85f3ad6
......@@ -11,7 +11,8 @@ import org.springframework.web.bind.annotation.RestController;
public class UpdateStateApi {
@Autowired
PreproPersonService preproPersonService;
@RequestMapping("updateS")
@RequestMapping("updateState")
public boolean updateState(@RequestParam(value = "state") String state,@RequestParam(value = "acceptNo") String acceptNo){
preproPersonService.uploadState(state,acceptNo);
return true;
......
src/main/java/com/yxproject/start/api/fakeApi/readCardApi.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.api.fakeApi;
import net.sf.json.JSONObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping("selectXMLApi")
public class readCardApi {
/**
* 查询读卡信息详情
* @param idCard
* @param startDate
* @param endDate
* @return countyList
*/
@RequestMapping("selectPostData")
public String selectPostData(@Param("idCard") String idCard,@Param("startDate") String startDate,@Param("endDate") String endDate){
List<JSONObject> countyList = new ArrayList<>();
JSONObject jsonStr1 = new JSONObject();
jsonStr1.put("name","周强");
jsonStr1.put("sex","男");
jsonStr1.put("nation","汉族");
jsonStr1.put("birthday","19930207");
jsonStr1.put("address","北京市海淀区马连洼学府路202号");
jsonStr1.put("idNumber",idCard);
jsonStr1.put("issuingAuthority","马连洼派出所");
jsonStr1.put("beginData","20130916");
jsonStr1.put("endData","20230916");
countyList.add(jsonStr1);
return countyList.toString();
}
}
src/main/java/com/yxproject/start/api/fakeApi/selectDetailedInformation.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.api.fakeApi;
import net.sf.json.JSONObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping("selectDetailedInformation")
public class selectDetailedInformation {
/**
* 制证信息查询
* @param uploadNo
* @param idCard
* @param name
* @param packageNo
* @param readDate
* @param cardType
* @param packageType
* @param startDate
* @param endDate
* @return countyList
*/
@RequestMapping("selectDetailedInfo")
public String selectDetailedInfo(@Param("uploadNo") String uploadNo,@Param("idCard") String idCard,@Param("name") String name,@Param("packageNo") String packageNo,@Param("readDate") String readDate,@Param("cardType") String cardType,@Param("packageType") String packageType,@Param("startDate") String startDate,@Param("endDate") String endDate){
List<JSONObject> countyList = new ArrayList<>();
JSONObject jsonStr1 = new JSONObject();
jsonStr1.put("countyNo","11020");
jsonStr1.put("oldPackageNo","11020180227001");
jsonStr1.put("recordNumber",80);
jsonStr1.put("postNumber",30);
jsonStr1.put("unpackedNumber",10);
jsonStr1.put("readDate","20190228");
jsonStr1.put("analysisDate","20190228");
JSONObject jsonStr2 = new JSONObject();
jsonStr2.put("countyNo","11020");
jsonStr2.put("oldPackageNo","11020180227001");
jsonStr2.put("recordNumber",80);
jsonStr2.put("postNumber",30);
jsonStr2.put("unpackedNumber",10);
jsonStr2.put("readDate","20190228");
jsonStr2.put("analysisDate","20190228");
JSONObject jsonStr3 = new JSONObject();
jsonStr3.put("countyNo","11020");
jsonStr3.put("oldPackageNo","11020180227001");
jsonStr3.put("recordNumber",80);
jsonStr3.put("postNumber",30);
jsonStr3.put("unpackedNumber",10);
jsonStr3.put("readDate","20190228");
jsonStr3.put("analysisDate","20190228");
JSONObject jsonStr4 = new JSONObject();
jsonStr4.put("countyNo","11020");
jsonStr4.put("oldPackageNo","11020180227001");
jsonStr4.put("recordNumber",80);
jsonStr4.put("postNumber",30);
jsonStr4.put("unpackedNumber",10);
jsonStr4.put("readDate","20190228");
jsonStr4.put("analysisDate","20190228");
JSONObject jsonStr5 = new JSONObject();
jsonStr5.put("countyNo","11020");
jsonStr5.put("oldPackageNo","11020180227001");
jsonStr5.put("recordNumber",80);
jsonStr5.put("postNumber",30);
jsonStr5.put("unpackedNumber",10);
jsonStr5.put("readDate","20190228");
jsonStr5.put("analysisDate","20190228");
JSONObject jsonStr6 = new JSONObject();
jsonStr6.put("countyNo","11020");
jsonStr6.put("oldPackageNo","11020180227001");
jsonStr6.put("recordNumber",80);
jsonStr6.put("postNumber",30);
jsonStr6.put("unpackedNumber",10);
jsonStr6.put("readDate","20190228");
jsonStr6.put("analysisDate","20190228");
JSONObject jsonStr7 = new JSONObject();
jsonStr7.put("countyNo","11020");
jsonStr7.put("oldPackageNo","11020180227001");
jsonStr7.put("recordNumber",80);
jsonStr7.put("postNumber",30);
jsonStr7.put("unpackedNumber",10);
jsonStr7.put("readDate","20190228");
jsonStr7.put("analysisDate","20190228");
JSONObject jsonStr8 = new JSONObject();
jsonStr8.put("countyNo","11020");
jsonStr8.put("oldPackageNo","11020180227001");
jsonStr8.put("recordNumber",80);
jsonStr8.put("postNumber",30);
jsonStr8.put("unpackedNumber",10);
jsonStr8.put("readDate","20190228");
jsonStr8.put("analysisDate","20190228");
countyList.add(jsonStr1);
countyList.add(jsonStr2);
countyList.add(jsonStr3);
countyList.add(jsonStr4);
countyList.add(jsonStr5);
countyList.add(jsonStr6);
countyList.add(jsonStr7);
countyList.add(jsonStr8);
return countyList.toString();
}
}
src/main/java/com/yxproject/start/api/fakeApi/selectExcelApi.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.api.fakeApi;
import net.sf.json.JSONObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping("selectXMLApi")
public class selectExcelApi {
/**
* 邮寄信息查询
* 根据文件名和状态查询邮寄信息数据，返回数据List集合
* @param fileName
* @param state
* @return countyList
*/
@RequestMapping("selectExcel")
public String selectExcel(@Param("fileName") String fileName, @Param("state") String state){
List<JSONObject> countyList = new ArrayList<>();
JSONObject jsonStr1 = new JSONObject();
jsonStr1.put("beginDate","20190221");
jsonStr1.put("deadline","20190228");
jsonStr1.put("fileName","格口导出.excel");
jsonStr1.put("uploadDate","20190227");
jsonStr1.put("state","未解析");
JSONObject jsonStr2 = new JSONObject();
jsonStr2.put("beginDate","20190221");
jsonStr2.put("deadline","20190228");
jsonStr2.put("fileName","格口导出.excel");
jsonStr2.put("uploadDate","20190227");
jsonStr2.put("state","未解析");
JSONObject jsonStr3 = new JSONObject();
jsonStr3.put("beginDate","20190221");
jsonStr3.put("deadline","20190228");
jsonStr3.put("fileName","格口导出.excel");
jsonStr3.put("uploadDate","20190227");
jsonStr3.put("state","未解析");
JSONObject jsonStr4 = new JSONObject();
jsonStr4.put("beginDate","20190221");
jsonStr4.put("deadline","20190228");
jsonStr4.put("fileName","格口导出.excel");
jsonStr4.put("uploadDate","20190227");
jsonStr4.put("state","未解析");
JSONObject jsonStr5 = new JSONObject();
jsonStr5.put("beginDate","20190221");
jsonStr5.put("deadline","20190228");
jsonStr5.put("fileName","格口导出.excel");
jsonStr5.put("uploadDate","20190227");
jsonStr5.put("state","未解析");
JSONObject jsonStr6 = new JSONObject();
jsonStr6.put("beginDate","20190221");
jsonStr6.put("deadline","20190228");
jsonStr6.put("fileName","格口导出.excel");
jsonStr6.put("uploadDate","20190227");
jsonStr6.put("state","未解析");
JSONObject jsonStr7 = new JSONObject();
jsonStr7.put("beginDate","20190221");
jsonStr7.put("deadline","20190228");
jsonStr7.put("fileName","格口导出.excel");
jsonStr7.put("uploadDate","20190227");
jsonStr7.put("state","未解析");
JSONObject jsonStr8 = new JSONObject();
jsonStr8.put("beginDate","20190221");
jsonStr8.put("deadline","20190228");
jsonStr8.put("fileName","格口导出.excel");
jsonStr8.put("uploadDate","20190227");
jsonStr8.put("state","未解析");
JSONObject jsonStr9 = new JSONObject();
jsonStr9.put("beginDate","20190221");
jsonStr9.put("deadline","20190228");
jsonStr9.put("fileName","格口导出.excel");
jsonStr9.put("uploadDate","20190227");
jsonStr9.put("state","未解析");
JSONObject jsonStr10 = new JSONObject();
jsonStr10.put("beginDate","20190221");
jsonStr10.put("deadline","20190228");
jsonStr10.put("fileName","格口导出.excel");
jsonStr10.put("uploadDate","20190227");
jsonStr10.put("state","已解析");
JSONObject jsonStr11 = new JSONObject();
jsonStr11.put("beginDate","20190221");
jsonStr11.put("deadline","20190228");
jsonStr11.put("fileName","格口导出.excel");
jsonStr11.put("uploadDate","20190227");
jsonStr11.put("state","已解析");
countyList.add(jsonStr1);
countyList.add(jsonStr2);
countyList.add(jsonStr3);
countyList.add(jsonStr4);
countyList.add(jsonStr5);
countyList.add(jsonStr6);
countyList.add(jsonStr7);
countyList.add(jsonStr8);
countyList.add(jsonStr9);
countyList.add(jsonStr10);
countyList.add(jsonStr11);
return countyList.toString();
}
}
src/main/java/com/yxproject/start/api/fakeApi/selectPostData.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.api.fakeApi;
import net.sf.json.JSONObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping("selectPostData")
public class selectPostData {
/**
* 邮寄信息查询
* @param name
* @param formNo
* @param serialNo
* @param printState
* @param latticeMouth
* @param county
* @param readDate
* @return postList
*/
@RequestMapping("selectPost")
public String selectPost(@Param("name")String name,@Param("formNo")String formNo,@Param("serialNo")String serialNo,@Param("printState")String printState,@Param("latticeMouth")String latticeMouth,@Param("county")String county,@Param("readDate")String readDate){
List<JSONObject> postList = new ArrayList<>();
JSONObject jsonStr1 = new JSONObject();
jsonStr1.put("formNo",formNo);
jsonStr1.put("waybillNumber","2102968392945");
jsonStr1.put("backWaybillNumber","2163968602938");
jsonStr1.put("firstWhite","1100120172018121900012");
jsonStr1.put("recipientName","杨家将");
jsonStr1.put("senderPhone","18532624082");
jsonStr1.put("issuingAuthority","马连洼派出所");
jsonStr1.put("applicantName","杨家将");
jsonStr1.put("printDate","20190302");
postList.add(jsonStr1);
return postList.toString();
}
}
src/main/java/com/yxproject/start/api/fakeApi/selectXMLApi.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.api.fakeApi;
import net.sf.json.JSONObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping("selectXMLApi")
public class selectXMLApi {
/**
* 制证信息查询
* 按日期和状态查询制证信息数据，返回List集合
* @param date
* @param state
* @return countyList
*/
@RequestMapping("selectXml")
public String selectXml(@Param("date") String date, @Param("state") String state){
List<JSONObject> countyList = new ArrayList<>();
JSONObject jsonStr1 = new JSONObject();
jsonStr1.put("uploadDate","20190301");
jsonStr1.put("packageCount",300);
jsonStr1.put("cardCount",28000);
jsonStr1.put("commonCardCount",16000);
jsonStr1.put("postCardCount",12000);
JSONObject jsonStr2 = new JSONObject();
jsonStr2.put("uploadDate","20190301");
jsonStr2.put("packageCount",300);
jsonStr2.put("cardCount",28000);
jsonStr2.put("commonCardCount",16000);
jsonStr2.put("postCardCount",12000);
JSONObject jsonStr3 = new JSONObject();
jsonStr3.put("uploadDate","20190301");
jsonStr3.put("packageCount",300);
jsonStr3.put("cardCount",28000);
jsonStr3.put("commonCardCount",16000);
jsonStr3.put("postCardCount",12000);
JSONObject jsonStr4 = new JSONObject();
jsonStr4.put("uploadDate","20190301");
jsonStr4.put("packageCount",300);
jsonStr4.put("cardCount",28000);
jsonStr4.put("commonCardCount",16000);
jsonStr4.put("postCardCount",12000);
JSONObject jsonStr5 = new JSONObject();
jsonStr5.put("uploadDate","20190301");
jsonStr5.put("packageCount",300);
jsonStr5.put("cardCount",28000);
jsonStr5.put("commonCardCount",16000);
jsonStr5.put("postCardCount",12000);
JSONObject jsonStr6 = new JSONObject();
jsonStr6.put("uploadDate","20190301");
jsonStr6.put("packageCount",300);
jsonStr6.put("cardCount",28000);
jsonStr6.put("commonCardCount",16000);
jsonStr6.put("postCardCount",12000);
JSONObject jsonStr7 = new JSONObject();
jsonStr7.put("uploadDate","20190301");
jsonStr7.put("packageCount",300);
jsonStr7.put("cardCount",28000);
jsonStr7.put("commonCardCount",16000);
jsonStr7.put("postCardCount",12000);
JSONObject jsonStr8 = new JSONObject();
jsonStr8.put("uploadDate","20190301");
jsonStr8.put("packageCount",300);
jsonStr8.put("cardCount",28000);
jsonStr8.put("commonCardCount",16000);
jsonStr8.put("postCardCount",12000);
JSONObject jsonStr9 = new JSONObject();
jsonStr9.put("uploadDate","20190301");
jsonStr9.put("packageCount",300);
jsonStr9.put("cardCount",28000);
jsonStr9.put("commonCardCount",16000);
jsonStr9.put("postCardCount",12000);
JSONObject jsonStr10 = new JSONObject();
jsonStr10.put("uploadDate","20190301");
jsonStr10.put("packageCount",300);
jsonStr10.put("cardCount",28000);
jsonStr10.put("commonCardCount",16000);
jsonStr10.put("postCardCount",12000);
JSONObject jsonStr11 = new JSONObject();
jsonStr11.put("uploadDate","20190301");
jsonStr11.put("packageCount",300);
jsonStr11.put("cardCount",28000);
jsonStr11.put("commonCardCount",16000);
jsonStr11.put("postCardCount",12000);
countyList.add(jsonStr1);
countyList.add(jsonStr2);
countyList.add(jsonStr3);
countyList.add(jsonStr4);
countyList.add(jsonStr5);
countyList.add(jsonStr6);
countyList.add(jsonStr7);
countyList.add(jsonStr8);
countyList.add(jsonStr9);
countyList.add(jsonStr10);
countyList.add(jsonStr11);
return countyList.toString();
}
}
src/main/java/com/yxproject/start/entity/ApplyReasonTDicEntity.java
View file @ f85f3ad6
......@@ -4,7 +4,7 @@ import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "APPLY_REASON_T_DIC", schema = "YX", catalog = "")
@Table(name = "APPLY_REASON_T_DIC", schema = "YINGXIN", catalog = "")
public class ApplyReasonTDicEntity {
private long applyReasonCode;
private String applyReason;
......
src/main/java/com/yxproject/start/entity/CardBodyEntity.java
View file @ f85f3ad6
......@@ -5,7 +5,7 @@ import java.sql.Time;
import java.util.Objects;
@Entity
@Table(name = "CARD_BODY", schema = "YX", catalog = "")
@Table(name = "CARD_BODY", schema = "YINGXIN", catalog = "")
public class CardBodyEntity {
private long cardBodyId;
private Time saveDate;
......
src/main/java/com/yxproject/start/entity/CardDetailedListEntity.java
View file @ f85f3ad6
......@@ -4,7 +4,7 @@ import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "CARD_DETAILED_LIST", schema = "YX", catalog = "")
@Table(name = "CARD_DETAILED_LIST", schema = "YINGXIN", catalog = "")
public class CardDetailedListEntity {
private long cardDetailedListId;
private String polistListId;
......
src/main/java/com/yxproject/start/entity/CardTypeDicEntity.java
View file @ f85f3ad6
......@@ -4,7 +4,7 @@ import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "CARD_TYPE_DIC", schema = "YX", catalog = "")
@Table(name = "CARD_TYPE_DIC", schema = "YINGXIN", catalog = "")
public class CardTypeDicEntity {
private String cardType;
private long cardTypeId;
......
src/main/java/com/yxproject/start/entity/CountyDicEntity.java
View file @ f85f3ad6
......@@ -4,7 +4,7 @@ import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "COUNTY_DIC", schema = "YX", catalog = "")
@Table(name = "COUNTY_DIC", schema = "YINGXIN", catalog = "")
public class CountyDicEntity {
private String countyCode;
private String countyname;
......
src/main/java/com/yxproject/start/entity/FailedCardEntity.java
View file @ f85f3ad6
......@@ -5,7 +5,7 @@ import java.sql.Time;
import java.util.Objects;
@Entity
@Table(name = "FAILED_CARD", schema = "YX", catalog = "")
@Table(name = "FAILED_CARD", schema = "YINGXIN", catalog = "")
public class FailedCardEntity {
private long failedCardId;
private Long failedCardReasonId;
......
src/main/java/com/yxproject/start/entity/FailedCardReasonDicEntity.java
View file @ f85f3ad6
......@@ -4,7 +4,7 @@ import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "FAILED_CARD_REASON_DIC", schema = "YX", catalog = "")
@Table(name = "FAILED_CARD_REASON_DIC", schema = "YINGXIN", catalog = "")
public class FailedCardReasonDicEntity {
private long failedCardReasonId;
private String failedCardReason;
......
src/main/java/com/yxproject/start/entity/FileNameDicEntity.java
View file @ f85f3ad6
......@@ -10,7 +10,7 @@ import java.util.Objects;
* 2019/3/1 10:39
*/
@Entity
@Table(name = "FILE_NAME_DIC", schema = "YX", catalog = "")
@Table(name = "FILE_NAME_DIC", schema = "YINGXIN", catalog = "")
public class FileNameDicEntity {
private long fileId;
private String fileName;
......
src/main/java/com/yxproject/start/entity/FilesEntity.java
View file @ f85f3ad6
......@@ -6,7 +6,7 @@ import java.util.Date;
import java.util.Objects;
@Entity
@Table(name = "FILES", schema = "YX", catalog = "")
@Table(name = "FILES", schema = "YINGXIN", catalog = "")
public class FilesEntity {
private String versionCode;
private String dwdm;
......
src/main/java/com/yxproject/start/entity/GajgDmEntity.java
View file @ f85f3ad6
......@@ -4,7 +4,7 @@ import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "GAJG_DM", schema = "YX", catalog = "")
@Table(name = "GAJG_DM", schema = "YINGXIN", catalog = "")
public class GajgDmEntity {
private String gajgId;
private String gajgDm;
......
src/main/java/com/yxproject/start/entity/GroupNoEntity.java
View file @ f85f3ad6
......@@ -4,15 +4,17 @@ import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "GROUP_NO", schema = "YX", catalog = "")
@Table(name = "GROUP_NO", schema = "YINGXIN", catalog = "")
public class GroupNoEntity {
private String groupNo;
private Long taskId;
private Long validCount;
private Long invalidCount;
private Long specialCardCount;
private long id;
@Id
@Basic
@Column(name = "GROUP_NO")
public String getGroupNo() {
return groupNo;
......@@ -62,12 +64,23 @@ public class GroupNoEntity {
this.specialCardCount = specialCardCount;
}
@Id
@Column(name = "ID")
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
GroupNoEntity that = (GroupNoEntity) o;
return Objects.equals(groupNo, that.groupNo) &&
return id == that.id &&
Objects.equals(groupNo, that.groupNo) &&
Objects.equals(taskId, that.taskId) &&
Objects.equals(validCount, that.validCount) &&
Objects.equals(invalidCount, that.invalidCount) &&
......@@ -76,6 +89,6 @@ public class GroupNoEntity {
@Override
public int hashCode() {
return Objects.hash(groupNo, taskId, validCount, invalidCount, specialCardCount);
return Objects.hash(groupNo, taskId, validCount, invalidCount, specialCardCount, id);
}
}
src/main/java/com/yxproject/start/entity/PersonPostEntity.java
View file @ f85f3ad6
......@@ -5,7 +5,7 @@ import java.sql.Time;
import java.util.Objects;
@Entity
@Table(name = "PERSON_POST", schema = "YX", catalog = "")
@Table(name = "PERSON_POST", schema = "YINGXIN", catalog = "")
public class PersonPostEntity {
private String waybillNumber;
private String backWaybillNumber;
......
src/main/java/com/yxproject/start/entity/PlasticFilmEntity.java
View file @ f85f3ad6
......@@ -5,7 +5,7 @@ import java.sql.Time;
import java.util.Objects;
@Entity
@Table(name = "PLASTIC_FILM", schema = "YX", catalog = "")
@Table(name = "PLASTIC_FILM", schema = "YINGXIN", catalog = "")
public class PlasticFilmEntity {
private long plasticFilmId;
private Time saveDate;
......
src/main/java/com/yxproject/start/entity/PoliceStationApplyReasonEntity.java
View file @ f85f3ad6
......@@ -5,7 +5,7 @@ import java.sql.Time;
import java.util.Objects;
@Entity
@Table(name = "POLICE_STATION_APPLY_REASON", schema = "YX", catalog = "")
@Table(name = "POLICE_STATION_APPLY_REASON", schema = "YINGXIN", catalog = "")
public class PoliceStationApplyReasonEntity {
private long policeStationApplyReasonId;
private Time saveDate;
......
src/main/java/com/yxproject/start/entity/PoliceStationVailedEntity.java
View file @ f85f3ad6
......@@ -5,7 +5,7 @@ import java.sql.Time;
import java.util.Objects;
@Entity
@Table(name = "POLICE_STATION_VAILED", schema = "YX", catalog = "")
@Table(name = "POLICE_STATION_VAILED", schema = "YINGXIN", catalog = "")
public class PoliceStationVailedEntity {
private long policeStationVailedId;
private Long taskId;
......
src/main/java/com/yxproject/start/entity/PreproPersonEntity.java
View file @ f85f3ad6
......@@ -4,7 +4,7 @@ import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "PREPRO_PERSON", schema = "YX", catalog = "")
@Table(name = "PREPRO_PERSON", schema = "YINGXIN", catalog = "")
public class PreproPersonEntity {
private String jmsfzslh;
private String gmsfhm;
......
src/main/java/com/yxproject/start/entity/PrinterDicEntity.java
View file @ f85f3ad6
......@@ -4,7 +4,7 @@ import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "PRINTER_DIC", schema = "YX", catalog = "")
@Table(name = "PRINTER_DIC", schema = "YINGXIN", catalog = "")
public class PrinterDicEntity {
private long printerId;
private String printerName;
......
src/main/java/com/yxproject/start/entity/ReceiptListEntity.java
View file @ f85f3ad6
......@@ -5,7 +5,7 @@ import java.sql.Time;
import java.util.Objects;
@Entity
@Table(name = "RECEIPT_LIST", schema = "YX", catalog = "")
@Table(name = "RECEIPT_LIST", schema = "YINGXIN", catalog = "")
public class ReceiptListEntity {
private long id;
private Long taskId;
......
src/main/java/com/yxproject/start/entity/SpecialCardEntity.java
View file @ f85f3ad6
......@@ -5,7 +5,7 @@ import java.sql.Time;
import java.util.Objects;
@Entity
@Table(name = "SPECIAL_CARD", schema = "YX", catalog = "")
@Table(name = "SPECIAL_CARD", schema = "YINGXIN", catalog = "")
public class SpecialCardEntity {
private long specialCardId;
private String acceptNo;
......
src/main/java/com/yxproject/start/entity/TaskEntity.java
View file @ f85f3ad6
......@@ -5,23 +5,32 @@ import java.sql.Time;
import java.util.Objects;
@Entity
@Table(name = "TASK", schema = "YX", catalog = "")
@Table(name = "TASK", schema = "YINGXIN", catalog = "")
public class TaskEntity {
private long taskId;
private Long cardType;
private Long oldCardType;
private String countyCode;
private Time submitDate;
private String submitName;
private Time issuedDate;
private String issuedName;
private Time downloadDate;
private String downloadName;
private Time printOutDate;
private String printOutName;
private Time positionDate;
private String positionName;
private Time outWorkshopDate;
private String qualityPeopleName;
private String outWorkshopName;
private String qualityTestName;
private Time qualityTestDate;
private String exceptionInformation;
private Time outStorageDate;
private String outStorageName;
private Time inStorageDate;
private String inStorageName;
private Long taskStateId;
private Long isException;
private Long printerId;
......@@ -78,6 +87,16 @@ public class TaskEntity {
this.submitDate = submitDate;
}
@Basic
@Column(name = "SUBMIT_NAME")
public String getSubmitName() {
return submitName;
}
public void setSubmitName(String submitName) {
this.submitName = submitName;
}
@Basic
@Column(name = "ISSUED_DATE")
public Time getIssuedDate() {
......@@ -88,6 +107,16 @@ public class TaskEntity {
this.issuedDate = issuedDate;
}
@Basic
@Column(name = "ISSUED_NAME")
public String getIssuedName() {
return issuedName;
}
public void setIssuedName(String issuedName) {
this.issuedName = issuedName;
}
@Basic
@Column(name = "DOWNLOAD_DATE")
public Time getDownloadDate() {
......@@ -98,6 +127,16 @@ public class TaskEntity {
this.downloadDate = downloadDate;
}
@Basic
@Column(name = "DOWNLOAD_NAME")
public String getDownloadName() {
return downloadName;
}
public void setDownloadName(String downloadName) {
this.downloadName = downloadName;
}
@Basic
@Column(name = "PRINT_OUT_DATE")
public Time getPrintOutDate() {
......@@ -108,6 +147,16 @@ public class TaskEntity {
this.printOutDate = printOutDate;
}
@Basic
@Column(name = "PRINT_OUT_NAME")
public String getPrintOutName() {
return printOutName;
}
public void setPrintOutName(String printOutName) {
this.printOutName = printOutName;
}
@Basic
@Column(name = "POSITION_DATE")
public Time getPositionDate() {
......@@ -118,6 +167,16 @@ public class TaskEntity {
this.positionDate = positionDate;
}
@Basic
@Column(name = "POSITION_NAME")
public String getPositionName() {
return positionName;
}
public void setPositionName(String positionName) {
this.positionName = positionName;
}
@Basic
@Column(name = "OUT_WORKSHOP_DATE")
public Time getOutWorkshopDate() {
......@@ -129,13 +188,23 @@ public class TaskEntity {
}
@Basic
@Column(name = "QUALITY_PEOPLE_NAME")
public String getQualityPeopleName() {
return qualityPeopleName;
@Column(name = "OUT_WORKSHOP_NAME")
public String getOutWorkshopName() {
return outWorkshopName;
}
public void setOutWorkshopName(String outWorkshopName) {
this.outWorkshopName = outWorkshopName;
}
@Basic
@Column(name = "QUALITY_TEST_NAME")
public String getQualityTestName() {
return qualityTestName;
}
public void setQualityPeopleName(String qualityPeopleName) {
this.qualityPeopleName = qualityPeopleName;
public void setQualityTestName(String qualityTestName) {
this.qualityTestName = qualityTestName;
}
@Basic
......@@ -168,6 +237,16 @@ public class TaskEntity {
this.outStorageDate = outStorageDate;
}
@Basic
@Column(name = "OUT_STORAGE_NAME")
public String getOutStorageName() {
return outStorageName;
}
public void setOutStorageName(String outStorageName) {
this.outStorageName = outStorageName;
}
@Basic
@Column(name = "IN_STORAGE_DATE")
public Time getInStorageDate() {
......@@ -178,6 +257,16 @@ public class TaskEntity {
this.inStorageDate = inStorageDate;
}
@Basic
@Column(name = "IN_STORAGE_NAME")
public String getInStorageName() {
return inStorageName;
}
public void setInStorageName(String inStorageName) {
this.inStorageName = inStorageName;
}
@Basic
@Column(name = "TASK_STATE_ID")
public Long getTaskStateId() {
......@@ -238,16 +327,24 @@ public class TaskEntity {
Objects.equals(oldCardType, that.oldCardType) &&
Objects.equals(countyCode, that.countyCode) &&
Objects.equals(submitDate, that.submitDate) &&
Objects.equals(submitName, that.submitName) &&
Objects.equals(issuedDate, that.issuedDate) &&
Objects.equals(issuedName, that.issuedName) &&
Objects.equals(downloadDate, that.downloadDate) &&
Objects.equals(downloadName, that.downloadName) &&
Objects.equals(printOutDate, that.printOutDate) &&
Objects.equals(printOutName, that.printOutName) &&
Objects.equals(positionDate, that.positionDate) &&
Objects.equals(positionName, that.positionName) &&
Objects.equals(outWorkshopDate, that.outWorkshopDate) &&
Objects.equals(qualityPeopleName, that.qualityPeopleName) &&
Objects.equals(outWorkshopName, that.outWorkshopName) &&
Objects.equals(qualityTestName, that.qualityTestName) &&
Objects.equals(qualityTestDate, that.qualityTestDate) &&
Objects.equals(exceptionInformation, that.exceptionInformation) &&
Objects.equals(outStorageDate, that.outStorageDate) &&
Objects.equals(outStorageName, that.outStorageName) &&
Objects.equals(inStorageDate, that.inStorageDate) &&
Objects.equals(inStorageName, that.inStorageName) &&
Objects.equals(taskStateId, that.taskStateId) &&
Objects.equals(isException, that.isException) &&
Objects.equals(printerId, that.printerId) &&
......@@ -257,6 +354,6 @@ public class TaskEntity {
@Override
public int hashCode() {
return Objects.hash(taskId, cardType, oldCardType, countyCode, submitDate, issuedDate, downloadDate, printOutDate, positionDate, outWorkshopDate, qualityPeopleName, qualityTestDate, exceptionInformation, outStorageDate, inStorageDate, taskStateId, isException, printerId, beginPageNumber, finishPageNumber);
return Objects.hash(taskId, cardType, oldCardType, countyCode, submitDate, submitName, issuedDate, issuedName, downloadDate, downloadName, printOutDate, printOutName, positionDate, positionName, outWorkshopDate, outWorkshopName, qualityTestName, qualityTestDate, exceptionInformation, outStorageDate, outStorageName, inStorageDate, inStorageName, taskStateId, isException, printerId, beginPageNumber, finishPageNumber);
}
}
src/main/java/com/yxproject/start/entity/TaskStateDicEntity.java
View file @ f85f3ad6
......@@ -4,7 +4,7 @@ import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "TASK_STATE_DIC", schema = "YX", catalog = "")
@Table(name = "TASK_STATE_DIC", schema = "YINGXIN", catalog = "")
public class TaskStateDicEntity {
private long taskStateId;
private String taskState;
......
src/main/java/com/yxproject/start/mapper/CardDetailedListMapper.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
/**
* @auther zhangyusheng
* 2019/3/1 21:27
*/
@Mapper
public interface CardDetailedListMapper {
}
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ f85f3ad6
package com.yxproject.start.mapper;
import com.sun.xml.internal.bind.v2.TODO;
import com.yxproject.start.entity.PersonPostEntity;
import org.apache.ibatis.annotations.*;
import java.util.List;
......@@ -32,10 +32,10 @@ public interface PersonPostMapper {
" <when test='orderNumber!=null'> and PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
" <when test='state!=null'> and PERSON_POST.STATE=#{state} </when>" +
" <when test='latticeMouthInformation!=null'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" +
" <when test='getToCounty!=null'> and PERSON_POST.GET_TO_COUNTY =#{getToCounty} </when>" +
" <when test='getToCounty!=null'> and PERSON_POST.GET_TO_COUNTY in ( #{getToCounty} ) </when>" +
" <when test='uploadDate!=null'> and FILE_NAME_DIC.UPLOAD_DATE=#{uploadDate} </when>" +
"PERSON_POST limit #{firstIndex},#{pageSize}")
public List<PersonPostEntity> findAllPersonalData(@Param("applicantName")String applicantName,@Param("orderNumber")String orderNumber,@Param("state")String state,@Param("latticeMouthInformation")String latticeMouthInformation,List<String> getToCounty,@Param("uploadDate")String uploadDate,@Param("firstIndex")String firstIndex,@Param("pageSize")String pageSize);
public List<PersonPostEntity> findAllPersonalData(@Param("applicantName")String applicantName,@Param("orderNumber")String orderNumber,@Param("state")String state,@Param("latticeMouthInformation")String latticeMouthInformation,@Param("getToCounty")String getToCounty,@Param("uploadDate")String uploadDate,@Param("firstIndex")String firstIndex,@Param("pageSize")String pageSize);
@Delete("DELETE PERSON_POST " +
"WHERE 1=1" +
......@@ -43,7 +43,7 @@ public interface PersonPostMapper {
" <when test='orderNumber!=null'> and PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
" <when test='state!=null'> and PERSON_POST.STATE=#{state} </when>" +
" <when test='latticeMouthInformation!=null'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" +
" <when test='getToCounty!=null'> and PERSON_POST.GET_TO_COUNTY =#{getToCounty} </when>" +
" <when test='getToCounty!=null'> and PERSON_POST.GET_TO_COUNTY in ( #{getToCounty}) </when>" +
" <when test='uploadDate!=null'> and FILE_NAME_DIC.UPLOAD_DATE=#{uploadDate} </when>")
public boolean deleteAllPersonalData(@Param("applicantName")String applicantName,@Param("orderNumber")String orderNumber,@Param("state")String state,@Param("latticeMouthInformation")String latticeMouthInformation,List<String> getToCounty ,@Param("uploadDate")String uploadDate);
......
src/main/java/com/yxproject/start/mapper/ReceiptListMapper.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
/**
* @auther zhangyusheng
* 2019/3/1 21:41
*/
@Mapper
public interface ReceiptListMapper {
}
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ f85f3ad6
package com.yxproject.start.mapper;
import com.yxproject.start.entity.TaskList.TaskListEntity;
import com.yxproject.start.entity.TaskList.CountCountyEntity;
import com.yxproject.start.entity.TaskList.CountGajgEntity;
import com.yxproject.start.entity.TaskList.TaskListEntity;
import org.apache.ibatis.annotations.*;
import java.util.List;
import java.util.Map;
/**
* @author Administrator
......@@ -16,15 +15,16 @@ public interface TaskListMapper {
/**
* 区县计数查询
* 受理库
* @param submitDate
* @return
*/
@Select(" SELECT coun.COUNTYNAME,substr(act.upload_no,0,6),count(*) as count FROM ACC_CARD_T@ACCU_DBLINK act ,count()" +
" LEFT JOIN ACC_GROUP_T@ACCU_DBLINK agt on substr(act.accept_no,0,8) = agt.group_no " +
" LEFT JOIN AUXILIARY.COUNTY_DIC coun on substr(act.upload_no,0,6) = AUXILIARY.coun.county_code " +
" WHERE agt.group_no not in (select AUXILIARY.GROUP_NO.group_no from AUXILIARY.GROUP_NO) " +
" LEFT JOIN COUNTY_DIC coun on substr(act.upload_no,0,6) = coun.county_code " +
" WHERE agt.group_no not in (select GROUP_NO.group_no from GROUP_NO) " +
" and to_char(IMPORT_TIME,'yyyymmdd') = #{submitDate} " +
" GROUP by coun.COUNTYNAME,substr(act.upload_no,0,6);")
" GROUP by coun.COUNTYNAME,substr(act.upload_no,0,6)")
public List<CountCountyEntity> selectByCounty(@Param("submitDate") String submitDate);
......@@ -37,11 +37,11 @@ public interface TaskListMapper {
@Select("SELECT gajg.gajg_mc,substr(act.upload_no,0,9),count(*) as gajg\n" +
" FROM ACC_CARD_T@ACCU_DBLINK act \n" +
" LEFT JOIN ACC_GROUP_T@ACCU_DBLINK agt on substr(act.accept_no,0,8) = agt.group_no \n" +
" LEFT JOIN AUXILIARY.GAJG_DM gajg on substr(act.upload_no,0,9) = AUXILIARY.gajg.gajg_dm\n" +
" WHERE agt.group_no not in (select AUXILIARY.GROUP_NO.group_no from AUXILIARY.GROUP_NO) \n" +
" LEFT JOIN GAJG_DM gajg on substr(act.upload_no,0,9) = gajg.gajg_dm\n" +
" WHERE agt.group_no not in (select GROUP_NO.group_no from GROUP_NO) \n" +
" and to_char(IMPORT_TIME,'yyyymmdd') = #{submitDate} \n" +
" and substr(act.upload_no,0,6) = #{countyCode}\n" +
" GROUP by gajg.GAJG_MC,substr(act.upload_no,0,9);")
" GROUP by gajg.GAJG_MC,substr(act.upload_no,0,9)")
public List<CountGajgEntity> selectByGajg(@Param("submitDate") String submitDate,@Param("countyCode") String countyCount);
......@@ -54,10 +54,10 @@ public interface TaskListMapper {
*/
@Select("SELECT act.ACCEPT_NO, agt.deal_flag, gajg.gajg_mc, gajg.gajg_dm, coun.COUNTYNAME,agt.group_no\n" +
" FROM ACC_CARD_T@ACCU_DBLINK act \n"+
" LEFT JOIN AUXILIARY.COUNTY_DIC coun on substr(act.upload_no,0,6) = AUXILIARY.coun.county_code " +
" LEFT JOIN COUNTY_DIC coun on substr(act.upload_no,0,6) = coun.county_code " +
" LEFT JOIN ACC_GROUP_T@ACCU_DBLINK agt on substr(act.accept_no,0,8) = agt.group_no \n" +
" LEFT JOIN AUXILIARY.GAJG_MC gajg on substr(act.upload_no,0,9) = AUXILIARY.gajg.gajg_dm\n"+
" WHERE agt.group_no not in (select AUXILIARY.GROUP_NO.group_no from AUXILIARY.GROUP_NO) " +
" LEFT JOIN GAJG_MC gajg on substr(act.upload_no,0,9) = gajg.gajg_dm\n"+
" WHERE agt.group_no not in (select GROUP_NO.group_no from GROUP_NO) " +
" and to_char(IMPORT_TIME,'yyyymmdd') = #{submitDate} " +
" and gajg.gajg_dm = #{Gajg} " +
" and coun.county_code = #{countyCode}")
......@@ -80,8 +80,15 @@ public interface TaskListMapper {
@Update("UPDATE TASK SET TASK_STATE_ID=1 WHERE TASK_ID = #{taskId} ")
public boolean updateState(@Param("taskId") String taskId);
@Update("UPDATE TASK SET TASK_")
public boolean updateDate (@Param("unload_date")String unloadDate);
/**
* 区县计数查询
* 辅助库
* @param submitDate
* @return
*/
@Select("")
public List<CountCountyEntity> selectTaskByCounty(@Param("submitDate") String submitDate,@Param("taskState")String taskState);
......
src/main/java/com/yxproject/start/service/CardDetailedListService.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.service;
/**
* @auther zhangyusheng
* 2019/3/1 21:28
*/
public interface CardDetailedListService {
}
src/main/java/com/yxproject/start/service/ReceiptListService.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.service;
/**
* @auther zhangyusheng
* 2019/3/1 21:41
*/
public interface ReceiptListService {
}
src/main/java/com/yxproject/start/service/impl/CardDetailedListServiceImpl.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.service.impl;
import com.yxproject.start.mapper.CardDetailedListMapper;
import com.yxproject.start.service.CardDetailedListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @auther zhangyusheng
* 2019/3/1 21:28
*/
@Service
public class CardDetailedListServiceImpl implements CardDetailedListService {
@Autowired
private CardDetailedListMapper cardDetailedListMapper;
}
src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java
View file @ f85f3ad6
......@@ -43,7 +43,15 @@ public class PersonPostServiceImpl implements PersonPostService {
@Override
public List<PersonPostEntity> findPersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate,String firstIndex,String pageSize){
List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName,orderNumber,state,latticeMouthInformation,getToCounty,uploadDate,firstIndex,pageSize);
String str = null;
for (int i = 0;i<getToCounty.size();i++){
if (i==getToCounty.size()-1){
str+="'"+getToCounty.get(i);
}else {
str+="'"+getToCounty.get(i)+",";
}
}
List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate,firstIndex,pageSize);
return list;
}
......
src/main/java/com/yxproject/start/service/impl/ReceiptListServiceImpl.java 0 → 100644
View file @ f85f3ad6
package com.yxproject.start.service.impl;
import com.yxproject.start.mapper.ReceiptListMapper;
import com.yxproject.start.service.ReceiptListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @auther zhangyusheng
* 2019/3/1 21:42
*/
@Service
public class ReceiptListServiceImpl implements ReceiptListService {
@Autowired
private ReceiptListMapper receiptListMapper;
}
src/main/resources/application.yml
View file @ f85f3ad6
......@@ -4,9 +4,9 @@ server:
spring:
datasource:
driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.1.197:1521:orcl
username: yx
password: yx
url: jdbc:oracle:thin:@192.168.1.102:1521:yingxin
username: yingxin
password: yingxin
servlet:
multipart:
enabled: true
......
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