Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 77dbdb4a authored by guantiantian's avatar guantiantian
Browse files
Options

Merge branch 'dev' of… 

Merge branch 'dev' of http://39.101.130.244:8000/zhangyusheng/YX_IDENT_beijing_auxiliary_YD into dev
parents febd932a 1cb6788d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 482 additions and 197 deletions
pom.xml
View file @ 77dbdb4a
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
......@@ -9,108 +9,120 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.yxproject</groupId>
<artifactId>start</artifactId>
<artifactId>start_yd</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>start</name>
<name>start_yd</name>
<description>Demo project for Spring Boot</description>
<properties>
<java.version>1.8</java.version>
</properties>
<properties>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-core</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-core</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-web-starter</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-web-starter</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>3.14</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>3.14</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
<version>2.6.10</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
<version>2.6.10</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ 77dbdb4a
......@@ -85,7 +85,7 @@ public class ExportXMLApi {
//区分邮寄证和大批证件类型
//大批证
if (cardTypeId == 0) {
if (cardTypeId == 0 || cardTypeId == 10) {
List list = new ArrayList();
List<PreproPersonDto> preproPersonEntityList = (List<PreproPersonDto>) map.get(cardTypeId);
Map<String, Object> mapFileId = new LinkedHashMap<>();
......@@ -140,7 +140,7 @@ public class ExportXMLApi {
List<PreproPersonDto> preproPersonEntityList1 = (List<PreproPersonDto>) list1;
List<FilesEntity> filesEntities = filesService.selectFilesEntityById(preproPersonEntityList1.get(0).getFileId().toString());
FilesEntity filesEntity = new FilesEntity();
if (preproPersonEntityList1.get(0).getCardTypeId() == 9) {
if (preproPersonEntityList1.get(0).getCardTypeId() == 9 || preproPersonEntityList1.get(0).getCardTypeId() == 11) {
filesEntity.setVersionCode("3.00");
filesEntity.setCreateTime(getCurrentDate2String("yyyyMMddhhmmss"));
filesEntity.setDwmc("北京市公安局人口管理总队证件管理大队");
......@@ -211,6 +211,10 @@ public class ExportXMLApi {
* @throws IOException 可能出现文件写入不成功
*/
private String createToMakePackageXML(List<PreproPersonDto> preproPersonEntities, FilesEntity filesEntity, String url) throws IOException,ParseException {
// 重新设置包名中的类型代码为0或9
long cardTypeTem = preproPersonEntities.get(0).getCardTypeId();
if (cardTypeTem == 10) cardTypeTem = 0;
if (cardTypeTem == 11) cardTypeTem = 9;
Document document = DocumentHelper.createDocument();
Element PACKAGE = DocumentHelper.createElement("PACKAGE");
document.setRootElement(PACKAGE);
......@@ -221,7 +225,12 @@ public class ExportXMLApi {
Element DWDM = PACKAGEHEAD.addElement("DWDM");
DWDM.setText(filesEntity.getDwdm());
Element DWMC = PACKAGEHEAD.addElement("DWMC");
DWMC.setText(filesEntity.getDwmc());
// 判断是否为异地首申普 如果是则需要在单位名称上添加【北京市公安局】 异地首申邮寄不用加
if (preproPersonEntities.get(0).getCardTypeId() == 10) {
DWMC.setText("北京市公安局" + filesEntity.getDwmc());
} else {
DWMC.setText(filesEntity.getDwmc());
}
Element JLS = PACKAGEHEAD.addElement("JLS");
JLS.setText(preproPersonEntities.size() + "");
Element SCSJ = PACKAGEHEAD.addElement("SCSJ");
......@@ -235,11 +244,11 @@ public class ExportXMLApi {
long l = newFilesService.saveNewFiles(newFilesEntity);
String xml_seq = querySequenceSercive.selectSequenceNextValue("XML_SEQ");
String files_seq = autoGenericCode(xml_seq, 4);
newFilesEntity.setNewFileName("ZAGL_ZZJH_" + filesEntity.getDwdm() + getCurrentDate2String("yyyyMMdd") + preproPersonEntities.get(0).getCardTypeId() + files_seq);
newFilesEntity.setNewFileName("ZAGL_ZZJH_" + filesEntity.getDwdm() + getCurrentDate2String("yyyyMMdd") + cardTypeTem + files_seq);
newFilesService.updateNewFileName(newFilesEntity);
Element SJBBH = PACKAGEHEAD.addElement("SJBBH");
SJBBH.setText(filesEntity.getDwdm() + getCurrentDate2String("yyyyMMdd") + preproPersonEntities.get(0).getCardTypeId() + files_seq);
SJBBH.setText(filesEntity.getDwdm() + getCurrentDate2String("yyyyMMdd") + cardTypeTem + files_seq);
int NO = 1;
long cardType = 0;
for (PreproPersonDto preproPersonEntity : preproPersonEntities) {
......@@ -295,7 +304,8 @@ public class ExportXMLApi {
NO++;
preproPersonEntity.setNewFileId(newFilesEntity.getId());
cardType = preproPersonEntity.getCardTypeId();
if (cardType == 10) cardType = 0;
if (cardType == 11) cardType = 9;
//民族文字 sid=010210
if (preproPersonEntity.getSid().equals("010210")){
......
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ 77dbdb4a
......@@ -2,6 +2,7 @@ package com.yxproject.start.api;
import com.yxproject.start.entity.*;
import com.yxproject.start.service.FileNameDicService;
import com.yxproject.start.service.GkDicService;
import com.yxproject.start.service.GreenPackageInformationService;
import com.yxproject.start.service.PersonPostService;
import com.yxproject.start.utils.ReadExcel;
......@@ -11,7 +12,6 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
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.RequestParam;
......@@ -38,15 +38,19 @@ import java.util.*;
@RequestMapping("ReadExcel")
public class ReadExcelApi {
@Autowired
PersonPostService personPostService;
@Autowired
FileNameDicService fileNameDicService;
@Autowired
GreenPackageInformationService greenPackageInformationService;
private final PersonPostService personPostService;
private final FileNameDicService fileNameDicService;
private final GreenPackageInformationService greenPackageInformationService;
private final GkDicService gkDicService;
Logger logger = Logger.getLogger(ReadExcelApi.class);
public ReadExcelApi(PersonPostService personPostService, FileNameDicService fileNameDicService, GreenPackageInformationService greenPackageInformationService, GkDicService gkDicService) {
this.personPostService = personPostService;
this.fileNameDicService = fileNameDicService;
this.greenPackageInformationService = greenPackageInformationService;
this.gkDicService = gkDicService;
}
/**
* 导入个人邮寄信息表
*/
......@@ -72,7 +76,7 @@ public class ReadExcelApi {
// 设置上传文件总量的最大值，最大值=同时上传的多个文件的大小的最大值的和，目前设置为4000MB
upload.setSizeMax(1024 * 1024 * 4000);
// 将普通属性存入map中，之后调用
Map<String, String> map = new HashMap<String, String>();
Map<String, String> map = new HashMap<>();
List<FileItem> list = null;
int post=0;
int backPost=0;
......@@ -117,9 +121,10 @@ public class ReadExcelApi {
fileNameDicEntity.setUploadDate(simpleDateFormat.format(new Date()));
fileNameDicEntity.setFormStartTime(replaceDate(startDate));
fileNameDicEntity.setFormDeadline(replaceDate(endDate));
fileNameDicEntity.setState((long) 0);
fileNameDicEntity.setState(0L);
fileNameDicService.saveFileNameDic(fileNameDicEntity);
//保存个人邮寄信息
Map<String, Long> gkMap = gkDicService.getGkDicMap();
List<PersonPostEntity> entityList = new ArrayList<>();
for (int i = 0; i < list1.size(); i++) {
PersonPostEntity personPostEntity = new PersonPostEntity();
......@@ -159,6 +164,7 @@ public class ReadExcelApi {
personPostEntity.setNatureOfTheInformation((String) list2.get(23));
personPostEntity.setFirstWhite(list2.get(24).toString().substring(5, 27));
personPostEntity.setFileId(fileNameDicEntity.getFileId());
personPostEntity.setGk(gkMap);
entityList.add(personPostEntity);
}
personPostService.savePersonPost(entityList);
......
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ 77dbdb4a
......@@ -3,6 +3,7 @@ package com.yxproject.start.api;
import com.yxproject.start.entity.DetailReceiptListEntity;
import com.yxproject.start.entity.ReceiptListEntity;
import com.yxproject.start.service.ReceiptService;
import com.yxproject.start.utils.YdssUtils;
import net.sf.json.JSON;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
......@@ -160,6 +161,8 @@ public class ReceiptApi {
ReceiptListEntity receiptListEntity=new ReceiptListEntity();
Long card_type=Long.valueOf((BigDecimal) receiptListDate.get(i).get("CARD_TYPE") + "");
receiptListEntity.setCardTypeId(card_type);
String slh = receiptListDate.get(i).get("UPLOAD_NO").toString();
boolean ydss = YdssUtils.personIsYdss(slh);
//个人邮寄证，单位代码保存为北京市公安局
if(card_type == 9){
receiptListEntity.setPoliceCode("110001580800");
......@@ -170,16 +173,18 @@ public class ReceiptApi {
//个人邮寄分局代码使用110001名称使异地个人邮寄
//普通证通过制证包派出所单位代码获取分局
receiptListEntity.setFjdm(receiptListDate.get(0).get("FJDM").toString());
String fjmc=null;
String fjmc;
if (card_type == 9) {
receiptListEntity.setFjdm("110001");
fjmc = "北京市公安局";
if (ydss) receiptListEntity.setCardTypeId(11L);
} else if (card_type == 5) {
fjmc=receiptListDate.get(0).get("FJMC").toString()+"(港澳)";
} else if (card_type == 7) {
fjmc=receiptListDate.get(0).get("FJMC").toString()+"(台湾)";
}else {
fjmc=receiptListDate.get(0).get("FJMC").toString();
if (ydss) receiptListEntity.setCardTypeId(10L);
}
if ("null".equals(receiptListDate.get(i).get("OLD_CARD_TYPE") + "")){
......@@ -322,6 +327,12 @@ public class ReceiptApi {
//todo 校验大批证中是否存在邮寄证
receiptListEntity.setQrCode(acceptNo);//封签编号
receiptListEntity.setCardTypeId(Long.valueOf(cardType));//制证类型
boolean ydss = YdssUtils.personIsYdss(uploadNo);
if (ydss) {
if (receiptListEntity.getCardTypeId() == 9) receiptListEntity.setCardTypeId(11L);
if (receiptListEntity.getCardTypeId() == 8) receiptListEntity.setCardTypeId(10L);
}
if ("null".equals(oldCardType)){
}else{
......@@ -334,6 +345,7 @@ public class ReceiptApi {
//普通证通过制证包派出所单位代码获取分局
switch (cardType){
case "9":
case "11":
receiptListEntity.setPoliceCode("110001580800");
receiptListEntity.setFjdm("110001");
break;
......@@ -425,6 +437,12 @@ public class ReceiptApi {
case "9":
resultMap.get(i).put("FJMC", "异地速递");
break;
case "10":
resultMap.get(i).put("FJMC", "异地证(本市系统)普");
break;
case "11":
resultMap.get(i).put("FJMC", "异地证(本市系统)邮");
break;
}
}
......@@ -468,6 +486,12 @@ public class ReceiptApi {
case "9":
resultMap.get(i).put("FJMC", "异地速递");
break;
case "10":
resultMap.get(i).put("FJMC", "异地证(本市系统)普");
break;
case "11":
resultMap.get(i).put("FJMC", "异地证(本市系统)邮");
break;
}
//判断是否是特证
if (groupNo.length() == 10) {//受理号长度为10
......
src/main/java/com/yxproject/start/api/queryPreproPerson.java
View file @ 77dbdb4a
......@@ -44,6 +44,8 @@ public class queryPreproPerson {
map.put("total", preproPersonEntityList.size());
int youSum = 0;
int puSum = 0;
int yidishoushenpuSum = 0; //异地首申普
int yidishoushenyouSum = 0; //异地首申邮
int invaildCount = 0;
for (Map<String, Object> map1 : preproPersonEntityList) {
if ("9".equals(map1.get("CARD_TYPE_ID") + "")) {
......@@ -51,6 +53,8 @@ public class queryPreproPerson {
} else if ("0".equals(map1.get("CARD_TYPE_ID") + "")) {
puSum++;
}
if ("10".equals(map1.get("CARD_TYPE_ID") + "")) yidishoushenpuSum++;
if ("11".equals(map1.get("CARD_TYPE_ID") + "")) yidishoushenyouSum++;
if ("0".equals(map1.get("IS_VALID") + "")) {
invaildCount++;
}
......@@ -58,6 +62,8 @@ public class queryPreproPerson {
map.put("list", preproPersonEntities);
map.put("youSum", youSum);
map.put("puSum", puSum);
map.put("ydsspuSum", yidishoushenpuSum);
map.put("ydssyouSum", yidishoushenyouSum);
map.put("invaildCount", invaildCount);
} catch (Exception e) {
logger.error("oldFile：" + uploadNo + "公民身份号码：" + IDCard + "包号：" + oldFile + "文件名：" + newFile + "签发机关：" + SSXQDM + "制证类型代码（9邮寄0大批）：" + cardType + "是否有效（1有效，0无效）：" + state + "上传时间：" + replaceDate(uploadDate1) + replaceDate(uploadDate2) + "页数：" + currPage + "条数：" + pageSize + "生成时间：" + downloadState);
......
src/main/java/com/yxproject/start/entity/FilesEntity.java
View file @ 77dbdb4a
package com.yxproject.start.entity;
import lombok.ToString;
import javax.persistence.*;
import java.sql.Time;
import java.util.Date;
import java.util.Objects;
@ToString
@Entity
@Table(name = "FILES", schema = "YINGXIN", catalog = "")
public class FilesEntity {
......
src/main/java/com/yxproject/start/entity/GkDicEntity.java 0 → 100644
View file @ 77dbdb4a
package com.yxproject.start.entity;
import lombok.*;
import javax.persistence.*;
@Data
@Entity
@Table(name = "GK_DIC", schema = "YINGXIN", catalog = "")
public class GkDicEntity {
/**
* id
*/
@Id
@Column(name = "ID")
private Long id;
/**
* 省
*/
@Basic
@Column(name = "PROVINCE")
private String province;
/**
* 市
*/
@Basic
@Column(name = "CITY")
private String city;
/**
* 区县
*/
@Basic
@Column(name = "DISTRICT")
private String district;
/**
* 对应字母
*/
@Basic
@Column(name = "LETTER")
private String letter;
/**
* 机构名称
*/
@Basic
@Column(name = "NAME")
private String organName;
/**
* 对应编码
*/
@Basic
@Column(name = "CODE")
private String code;
/**
* 格口
*/
@Basic
@Column(name = "GK")
private Long gk;
}
src/main/java/com/yxproject/start/mapper/FileNameDicMapper.java
View file @ 77dbdb4a
package com.yxproject.start.mapper;
import com.yxproject.start.entity.FileNameDicEntity;
import com.yxproject.start.entity.GATTrackEntity;
import com.yxproject.start.entity.GATTrackFileEntity;
import org.apache.ibatis.annotations.*;
......
src/main/java/com/yxproject/start/mapper/GkDicMapper.java 0 → 100644
View file @ 77dbdb4a
package com.yxproject.start.mapper;
import com.yxproject.start.entity.GkDicEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface GkDicMapper {
@Select("SELECT * FROM GK_DIC")
List<GkDicEntity> findAll();
}
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ 77dbdb4a
......@@ -40,7 +40,21 @@ public interface LogMapper {
//TODO XML的时间+post的file_id
@Update("UPDATE PREPRO_PERSON SET CARD_TYPE_ID =9 \n" +
// @Update("UPDATE PREPRO_PERSON SET CARD_TYPE_ID =9 \n" +
// "WHERE JMSFZSLH in (\n" +
// "SELECT PREPRO_PERSON.JMSFZSLH \n" +
// "FROM PERSON_POST \n" +
// "LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH\n" +
// "LEFT JOIN FILES ON FILES.ID=PREPRO_PERSON.FILE_ID "+
// "WHERE (PERSON_POST.STATE1 = 3 OR PERSON_POST.STATE1 = 0) " +
// "AND PERSON_POST.BIRTH_DATE = PREPRO_PERSON.CSRQ " +
// "AND TO_CHAR(FILES.UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{printDate} )")
// public boolean changeCardTypeByPrintDate(@Param("printDate")String printDate);
@Update("UPDATE PREPRO_PERSON SET CARD_TYPE_ID = CASE " +
" WHEN CARD_TYPE_ID = 0 THEN 9 " +
" WHEN CARD_TYPE_ID = 10 THEN 11 " +
" ELSE CARD_TYPE_ID " +
" END \n" +
"WHERE JMSFZSLH in (\n" +
"SELECT PREPRO_PERSON.JMSFZSLH \n" +
"FROM PERSON_POST \n" +
......
src/main/java/com/yxproject/start/mapper/PreproPersonMapper.java
View file @ 77dbdb4a
......@@ -15,9 +15,9 @@ public interface PreproPersonMapper {
/*导入XMl*/
@Insert("INSERT INTO PREPRO_PERSON (JMSFZSLH,GMSFHM,XM,XBDM,MZDM,CSRQ,SSXQDM,DZMC," +
"QFJG_GAJGMC,YXQQSRQ,YXQJZRQ,JMSFZSLYYDM,JMSFZZZLXDM,JMSFZLZFSDM,SJR_XM,SJR_LXDH,SJR_YZBM,SJR_TXDZ,SID,FILE_ID,TP_PATH," +
"XMMZWZ,XBMZWZ,MZMZWZ,ZZHYMZWZ,ZZHEMZWZ,ZZHSMZWZ,QFJGMZWZ)" +
"XMMZWZ,XBMZWZ,MZMZWZ,ZZHYMZWZ,ZZHEMZWZ,ZZHSMZWZ,QFJGMZWZ,CARD_TYPE_ID)" +
"VALUES(#{jmsfzslh},#{gmsfhm},#{xm},#{xbdm},#{mzdm},#{csrq},#{ssxqdm},#{dzmc},#{qfjgGajgmc},#{yxqqsrq},#{yxqjzrq},#{jmsfzslyydm},#{jmsfzzzlxdm},#{jmsfzlzfsdm},#{sjrXm},#{sjrLxdh},#{sjrYzbm}," +
"#{sjrTxdz},#{sid},#{fileId},#{tpPath},#{xmmzwz},#{xbmzwz},#{mzmzwz},#{zzhymzwz},#{zzhemzwz},#{zzhsmzwz},#{qfjgmzwz})")
"#{sjrTxdz},#{sid},#{fileId},#{tpPath},#{xmmzwz},#{xbmzwz},#{mzmzwz},#{zzhymzwz},#{zzhemzwz},#{zzhsmzwz},#{qfjgmzwz},#{cardTypeId})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
public boolean savePreproPersonEntity(PreproPersonDto preproPersonDto);
......
src/main/java/com/yxproject/start/service/GkDicService.java 0 → 100644
View file @ 77dbdb4a
package com.yxproject.start.service;
import java.util.Map;
/**
* gk dic服务
*
* @author xcq
* @date 2023/06/02
*/
public interface GkDicService {
/**
* 获取格口信息的map
*
* @return {@link Map}<{@link String}, {@link Long}>
*/
public Map<String, Long> getGkDicMap();
}
src/main/java/com/yxproject/start/service/PersonPostService.java
View file @ 77dbdb4a
......@@ -25,49 +25,49 @@ public interface PersonPostService {
* @param creatTime
* @return
*/
public boolean updateIsPost(String fileId,String creatTime);
boolean updateIsPost(String fileId, String creatTime);
public boolean savePersonPost(List<PersonPostEntity> personPostEntities);
boolean savePersonPost(List<PersonPostEntity> personPostEntities);
public List<PersonPostEntity> findPersonalData(@Param("applicantName") String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("district") String district,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty,@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("firstIndex") String firstIndex,@Param("pageSize") String pageSize, String emailNo,int notNull,String printDate);
List<PersonPostEntity> findPersonalData(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("jmsfzslh") String jmsfzslh, @Param("idCard") String idCard, String state, @Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("firstIndex") String firstIndex, @Param("pageSize") String pageSize, String emailNo, int notNull, String printDate, Long gk);
public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String starDate,String endDate);
boolean deletePersonalData(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String starDate, String endDate);
public boolean deletePersonalDataByImportDate(String startDate, String endDate);
boolean deletePersonalDataByImportDate(String startDate, String endDate);
public List<PersonPostEntity> getPostInfo(ReadCardDto readCardDto);
List<PersonPostEntity> getPostInfo(ReadCardDto readCardDto);
public boolean printPostList(int id, Date printDateTime);
boolean printPostList(int id, Date printDateTime);
public int findPersonalDataCount(String applicantName, String orderNumber, String state,String district, String latticeMouthInformation, List<String> getToCounty, String startDate,String endDate, String emailNo,String notNull,String printDate);
int findPersonalDataCount(String applicantName, String orderNumber, String jmsfzslh, String idCard, String state, String district, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String emailNo, String notNull, String printDate, Long gk);
public int findPersonalDataCountByImportDate(String starDate,String endDate);
int findPersonalDataCountByImportDate(String starDate, String endDate);
public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted,String district, String gkxx, JSONArray jsonArray,String starDate,String endDate,String emailNo,String printDate,String notNull);
List<PersonPostEntity> downLoadReportForm(HttpServletRequest request, HttpServletResponse response, String sqrxm, String ddh, String hasPrinted, String district, String gkxx, JSONArray jsonArray, String starDate, String endDate, String emailNo, String printDate, String notNull, Long gk);
public Map<String,Object> selectNote(@Param("uploadId")String uploadId);
Map<String,Object> selectNote(@Param("uploadId") String uploadId);
public boolean addNote(@Param("uploadNo")String uploadNo,@Param("note")String note);
boolean addNote(@Param("uploadNo") String uploadNo, @Param("note") String note);
public List<Map<String, Object>> checkPersonalPost(String uploadNo);
List<Map<String, Object>> checkPersonalPost(String uploadNo);
public boolean cancelPostByAcceptNo(String uploadNo,String remarks,String name);
boolean cancelPostByAcceptNo(String uploadNo, String remarks, String name);
public List<Map<String,Object>> selectCancelPost(String beginDate,String endDate);
List<Map<String,Object>> selectCancelPost(String beginDate, String endDate);
public PersonPostEntity findPersonalDataByAcceptNo(String acceptNo);
PersonPostEntity findPersonalDataByAcceptNo(String acceptNo);
public List<Map<String, Object>> downloadUploadInfo(HttpServletRequest request,HttpServletResponse response,String startDate,String endDate);
List<Map<String, Object>> downloadUploadInfo(HttpServletRequest request, HttpServletResponse response, String startDate, String endDate);
public int findWaybillNumber( @Param("fileID") String fileID);
int findWaybillNumber(@Param("fileID") String fileID);
public int findBackWaybillNumber( @Param("fileID") String fileID);
int findBackWaybillNumber(@Param("fileID") String fileID);
public List<Map<String,Object>> downLoadInvalidOrder(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray,String starDate,String endDate,String emailNo,String printDate,String notNull);
List<Map<String,Object>> downLoadInvalidOrder(HttpServletRequest request, HttpServletResponse response, String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray, String starDate, String endDate, String emailNo, String printDate, String notNull);
public boolean saveGATTrack(List<GATTrackEntity> gatTR);
boolean saveGATTrack(List<GATTrackEntity> gatTR);
public List<PersonPostDto> getPostInfoAtMachine(ReadCardDto readCardDto);
List<PersonPostDto> getPostInfoAtMachine(ReadCardDto readCardDto);
public boolean updatePrintDateAtMachine(int id, Date printDateTime);
boolean updatePrintDateAtMachine(int id, Date printDateTime);
}
src/main/java/com/yxproject/start/service/impl/GkDicServiceImpl.java 0 → 100644
View file @ 77dbdb4a
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.GkDicEntity;
import com.yxproject.start.mapper.GkDicMapper;
import com.yxproject.start.service.GkDicService;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class GkDicServiceImpl implements GkDicService {
private final GkDicMapper gkDicMapper;
public GkDicServiceImpl(GkDicMapper gkDicMapper) {
this.gkDicMapper = gkDicMapper;
}
/**
* 获取格口信息的map
*
* @return {@link Map}<{@link String}, {@link Long}>
*/
@Override
public Map<String, Long> getGkDicMap() {
Map<String, Long> gkDicMap = new HashMap<>();
List<GkDicEntity> gkDicEntityList = gkDicMapper.findAll();
for (GkDicEntity gkDicEntity : gkDicEntityList) {
gkDicMap.put(gkDicEntity.getCode(), gkDicEntity.getGk());
}
return gkDicMap;
}
}
\ No newline at end of file
src/main/java/com/yxproject/start/service/impl/ImportXmlServiceImpl.java
View file @ 77dbdb4a
......@@ -92,6 +92,10 @@ public class ImportXmlServiceImpl implements ImportXmlService {
}
try {
preproPersonDto.setTpPath(url);
preproPersonDto.setCardTypeId(0L);
if (personIsYdss(preproPersonDto.getJmsfzslh())) {
preproPersonDto.setCardTypeId(10L);
}
boolean b = preproPersonMapper.savePreproPersonEntity(preproPersonDto);
if (!b){
logger.error(preproPersonDto.getFileId()+"存儲失敗！");
......@@ -117,4 +121,13 @@ public class ImportXmlServiceImpl implements ImportXmlService {
// return 2;
return filesMapper.selectFilesCount(importDate).size();
}
/**
* 从受理号判断是否为异地首申 受理号倒数第5位为9
* @param jmsfzslh 受理号
* @return true 是异地首申
*/
protected boolean personIsYdss(String jmsfzslh) {
return jmsfzslh.charAt(jmsfzslh.length() - 5) == '9';
}
}
src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java
View file @ 77dbdb4a
......@@ -7,6 +7,7 @@ import com.yxproject.start.entity.PersonPostEntity;
import com.yxproject.start.mapper.FileNameDicMapper;
import com.yxproject.start.mapper.PersonPostMapper;
import com.yxproject.start.service.PersonPostService;
import lombok.extern.java.Log;
import net.sf.json.JSONArray;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -23,6 +24,7 @@ import java.util.Map;
* @auther zhangyusheng
* 2019/2/19 15:01
*/
@Log
@Service
public class PersonPostServiceImpl implements PersonPostService {
@Autowired
......@@ -54,19 +56,18 @@ public class PersonPostServiceImpl implements PersonPostService {
return true;
}
@Override
public List<PersonPostEntity> findPersonalData(String applicantName, String orderNumber, String state,String district, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String firstIndex, String pageSize, String emailNo, int notNull, String printDate) {
String str = "";
long firstIndexLong = Long.valueOf(firstIndex);
long pageSizeLong = Long.valueOf(pageSize);
public List<PersonPostEntity> findPersonalData(String applicantName, String orderNumber, String jmsfzslh, String idCard, String state,String district, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String firstIndex, String pageSize, String emailNo, int notNull, String printDate, Long gk) {
StringBuilder str = new StringBuilder();
long firstIndexLong = Long.parseLong(firstIndex);
long pageSizeLong = Long.parseLong(pageSize);
for (int i = 0; i < getToCounty.size(); i++) {
if (i == getToCounty.size() - 1) {
str += "'" + getToCounty.get(i) + "'";
str.append("'").append(getToCounty.get(i)).append("'");
} else {
str += "'" + getToCounty.get(i) + "',";
str.append("'").append(getToCounty.get(i)).append("',");
}
}
List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName, orderNumber, state,district, latticeMouthInformation, str, startDate, endDate, firstIndexLong * pageSizeLong, (firstIndexLong - 1) * pageSizeLong + 1, emailNo, notNull, printDate);
return list;
return personPostMapper.findAllPersonalData(applicantName, orderNumber, jmsfzslh, idCard, state,district, latticeMouthInformation, str.toString(), startDate, endDate, firstIndexLong * pageSizeLong, (firstIndexLong - 1) * pageSizeLong + 1, emailNo, notNull, printDate, gk);
}
@Override
......@@ -98,17 +99,16 @@ public class PersonPostServiceImpl implements PersonPostService {
}
@Override
public int findPersonalDataCount(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state,@Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, String emailNo, String notNull, String printDate) {
String str = "";
public int findPersonalDataCount(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("jmsfzslh") String jmsfzslh, @Param("idCard") String idCard, @Param("state") String state,@Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, String emailNo, String notNull, String printDate, Long gk) {
StringBuilder str = new StringBuilder();
for (int i = 0; i < getToCounty.size(); i++) {
if (i == getToCounty.size() - 1) {
str += "'" + getToCounty.get(i) + "'";
str.append("'").append(getToCounty.get(i)).append("'");
} else {
str += "'" + getToCounty.get(i) + "',";
str.append("'").append(getToCounty.get(i)).append("',");
}
}
int count = personPostMapper.findPersonalDataCount(applicantName, orderNumber, state, district,latticeMouthInformation, str, startDate, endDate, emailNo, notNull, printDate);
return count;
return personPostMapper.findPersonalDataCount(applicantName, orderNumber, jmsfzslh, idCard, state, district,latticeMouthInformation, str.toString(), startDate, endDate, emailNo, notNull, printDate, gk);
}
@Override
......@@ -118,18 +118,17 @@ public class PersonPostServiceImpl implements PersonPostService {
}
@Override
public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request, HttpServletResponse response, String sqrxm, String ddh, String hasPrinted, String district,String gkxx, JSONArray jsonArray, String starDate, String endDate, String emailNo, String printDate, String notNull) {
String str = "";
public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request, HttpServletResponse response, String sqrxm, String ddh, String hasPrinted, String district,String gkxx, JSONArray jsonArray, String starDate, String endDate, String emailNo, String printDate, String notNull, Long gk) {
StringBuilder str = new StringBuilder();
for (int i = 0; i < jsonArray.size(); i++) {
if (i == jsonArray.size() - 1) {
str += "'" + jsonArray.get(i) + "'";
str.append("'").append(jsonArray.get(i)).append("'");
} else {
str += "'" + jsonArray.get(i) + "',";
str.append("'").append(jsonArray.get(i)).append("',");
}
}
List<PersonPostEntity> list = personPostMapper.findAllPersonalDataNoPage(sqrxm, ddh, hasPrinted,district, gkxx, str, starDate, endDate, emailNo, printDate, notNull);
return list;
return personPostMapper.findAllPersonalDataNoPage(sqrxm, ddh, hasPrinted,district, gkxx, str.toString(), starDate, endDate, emailNo, printDate, notNull, gk);
}
@Override
......@@ -141,6 +140,7 @@ public class PersonPostServiceImpl implements PersonPostService {
@Override
public boolean addNote(String uploadNo, String note) {
personPostMapper.addNote(uploadNo, note);
log.info("取消订单成功。受理号：" +uploadNo + " 备注信息：" +note);
return true;
}
......@@ -150,9 +150,12 @@ public class PersonPostServiceImpl implements PersonPostService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean cancelPostByAcceptNo(String uploadNo, String remarks, String name) {
personPostMapper.cancelPostByAcceptNo(uploadNo, remarks, name);
personPostMapper.addNote(uploadNo, remarks);
System.out.println("cancelPostByAcceptNo: " + uploadNo + " | " + remarks + " | " + name);
System.out.println("addNote: " + uploadNo + " | " + remarks);
return true;
}
......@@ -170,6 +173,7 @@ public class PersonPostServiceImpl implements PersonPostService {
List<Map<String, Object>> list = personPostMapper.downloadUploadInfo(strDate, endDate);
return list;
}
@Override
public int findWaybillNumber(String fileID) {
int mum = personPostMapper.findWaybillNumber(fileID);
......
src/main/java/com/yxproject/start/utils/ReadExcel.java
View file @ 77dbdb4a
package com.yxproject.start.utils;
import jxl.Cell;
import jxl.Sheet;
import jxl.Workbook;
import jxl.read.biff.BiffException;
......@@ -113,16 +114,25 @@ public class ReadExcel {
String columns8 = sheet.getCell(8,i).getContents();
String columns9 = sheet.getCell(9,i).getContents();
String columns10 = sheet.getCell(10,i).getContents();
String columns11 = sheet.getCell(11,i).getContents();
String columns12 = sheet.getCell(12,i).getContents();
String columns13 = sheet.getCell(13,i).getContents();
String columns14 = sheet.getCell(14,i).getContents();
String columns15 = sheet.getCell(15,i).getContents();
if (columns0.equals("")&&columns1.equals("")&&columns2.equals("")&&columns3.equals("")&&
columns4.equals("")&&columns5.equals("")&&columns6.equals("")&&columns7.equals("")&&
columns8.equals("")&&columns9.equals("")&&columns10.equals("")&&columns11.equals("")&&columns12.equals("")&&
columns13.equals("")&&columns14.equals("")&&columns15.equals("")){
continue;
if (sheet.getColumns() == 11) {
if (columns0.equals("")&&columns1.equals("")&&columns2.equals("")&&columns3.equals("")&&
columns4.equals("")&&columns5.equals("")&&columns6.equals("")&&columns7.equals("")&&
columns8.equals("")&&columns9.equals("")&&columns10.equals("")){
continue;
}
}
if (sheet.getColumns() != 11) {
String columns11 = sheet.getCell(11,i).getContents();
String columns12 = sheet.getCell(12,i).getContents();
String columns13 = sheet.getCell(13,i).getContents();
String columns14 = sheet.getCell(14,i).getContents();
String columns15 = sheet.getCell(15,i).getContents();
if (columns0.equals("")&&columns1.equals("")&&columns2.equals("")&&columns3.equals("")&&
columns4.equals("")&&columns5.equals("")&&columns6.equals("")&&columns7.equals("")&&
columns8.equals("")&&columns9.equals("")&&columns10.equals("")&&columns11.equals("")&&columns12.equals("")&&
columns13.equals("")&&columns14.equals("")&&columns15.equals("")){
continue;
}
}
// sheet.getColumns()返回该页的总列数
for (int j = 0; j < sheet.getColumns(); j++) {
......@@ -136,11 +146,7 @@ public class ReadExcel {
}
return outerList;
}
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (BiffException e) {
e.printStackTrace();
} catch (IOException e) {
} catch (BiffException | IOException e) {
e.printStackTrace();
}
return null;
......
src/main/java/com/yxproject/start/utils/YdssUtils.java 0 → 100644
View file @ 77dbdb4a
package com.yxproject.start.utils;
public class YdssUtils {
/**
* 从受理号判断是否为异地首申 受理号倒数第5位为9
* @param jmsfzslh 受理号
* @return true 是异地首申
*/
public static boolean personIsYdss(String jmsfzslh) {
return jmsfzslh.charAt(jmsfzslh.length() - 5) == '9';
}
}
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ 77dbdb4a
......@@ -112,7 +112,7 @@
(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
{{paginationConf.totalItems}}条</span>)
<div class="pull-right">
<span style="color:#9f191f;"><span style="margin-right: 15px;">普通证：{{simpleCardCount}}</span><span style="margin-right: 15px;">邮寄证：{{postCardCount}}</span><span>禁用数：{{forbiddenCount}}</span></span>
<span style="color:#9f191f;"><span style="margin-right: 15px;">普通证：{{simpleCardCount}}</span><span style="margin-right: 15px;">邮寄证：{{postCardCount}}</span><span style="margin-right: 15px;">异地首申普：{{ydSsSimpleCount}}</span><span style="margin-right: 15px;">异地首申邮：{{ydSsPostCount}}</span><span style="margin-right: 15px;">禁用数：{{forbiddenCount}}</span></span>
</div>
</div>
<div class="box-info" style="padding: 7px; padding-top: 0px;">
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ 77dbdb4a
......@@ -95,6 +95,8 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
$scope.paginationConf.totalItems=data.total;
$scope.simpleCardCount = data.puSum;
$scope.postCardCount = data.youSum;
$scope.ydSsSimpleCount = data.ydsspuSum;
$scope.ydSsPostCount = data.ydssyouSum;
$scope.forbiddenCount= data.invaildCount;
$scope.packageData = data.list;
console.log(data)
......
src/main/resources/static/views/dataCheckReport/dataCheckReport.js
View file @ 77dbdb4a
......@@ -45,13 +45,13 @@ angular.module("AvatarCheck.dataCheckReport",['ngRoute', 'AvatarCheck.http'])
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
var cardType = $("#cardType").val();
if(cardType==''){
if(cardType===''){
cardType = -1;
}
if(date1=='{{choseDate}}'){
if(date1==='{{choseDate}}'){
date1=$filter("date")(new Date(), "yyyy-MM-dd")
}
if(date2=='{{choseDate}}'){
if(date2==='{{choseDate}}'){
date2=$filter("date")(new Date(), "yyyy-MM-dd")
}
HttpService.queryDataCheckReport(date1,date2,$scope.policeCode,$scope.policeName,cardType,function (data) {
......@@ -59,7 +59,7 @@ angular.module("AvatarCheck.dataCheckReport",['ngRoute', 'AvatarCheck.http'])
console.log($scope.dataCheckList);
})
};
if($rootScope.loginData.login==true){
if($rootScope.loginData.login===true){
getTypeList();
$scope.searchReportData();
}
......
src/main/resources/static/views/searchCardMsg/searchCardMsg.html
View file @ 77dbdb4a
......@@ -193,7 +193,7 @@
<table cellspacing="0" cellpadding="0" style="border-top:1px solid #000;border-collapse:collapse;height:30mm">
<tr>
<td style="width:38.5mm;font-size: 2mm;border-right:1px solid #000;">
<div style="font-size:8mm;position:absolute;top:102mm;left:3mm;width:36mm;">密码投递</div>
<div style="font-size:8mm;position:absolute;top:102mm;left:3mm;width:36mm;">特安邮件</div>
</td>
<td style="width:33.5mm;font-size: 2mm;">
<div style="position:absolute;top:94mm;left:40mm;width:29mm;">签收人：</div>
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ 77dbdb4a
......@@ -84,7 +84,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
}
item.show = !item.show;
$scope.json.id=item.ID;
$scope.json.policeName = item.GAJG_MC;
$scope.json.policeName = item.GAJG_MC.substring(6);
$scope.json.policeCode = item.POLICE_CODE;
$scope.json.count = item.FINISH_COUNT;
$scope.json.QR_CODE = item.QR_CODE;
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ 77dbdb4a
......@@ -82,6 +82,16 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{
json.orderNumber='';
}
if (angular.isDefined($scope.jmsfzslh)) {
json.jmsfzslh = $scope.jmsfzslh
}else {
json.jmsfzslh = '';
}
if (angular.isDefined($scope.idCard)) {
json.idCard = $scope.idCard
}else {
json.idCard = '';
}
if ($("#print").val() == '') {
json.state=-1;
}else {
......@@ -152,6 +162,16 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{
json.orderNumber='';
}
if (angular.isDefined($scope.jmsfzslh)) {
json.jmsfzslh = $scope.jmsfzslh
}else {
json.jmsfzslh = '';
}
if (angular.isDefined($scope.idCard)) {
json.idCard = $scope.idCard
}else {
json.idCard = '';
}
if ($("#print").val() == '') {
json.state=-1;
}else {
......
src/test/java/com/yxproject/start/StartApplicationTests.java
View file @ 77dbdb4a
package com.yxproject.start;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class StartApplicationTests {
@Test
public void contextLoads() {
}
}
//package com.yxproject.start;
//
//import com.yxproject.start.entity.PersonPostEntity;
//import com.yxproject.start.mapper.PersonPostMapper;
//import com.yxproject.start.service.GkDicService;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.test.context.junit4.SpringRunner;
//
//import java.util.List;
//import java.util.Map;
//
//@RunWith(SpringRunner.class)
//@SpringBootTest
//public class StartApplicationTests {
// @Autowired
// private PersonPostMapper mapper;
// @Autowired
// private GkDicService gkDicService;
// @Test
// public void contextLoads() {
// long startTime = System.currentTimeMillis();
// Map<String, Long> gkMap = gkDicService.getGkDicMap();
//// personPostEntity.setGk(gkMap);
//// System.out.println(mapper.getAllCountByCreateDate("2023-01-01", "2023-06-31"));
//// System.out.println(mapper.getIdByCreateDate("2023-01-01", "2023-01-31").size());
//// mapper.addGk(id, gk);
// List<PersonPostEntity> entities = mapper.findAllByCreateDate("2023-03-01", "2023-04-01");
// System.out.println(entities.size());
// int count = 0;
// for (PersonPostEntity entity : entities) {
// entity.setGk(gkMap);
// if (mapper.addGk(entity.getId(), entity.getGk())) count += 1;
// }
// System.out.println(count);
// System.out.println(System.currentTimeMillis() - startTime);
// }
//
//}
//
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