Skip to content

Y
YX_IDENT_REFACTORING
Commit 35ffc44d authored by suichenguang's avatar suichenguang
Browse files
Options

Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_REFACTORING into dev

parents 1adadcdd bc8e9e6c
Show whitespace changes
Inline Side-by-side
Showing with 1236 additions and 155 deletions
pom.xml
View file @ 35ffc44d
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<exclusions> <!--<exclusions>-->
<exclusion> <!--<exclusion>-->
<groupId>org.springframework.boot</groupId> <!--<groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-starter-logging</artifactId> <!--<artifactId>spring-boot-starter-logging</artifactId>-->
</exclusion> <!--</exclusion>-->
</exclusions> <!--</exclusions>-->
</dependency> </dependency>
<dependency> <dependency>
...@@ -66,23 +66,23 @@ ...@@ -66,23 +66,23 @@
<!--<version>1.2.17</version>--> <!--<version>1.2.17</version>-->
<!--</dependency>--> <!--</dependency>-->
<dependency> <!--<dependency>-->
<groupId>org.slf4j</groupId> <!--<groupId>org.slf4j</groupId>-->
<artifactId>slf4j-api</artifactId> <!--<artifactId>slf4j-api</artifactId>-->
<version>1.7.5</version> <!--<version>1.7.5</version>-->
</dependency> <!--</dependency>-->
<dependency> <!--<dependency>-->
<groupId>org.slf4j</groupId> <!--<groupId>org.slf4j</groupId>-->
<artifactId>slf4j-log4j12</artifactId> <!--<artifactId>slf4j-log4j12</artifactId>-->
<version>1.7.12</version> <!--<version>1.7.12</version>-->
</dependency> <!--</dependency>-->
<dependency> <!--<dependency>-->
<groupId>log4j</groupId> <!--<groupId>log4j</groupId>-->
<artifactId>log4j</artifactId> <!--<artifactId>log4j</artifactId>-->
<version>1.2.17</version> <!--<version>1.2.17</version>-->
</dependency> <!--</dependency>-->
<!-- shiro相关 --> <!-- shiro相关 -->
...@@ -109,21 +109,21 @@ ...@@ -109,21 +109,21 @@
<version>1.6.1</version> <version>1.6.1</version>
</dependency> </dependency>
<dependency> <!--<dependency>-->
<groupId>org.springframework.boot</groupId> <!--<groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-starter-web</artifactId> <!--<artifactId>spring-boot-starter-web</artifactId>-->
<exclusions> <!--<exclusions>-->
<exclusion> <!--<exclusion>-->
<groupId>org.springframework.boot</groupId> <!--<groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-starter-logging</artifactId> <!--<artifactId>spring-boot-starter-logging</artifactId>-->
</exclusion> <!--</exclusion>-->
</exclusions> <!--</exclusions>-->
</dependency> <!--</dependency>-->
<dependency> <!--<dependency>-->
<groupId>org.springframework.boot</groupId> <!--<groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-starter-log4j</artifactId> <!--<artifactId>spring-boot-starter-log4j</artifactId>-->
<version>1.3.8.RELEASE</version> <!--<version>1.3.8.RELEASE</version>-->
</dependency> <!--</dependency>-->
<dependency> <dependency>
<groupId>net.sf.json-lib</groupId> <groupId>net.sf.json-lib</groupId>
......
src/countyList.xml deleted 100644 → 0
View file @ 1adadcdd
<?xml version="1.0" encoding="UTF-8"?>
<countyLists>
<countyList county_List_Id="imooc-001" task_Id="20181204">
<saveDate>2018-12-04</saveDate>
<countyCode>413200</countyCode>
<finishCount>1030</finishCount>
<inStorageCount>1030</inStorageCount>
<outStorageCount>1030</outStorageCount>
</countyList>
<countyList county_List_Id="imooc-002" task_Id="20181205">
<saveDate>2018-12-05</saveDate>
<countyCode>413200</countyCode>
<finishCount>1030</finishCount>
<inStorageCount>1030</inStorageCount>
<outStorageCount>1030</outStorageCount>
</countyList>
</countyLists>
src/log4j.properties deleted 100644 → 0
View file @ 1adadcdd
#控制日志级别，在哪里输出Output pattern : date [thread] priority category - message FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7
log4j.rootLogger=INFO, stdout
#控制台 显示的的方式为控制台普通方式
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
#日志输出的格式
log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%c{5}] - %m%n
#打印sql部分
log4j.logger.java.sql=DEBUG
log4j.logger.java.sql.Connection = DEBUG
log4j.logger.java.sql.Statement = DEBUG
log4j.logger.java.sql.PreparedStatement = DEBUG
log4j.logger.java.sql.ResultSet = DEBUG
log4j.logger.com.yxproject.start.entity=DEBUG
\ No newline at end of file
src/main/java/com/yxproject/start/api/UserApi.java
View file @ 35ffc44d
...@@ -14,23 +14,16 @@ import org.apache.shiro.authc.UnknownAccountException; ...@@ -14,23 +14,16 @@ import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
import org.dom4j.*;
import org.dom4j.Attribute;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.*;
import org.hibernate.loader.plan.spi.Return;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import static java.lang.Integer.*; import static java.lang.Integer.parseInt;
import static java.lang.Integer.valueOf;
/** /**
* @author Administrator * @author Administrator
...@@ -60,6 +53,10 @@ public class UserApi { ...@@ -60,6 +53,10 @@ public class UserApi {
private TypeListService typeListService; private TypeListService typeListService;
@Autowired @Autowired
private ReceiptListService receiptListService; private ReceiptListService receiptListService;
@Autowired
private FailedTypeService failedTypeService;
@Autowired
private ProdCardService prodCardService;
// @Autowired // @Autowired
// private ReadCountyListXMLService readCountyListXMLService; // private ReadCountyListXMLService readCountyListXMLService;
...@@ -501,14 +498,17 @@ public class UserApi { ...@@ -501,14 +498,17 @@ public class UserApi {
} }
/** /**
* 简易查询退证信息; * 查询简易证件信息;
* *
* @return * @return
*/ */
@RequestMapping("selectProdCard") @RequestMapping("selectProdCard")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String selectProdCard(@RequestParam("idNo") String idNo,@RequestParam("acceptNo") String acceptNo, HttpServletResponse resp) { public String selectProdCard(@RequestParam("idNo") String idNo, HttpServletResponse resp) {
List<Map<String,Object>> taskEntity = taskService.getProdCard(idNo,acceptNo); JSONObject jsonObject = JSONObject.fromObject(idNo);
Map<String, List> jsonArray1 = (Map<String, List>)jsonObject;
List list = jsonArray1.get("list");
List<ProdCardEntity> taskEntity = prodCardService.getProdCard(list);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskEntity); yxjsonResponse.outPutSuccess(taskEntity);
...@@ -516,6 +516,22 @@ public class UserApi { ...@@ -516,6 +516,22 @@ public class UserApi {
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/**
* 查询查询废证类型List;
*
* @return
*/
@RequestMapping("getFailedType")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getFailedType(HttpServletResponse resp) {
List<FailedTypeEntity> failedTypeEntity = failedTypeService.getFailedType();
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(failedTypeEntity);
Map map = new HashMap();
return yxjsonResponse.toJSONString();
}
/** /**
* 更新循环单 * 更新循环单
* 添加异常状态; * 添加异常状态;
......
src/main/java/com/yxproject/start/api/YingxinApi.java
View file @ 35ffc44d
...@@ -31,9 +31,11 @@ public class YingxinApi { ...@@ -31,9 +31,11 @@ public class YingxinApi {
@Autowired @Autowired
private FindFinancialReportByViewService findFinancialReportByViewService; private FindFinancialReportByViewService findFinancialReportByViewService;
@Autowired @Autowired
private AddTuiZhengService addTuiZhengService; private AddBackCardService addBackCardService;
@Autowired @Autowired
private AddRemainingCardService addRemainingCardService; private AddRemainingCardService addRemainingCardService;
@Autowired
private FindCardService findCardService;
/** /**
* 查询在受理库查询任务单详情 根据处理时间查询; * 查询在受理库查询任务单详情 根据处理时间查询;
* *
...@@ -96,13 +98,15 @@ public class YingxinApi { ...@@ -96,13 +98,15 @@ public class YingxinApi {
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/* /**
*添加退证 * 添加退证
* * @param acceptNumber 受理号
* */ * @param resp
* @return
*/
@RequestMapping("addInValidCardInfo") @RequestMapping("addInValidCardInfo")
public String addTuiZhengInfo(@RequestParam("acceptNo")String acceptNumber,HttpServletResponse resp){ public String addTuiZhengInfo(@RequestParam("acceptNo")List acceptNumber,HttpServletResponse resp){
List<SpecialCardEntity> list=addTuiZhengService.getTuiZhengData(acceptNumber); List<SpecialCardEntity> list= addBackCardService.getTuiZhengData(acceptNumber);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(list); yxjsonResponse.outPutSuccess(list);
...@@ -113,12 +117,23 @@ public class YingxinApi { ...@@ -113,12 +117,23 @@ public class YingxinApi {
*添加余证 *添加余证
* *
* */ * */
@RequestMapping("addRemainingCardInfo") @RequestMapping("addRemainCard")
public String addRemainingCardInfo(@RequestParam("acceptNo")String accept_Number,HttpServletResponse resp){ public String addRemainingCardInfo(@RequestParam("acceptNo")List accept_Number,HttpServletResponse resp){
List<SpecialCardEntity> list=addRemainingCardService.getRemainingCardData(accept_Number); List<SpecialCardEntity> list=addRemainingCardService.getRemainingCardData(accept_Number);
YXJSONResponse yxjsonResponse =new YXJSONResponse(); YXJSONResponse yxjsonResponse =new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(list); yxjsonResponse.outPutSuccess(list);
return yxjsonResponse.toJSONString();
}
/*
*查询证件
* */
@RequestMapping("findCardInfo")
public String findCardInfo(@RequestParam("find_No")String find_No,HttpServletResponse resp){
List<Map<String,Object>> list=findCardService.getCardData(find_No);
YXJSONResponse yxjsonResponse =new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(list);
Map map=new HashMap(); Map map=new HashMap();
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
......
src/main/java/com/yxproject/start/entity/AccCardTEntity.java 0 → 100644
View file @ 35ffc44d
package com.yxproject.start.entity;
import javax.persistence.*;
/**
* Created by Administrator on 2018/12/25.
*/
@Entity
@Table(name = "ACC_CARD_T", schema = "ACC_DBA", catalog = "")
public class AccCardTEntity {
private String upload_No;
private String accept_No;
private String photo_No;
private String name;
private String sex_No;
private String nation_No;
private String birthday;
private String id_No;
private String addr1;
private String addr2;
private String addr3;
private String address1;
private String sign_Govt;
private String expire_Date;
private String begin_Date;
private String apply_Reason;
private String status_No;
@Basic
@Column(name = "UPLOAD_NO", nullable = false, length = 22)
public String getUploadNo() {
return upload_No;
}
public void setUploadNo(String uploadNo) {
this.upload_No = uploadNo;
}
@Id
@Column(name = "ACCEPT_NO", nullable = false, length = 12)
public String getAcceptNo() {
return accept_No;
}
public void setAcceptNo(String acceptNo) {
this.accept_No = acceptNo;
}
@Basic
@Column(name = "PHOTO_NO", nullable = true, length = 12)
public String getPhotoNo() {
return photo_No;
}
public void setPhotoNo(String photoNo) {
this.photo_No = photoNo;
}
@Basic
@Column(name = "NAME", nullable = false, length = 45)
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Basic
@Column(name = "SEX_NO", nullable = false, length = 1)
public String getSexNo() {
return sex_No;
}
public void setSexNo(String sexNo) {
this.sex_No = sexNo;
}
@Basic
@Column(name = "NATION_NO", nullable = false, length = 2)
public String getNationNo() {
return nation_No;
}
public void setNationNo(String nationNo) {
this.nation_No = nationNo;
}
@Basic
@Column(name = "BIRTHDAY", nullable = false, length = 8)
public String getBirthday() {
return birthday;
}
public void setBirthday(String birthday) {
this.birthday = birthday;
}
@Basic
@Column(name = "ID_NO", nullable = false, length = 18)
public String getIdNo() {
return id_No;
}
public void setIdNo(String idNo) {
this.id_No = idNo;
}
@Basic
@Column(name = "ADDR1", nullable = false, length = 36)
public String getAddr1() {
return addr1;
}
public void setAddr1(String addr1) {
this.addr1 = addr1;
}
@Basic
@Column(name = "ADDR2", nullable = true, length = 36)
public String getAddr2() {
return addr2;
}
public void setAddr2(String addr2) {
this.addr2 = addr2;
}
@Basic
@Column(name = "ADDR3", nullable = true, length = 36)
public String getAddr3() {
return addr3;
}
public void setAddr3(String addr3) {
this.addr3 = addr3;
}
@Basic
@Column(name = "ADDRESS1", nullable = true, length = 105)
public String getAddress1() {
return address1;
}
public void setAddress1(String address1) {
this.address1 = address1;
}
@Basic
@Column(name = "SIGN_GOVT", nullable = false, length = 45)
public String getSignGovt() {
return sign_Govt;
}
public void setSignGovt(String signGovt) {
this.sign_Govt = signGovt;
}
@Basic
@Column(name = "EXPIRE_DATE", nullable = false, length = 8)
public String getExpireDate() {
return expire_Date;
}
public void setExpireDate(String expireDate) {
this.expire_Date = expireDate;
}
@Basic
@Column(name = "BEGIN_DATE", nullable = false, length = 8)
public String getBeginDate() {
return begin_Date;
}
public void setBeginDate(String beginDate) {
this.begin_Date = beginDate;
}
@Basic
@Column(name = "APPLY_REASON", nullable = false, length = 2)
public String getApplyReason() {
return apply_Reason;
}
public void setApplyReason(String applyReason) {
this.apply_Reason = applyReason;
}
@Basic
@Column(name = "STATUS_NO", nullable = true, length = 1)
public String getStatusNo() {
return status_No;
}
public void setStatusNo(String statusNo) {
this.status_No = statusNo;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
AccCardTEntity that = (AccCardTEntity) o;
if (upload_No != null ? !upload_No.equals(that.upload_No) : that.upload_No != null) return false;
if (accept_No != null ? !accept_No.equals(that.accept_No) : that.accept_No != null) return false;
if (photo_No != null ? !photo_No.equals(that.photo_No) : that.photo_No != null) return false;
if (name != null ? !name.equals(that.name) : that.name != null) return false;
if (sex_No != null ? !sex_No.equals(that.sex_No) : that.sex_No != null) return false;
if (nation_No != null ? !nation_No.equals(that.nation_No) : that.nation_No != null) return false;
if (birthday != null ? !birthday.equals(that.birthday) : that.birthday != null) return false;
if (id_No != null ? !id_No.equals(that.id_No) : that.id_No != null) return false;
if (addr1 != null ? !addr1.equals(that.addr1) : that.addr1 != null) return false;
if (addr2 != null ? !addr2.equals(that.addr2) : that.addr2 != null) return false;
if (addr3 != null ? !addr3.equals(that.addr3) : that.addr3 != null) return false;
if (address1 != null ? !address1.equals(that.address1) : that.address1 != null) return false;
if (sign_Govt != null ? !sign_Govt.equals(that.sign_Govt) : that.sign_Govt != null) return false;
if (expire_Date != null ? !expire_Date.equals(that.expire_Date) : that.expire_Date != null) return false;
if (begin_Date != null ? !begin_Date.equals(that.begin_Date) : that.begin_Date != null) return false;
if (apply_Reason != null ? !apply_Reason.equals(that.apply_Reason) : that.apply_Reason != null) return false;
if (status_No != null ? !status_No.equals(that.status_No) : that.status_No != null) return false;
return true;
}
@Override
public int hashCode() {
int result = upload_No != null ? upload_No.hashCode() : 0;
result = 31 * result + (accept_No != null ? accept_No.hashCode() : 0);
result = 31 * result + (photo_No != null ? photo_No.hashCode() : 0);
result = 31 * result + (name != null ? name.hashCode() : 0);
result = 31 * result + (sex_No != null ? sex_No.hashCode() : 0);
result = 31 * result + (nation_No != null ? nation_No.hashCode() : 0);
result = 31 * result + (birthday != null ? birthday.hashCode() : 0);
result = 31 * result + (id_No != null ? id_No.hashCode() : 0);
result = 31 * result + (addr1 != null ? addr1.hashCode() : 0);
result = 31 * result + (addr2 != null ? addr2.hashCode() : 0);
result = 31 * result + (addr3 != null ? addr3.hashCode() : 0);
result = 31 * result + (address1 != null ? address1.hashCode() : 0);
result = 31 * result + (sign_Govt != null ? sign_Govt.hashCode() : 0);
result = 31 * result + (expire_Date != null ? expire_Date.hashCode() : 0);
result = 31 * result + (begin_Date != null ? begin_Date.hashCode() : 0);
result = 31 * result + (apply_Reason != null ? apply_Reason.hashCode() : 0);
result = 31 * result + (status_No != null ? status_No.hashCode() : 0);
return result;
}
}
src/main/java/com/yxproject/start/entity/FailedTypeEntity.java 0 → 100644
View file @ 35ffc44d
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Objects;
/**
* Created by Administrator on 2018/12/26.
*/
@Entity
@Table(name = "FAILED_TYPE", schema = "DAHAI")
public class FailedTypeEntity {
private long failedCardReasonId;
private String failedCardReason;
@Id
@Column(name = "failedCardReasonId", nullable = false, precision = 0)
public long getFailedCardReasonId() {
return failedCardReasonId;
}
public void setFailedCardReasonId(long failedCardReasonId) {
this.failedCardReasonId = failedCardReasonId;
}
@Basic
@Column(name = "failedCardReason", nullable = true, length = 20)
public String getFailedCardReason() {
return failedCardReason;
}
public void setFailedCardReason(String failedCardReason) {
this.failedCardReason = failedCardReason;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FailedTypeEntity that = (FailedTypeEntity) o;
return Objects.equals(failedCardReasonId, that.failedCardReasonId) &&
Objects.equals(failedCardReason, that.failedCardReason);
}
@Override
public int hashCode() {
return Objects.hash(failedCardReasonId, failedCardReason);
}
}
src/main/java/com/yxproject/start/entity/ProdCardEntity.java 0 → 100644
View file @ 35ffc44d
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Objects;
/**
* Created by Administrator on 2018/12/26.
*/
@Entity
@Table(name = "PROD_CARD", schema = "DAHAI")
public class ProdCardEntity {
private String idNo;
private String name;
private String acceptNo;
private long specialType;
@Id
@Column(name = "idNo", nullable = false, precision = 0)
public String getIdNo() {
return idNo;
}
public void setIdNo(String idNo) {
this.idNo = idNo;
}
@Basic
@Column(name = "name", nullable = false, precision = 0)
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Basic
@Column(name = "acceptNo", nullable = false, precision = 0)
public String getAcceptNo() {
return acceptNo;
}
public void setAcceptNo(String acceptNo) {
this.acceptNo = acceptNo;
}
@Basic
@Column(name = "specialType", nullable = false, precision = 0)
public long getSpecialType() {
return specialType;
}
public void setSpecialType(long specialType) {
this.specialType = specialType;
}
@Override
public boolean equals(Object o) {
if(this == o) return true;
if(o == null || getClass() != o.getClass()) return false;
ProdCardEntity that=(ProdCardEntity) o;
return Objects.equals(idNo, that.idNo) &&
Objects.equals(name, that.name) &&
Objects.equals(acceptNo, that.acceptNo) &&
Objects.equals(specialType, that.specialType);
}
@Override
public int hashCode() {
return Objects.hash(idNo, name, acceptNo, specialType);
}
}
src/main/java/com/yxproject/start/mapper/FindCardMapper.java 0 → 100644
View file @ 35ffc44d
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/25.
*/
@Mapper
public interface FindCardMapper {
public List<Map<String,Object>>findCardByGroupNo(@Param("find_No")String find_No);
}
src/main/java/com/yxproject/start/mapper/SpecialCardMapper.java
View file @ 35ffc44d
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import com.yxproject.start.entity.FailedTypeEntity;
import com.yxproject.start.entity.ProdCardEntity;
import com.yxproject.start.entity.SpecialCardEntity; import com.yxproject.start.entity.SpecialCardEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -19,5 +21,6 @@ public interface SpecialCardMapper { ...@@ -19,5 +21,6 @@ public interface SpecialCardMapper {
public List <SpecialCardEntity> findSpecialCardList( String groupNo); public List <SpecialCardEntity> findSpecialCardList( String groupNo);
public List <SpecialCardEntity> addTuiZheng(String acceptNumber); public List <SpecialCardEntity> addTuiZheng(String acceptNumber);
public List<SpecialCardEntity> addRemainingCard(String accept_Number); public List<SpecialCardEntity> addRemainingCard(String accept_Number);
public List<Map<String,Object>> getProdCard ( @Param("idNo")String idNo, @Param("acceptNo") String acceptNo); public List<ProdCardEntity> getProdCard ( String idNo);
public List<FailedTypeEntity> getFailedType();
} }
src/main/java/com/yxproject/start/service/AddTuiZhengService.java → src/main/java/com/yxproject/start/service/AddBackCardService.java
View file @ 35ffc44d
...@@ -7,6 +7,6 @@ import java.util.List; ...@@ -7,6 +7,6 @@ import java.util.List;
/** /**
* Created by Administrator on 2018/12/20. * Created by Administrator on 2018/12/20.
*/ */
public interface AddTuiZhengService { public interface AddBackCardService {
public List<SpecialCardEntity>getTuiZhengData(String acceptNumber); public List<SpecialCardEntity>getTuiZhengData(List acceptNumber);
} }
src/main/java/com/yxproject/start/service/AddRemainingCardService.java
View file @ 35ffc44d
...@@ -8,5 +8,5 @@ import java.util.List; ...@@ -8,5 +8,5 @@ import java.util.List;
* Created by Administrator on 2018/12/21. * Created by Administrator on 2018/12/21.
*/ */
public interface AddRemainingCardService { public interface AddRemainingCardService {
public List<SpecialCardEntity>getRemainingCardData(String accept_Number); public List<SpecialCardEntity>getRemainingCardData(List accept_Number);
} }
src/main/java/com/yxproject/start/service/FailedTypeService.java 0 → 100644
View file @ 35ffc44d
package com.yxproject.start.service;
import com.yxproject.start.entity.FailedTypeEntity;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/26.
*/
public interface FailedTypeService {
public List<FailedTypeEntity> getFailedType();
}
src/main/java/com/yxproject/start/service/FindCardService.java 0 → 100644
View file @ 35ffc44d
package com.yxproject.start.service;
import com.yxproject.start.entity.AccCardTEntity;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/25.
*/
public interface FindCardService {
public List<Map<String,Object>>getCardData(String find_No);
}
src/main/java/com/yxproject/start/service/ProdCardService.java 0 → 100644
View file @ 35ffc44d
package com.yxproject.start.service;
import com.yxproject.start.entity.ProdCardEntity;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/26.
*/
public interface ProdCardService {
public List<ProdCardEntity> getProdCard ( List idNo);
}
src/main/java/com/yxproject/start/service/TaskService.java
View file @ 35ffc44d
...@@ -28,7 +28,6 @@ public interface TaskService { ...@@ -28,7 +28,6 @@ public interface TaskService {
public int addExceptionState(String taskId, String exceptionInformation); public int addExceptionState(String taskId, String exceptionInformation);
public List<Map<String,Object>> getProdCard (String idNo,String acceptNo);
// public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount); // public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount);
......
src/main/java/com/yxproject/start/service/impl/AddTuiZhengServiceImpl.java → src/main/java/com/yxproject/start/service/impl/AddBackCardServiceImpl.java
View file @ 35ffc44d
...@@ -2,25 +2,26 @@ package com.yxproject.start.service.impl; ...@@ -2,25 +2,26 @@ package com.yxproject.start.service.impl;
import com.yxproject.start.entity.SpecialCardEntity; import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.mapper.SpecialCardMapper; import com.yxproject.start.mapper.SpecialCardMapper;
import com.yxproject.start.service.AddTuiZhengService; import com.yxproject.start.service.AddBackCardService;
import org.omg.CORBA.Object;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by Administrator on 2018/12/20. * Created by Administrator on 2018/12/20.
*/ */
@Service @Service
public class AddTuiZhengServiceImpl implements AddTuiZhengService { public class AddBackCardServiceImpl implements AddBackCardService {
@Autowired @Autowired
private SpecialCardMapper specialCardMapper; private SpecialCardMapper specialCardMapper;
@Override @Override
public List<SpecialCardEntity>getTuiZhengData(String acceptNumber){ public List<SpecialCardEntity> getTuiZhengData(List acceptNumber){
List<SpecialCardEntity>List=specialCardMapper.addTuiZheng(acceptNumber); List list=new ArrayList();
return List; for (int i=0; i <acceptNumber.size() ; i++) {
list.add(specialCardMapper.addTuiZheng((String) acceptNumber.get(i)));
}
return list;
} }
} }
src/main/java/com/yxproject/start/service/impl/AddRemainingCardServiceImpl.java
View file @ 35ffc44d
...@@ -6,6 +6,7 @@ import com.yxproject.start.service.AddRemainingCardService; ...@@ -6,6 +6,7 @@ import com.yxproject.start.service.AddRemainingCardService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -16,8 +17,11 @@ public class AddRemainingCardServiceImpl implements AddRemainingCardService{ ...@@ -16,8 +17,11 @@ public class AddRemainingCardServiceImpl implements AddRemainingCardService{
@Autowired @Autowired
private SpecialCardMapper specialCardMapper; private SpecialCardMapper specialCardMapper;
@Override @Override
public List<SpecialCardEntity>getRemainingCardData(String accept_number){ public List<SpecialCardEntity>getRemainingCardData(List accept_number){
List<SpecialCardEntity>List=specialCardMapper.addRemainingCard(accept_number); List list=new ArrayList();
return List; for (int i=0; i <accept_number.size() ; i++) {
list.add(specialCardMapper.addRemainingCard((String) accept_number.get(i)));
}
return list;
} }
} }
src/main/java/com/yxproject/start/service/impl/FailedTypeServiceImpl.java 0 → 100644
View file @ 35ffc44d
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.FailedTypeEntity;
import com.yxproject.start.mapper.SpecialCardMapper;
import com.yxproject.start.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/26.
*/
@Service
public class FailedTypeServiceImpl implements FailedTypeService {
@Autowired
private SpecialCardMapper specialCardMapper;
/**
* 查询废证类型
* @return
*/
@Override
public List<FailedTypeEntity> getFailedType (){
List<FailedTypeEntity> getFailedType = specialCardMapper.getFailedType();
return getFailedType;
}
}
src/main/java/com/yxproject/start/service/impl/FindCardServiceImpl.java 0 → 100644
View file @ 35ffc44d
package com.yxproject.start.service.impl;
import com.yxproject.start.mapper.AccCardTMapper;
import com.yxproject.start.mapper.FindCardMapper;
import com.yxproject.start.service.FindCardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/25.
*/
@Service
public class FindCardServiceImpl implements FindCardService {
@Autowired
private FindCardMapper findCardMapper;
@Override
public List<Map<String,Object>>getCardData(String find_No){
List<Map<String,Object>>List=findCardMapper.findCardByGroupNo(find_No);
return List;
}
}
src/main/java/com/yxproject/start/service/impl/ProdCardServiceImpl.java 0 → 100644
View file @ 35ffc44d
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.ProdCardEntity;
import com.yxproject.start.mapper.SpecialCardMapper;
import com.yxproject.start.service.ProdCardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/26.
*/
@Service
public class ProdCardServiceImpl implements ProdCardService {
@Autowired
public SpecialCardMapper specialCardMapper;
/**
* 查询简易证件信息
* @return
*/
@Override
public List<ProdCardEntity> getProdCard ( List idNo){
List list = new ArrayList<>();
for (int i=0; i <idNo.size(); i++) {
List <ProdCardEntity> prodCardEntity = specialCardMapper.getProdCard((String) idNo.get(i));
list.addAll(prodCardEntity);
}
// 去重
for ( int i = 0 ; i < list.size() - 1 ; i ++ ) {
for ( int j = list.size() - 1 ; j > i; j -- ) {
if (list.get(j).equals(list.get(i))) {
list.remove(j);
}
}
}
return list;
}
}
src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java
View file @ 35ffc44d
...@@ -434,15 +434,6 @@ public class TaskServiceImpl implements TaskService { ...@@ -434,15 +434,6 @@ public class TaskServiceImpl implements TaskService {
return i; return i;
} }
/**
* 查询废证
* @return
*/
@Override
public List<Map<String,Object>> getProdCard (String idNo,String acceptNo){
List<Map<String,Object>> getProdCard = specialCardMapper.getProdCard(idNo,acceptNo);
return getProdCard;
}
/** /**
* 测试查询 * 测试查询
......
src/main/resources/application.yml
View file @ 35ffc44d
...@@ -7,11 +7,6 @@ mybatis: ...@@ -7,11 +7,6 @@ mybatis:
#加载Mybatis配置文件 #加载Mybatis配置文件
mapper-locations: classpath:mapper/*Mapper.xml mapper-locations: classpath:mapper/*Mapper.xml
config-location: classpath:mapper/config/mybatis-config.xml config-location: classpath:mapper/config/mybatis-config.xml
#logging.level.*=DEBUG
#logging:
# level:
# com.yx_project.start.mapper.*: debug
# logging.level.com.hz.controller=WARN #控制器层
#配置调度生产Oracle数据库 #配置调度生产Oracle数据库
spring: spring:
...@@ -21,7 +16,6 @@ spring: ...@@ -21,7 +16,6 @@ spring:
username: dahai username: dahai
password: dahai password: dahai
#配置shiro #配置shiro
shiro: shiro:
loginUrl: http://localhost:8081 loginUrl: http://localhost:8081
......
src/main/resources/log4j.properties deleted 100644 → 0
View file @ 1adadcdd
log4j.rootCategory=DEBUG,stdout,DebugAppender,InfoAppender,ErrorAppender
log4j.debug=true log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[QC] %p [%t] %C.%M(%L) | %m%n
#logger input file log4j.logger.DebugAppender.access=DEBUG
log4j.appender.DebugAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.DebugAppender.File=../logs/a.log
log4j.appender.DebugAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#logger input file log4j.logger.InfoAppender.access=INFO
log4j.appender.InfoAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.InfoAppender.File=../logs/b.log
log4j.appender.InfoAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.InfoAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#error log input file log4j.logger.ErrorAppender.access=ERROR
log4j.appender.ErrorAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.ErrorAppender.File=../logs/c.log
log4j.appender.ErrorAppender.Append = true
log4j.appender.ErrorAppender.threshold = ERROR
log4j.appender.ErrorAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.ErrorAppender.layout.ConversionPattern=%d{MM-dd HH:mm:ss.SSS} %c %-5p - %m%n
\ No newline at end of file
src/main/resources/mapper/FindCardMapper.xml 0 → 100644
View file @ 35ffc44d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxproject.start.mapper.FindCardMapper">
<resultMap id="FindCardMapper" type="com.yxproject.start.entity.AccCardTEntity">
<id column="ACCEPT_NO" property="accept_No" jdbcType="VARCHAR"/>
<result column="UPLOAD_NO" property="upload_No" jdbcType="CHAR"/>
<result column="PHOTO_NO" property="photo_No" jdbcType="VARCHAR"/>
<result column="NAME" property="name" jdbcType="VARCHAR"/>
<result column="SEX_NO" property="sex_No" jdbcType="CHAR"/>
<result column="NATION_NO" property="nation_No" jdbcType="CHAR"/>
<result column="BIRTHDAY" property="birthday" jdbcType="CHAR"/>
<result column="ID_NO" property="id_No" jdbcType="VARCHAR"/>
<result column="ADDR1" property="addr1" jdbcType="VARCHAR"/>
<result column="ADDR2" property="addr2" jdbcType="VARCHAR"/>
<result column="ADDR3" property="addr3" jdbcType="VARCHAR"/>
<result column="ADDRESS1" property="address1" jdbcType="VARCHAR"/>
<result column="SIGN_GOVT" property="sign_Govt" jdbcType="VARCHAR"/>
<result column="EXPIRE_DATE" property="expire_Date" jdbcType="CHAR"/>
<result column="BEGIN_DATE" property="begin_Date" jdbcType="CHAR"/>
<result column="APPLY_REASON" property="apply_Reason" jdbcType="CHAR"/>
<result column="STATUS_NO" property="status_No" jdbcType="CHAR"/>
</resultMap>
<select id="findCardByGroupNo" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM TASK WHERE TASK_ID=#{find_No}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/SpecialCardMapper.xml
View file @ 35ffc44d
...@@ -42,11 +42,15 @@ ...@@ -42,11 +42,15 @@
INSERT INTO SPECIAL_CARD (ACCEPT_NO, TASK_ID, SPECIAL_TYPE,GROUP_NO) VALUES (#{accept_Number},(SELECT TASK_ID FROM GROUP_NO WHERE GROUP_NO.GROUP_NO=SUBSTR(#{accept_Number},1,8)),0,SUBSTR(#{accept_Number},1,8)) INSERT INTO SPECIAL_CARD (ACCEPT_NO, TASK_ID, SPECIAL_TYPE,GROUP_NO) VALUES (#{accept_Number},(SELECT TASK_ID FROM GROUP_NO WHERE GROUP_NO.GROUP_NO=SUBSTR(#{accept_Number},1,8)),0,SUBSTR(#{accept_Number},1,8))
</select> </select>
<select id="getProdCard" resultType="java.util.HashMap" parameterType="String"> <select id="getProdCard" resultType="com.yxproject.start.entity.ProdCardEntity" parameterType="String">
SELECT NAME,ID_NO,PROD_CARD_T.ACCEPT_NO,SPECIAL_TYPE FROM (select ACCEPT_NO,NAME,ID_NO from prod_card_t@prod_link) PROD_CARD_T SELECT NAME,ID_NO AS idNo,PROD_CARD_T.ACCEPT_NO AS acceptNo,SPECIAL_TYPE AS specialType FROM (select ACCEPT_NO,NAME,ID_NO from prod_card_t@prod_link) PROD_CARD_T
LEFT JOIN (select ACCEPT_NO,SPECIAL_TYPE from SPECIAL_CARD)SPECIAL_CARD ON SPECIAL_CARD.ACCEPT_NO = PROD_CARD_T.ACCEPT_NO LEFT JOIN (select ACCEPT_NO,SPECIAL_TYPE from SPECIAL_CARD)SPECIAL_CARD ON SPECIAL_CARD.ACCEPT_NO = PROD_CARD_T.ACCEPT_NO
WHERE PROD_CARD_T.ID_NO =#{idNo} OR PROD_CARD_T.ACCEPT_NO =#{acceptNo} WHERE PROD_CARD_T.ID_NO =#{idNo} OR PROD_CARD_T.ACCEPT_NO =#{acceptNo}
</select> </select>
<select id="getFailedType" resultType="com.yxproject.start.entity.FailedTypeEntity">
SELECT FAILED_CARD_REASON_ID AS failedCardReasonId,FAILED_CARD_REASON AS failedCardReason FROM FAILED_CARD_REASON_DIC
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/static/dialogs/confirmFailedCardsInfo.html 0 → 100644
View file @ 35ffc44d
<div class="cl">
<div style="height: auto;width: auto">
<table class="table table-responsive table-hover">
<thead>
<th>NO.</th>
<th>受理号</th>
<th>姓名</th>
<th>类型</th>
</thead>
<tbody>
<tr ng-repeat="item in dataInfo">
<td>{{$index + 1}}</td>
<td>{{item.acceptNo}}</td>
<td>{{item.name}}</td>
<td ng-if="item.specialType==0">余证</td>
<td ng-if="item.specialType==1">快证</td>
<td ng-if="item.specialType==2" style="color: red;">退证</td>
</tr>
</tbody>
</table>
</div>
<div style="text-align: right;">
<span style="font-size:14px;color: red;padding-left:34px;" ng-if="alertError">{{alertError}}</span>
<button class="btn btn-info confirmBtn" ng-click="confirmFailedInfo()">确定</button>
<button style="margin-right: 10px" class="btn btn-info" ng-click="cancelThisDialog()&&closeThisDialog()">关闭</button>
<p ng-if="isShowSuccess==1" style="color: red;margin-right:20px;margin-top:10px;">{{AddSuccess}}</p>
</div>
</div>
src/main/resources/static/js/config.router.js
View file @ 35ffc44d
...@@ -142,6 +142,30 @@ angular.module('app') ...@@ -142,6 +142,30 @@ angular.module('app')
}] }]
} }
}) })
.state('layout.addFailedCard', {
url: '/addFailedCard',
templateUrl: 'tpl/layout/addFailedCard/addFailedCard.html',
cache:false,
controller:'addFailedCardCtrl',
resolve: {
deps: ['uiLoad',
function( uiLoad ){
return uiLoad.load( ['tpl/layout/addFailedCard/addFailedCard.js'] );
}]
}
})
.state('layout.addRemainCard', {
url: '/addFailedCard',
templateUrl: 'tpl/layout/addRemainCard/addRemainCard.html',
cache:false,
controller:'addRemainCardCtrl',
resolve: {
deps: ['uiLoad',
function( uiLoad ){
return uiLoad.load( ['tpl/layout/addRemainCard/addRemainCard.js'] );
}]
}
})
} }
] ]
......
src/main/resources/static/js/services/service.js
View file @ 35ffc44d
...@@ -485,22 +485,113 @@ app.service('MessageService', function (ngDialog) { ...@@ -485,22 +485,113 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
}, },
getprintReceipt:function(startTime, endTime,success){ getFailedType:function(success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../user/printReceiptList" + urlTimeStamp(), url: "../user/getFailedType" + urlTimeStamp()
}).then(function successCallback(response) {
console.log(response.data,"-------------response.data------")
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
selectProdCard:function(idNo,success){
console.log(idNo,"+++++idno+++++")
$http({
method: 'GET',
url: "../user/selectProdCard" + urlTimeStamp(),
params:{ params:{
startDate:startTime, idNo:idNo
endDate:endTime
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response.data,"-------------response.data------")
success(response.data) success(response.data)
},function(err){ },function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"} var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
},
saveFailedCardsID:function(success){
$http({
method: 'GET',
url: "../yingxin/addInValidCardInfo" + urlTimeStamp(),
}).then(function successCallback(response) {
console.log(response.data,"-------------response.data------")
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
addRemainCard:function(success){
$http({
method: 'GET',
url: "../yingxin/addRemainCard" + urlTimeStamp(),
params:{
idNo:idNo
} }
}).then(function successCallback(response) {
console.log(response.data,"-------------response.data------")
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getprintReceipt:function(startDate,endDate,success) {
$http({
method: 'GET',
url: "../user/printReceiptList" + urlTimeStamp(),
params: {
startDate:startDate,
endDate:endDate
},
headers: {'Content-Type': 'application/json'},
transformRequest: angular.identity,
responseType:'arraybuffer',
}).then(function successCallback(response) {
if(response.data.Error == true){
MessageService.httpRequestFailed(JSON.stringify(response.data))
}else{
success(response.data)
}
},function(err){
DebugService.debug("$http error:", err)
DebugService.debug("----------------------------------------------")
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getPrintOfficialReceipt:function(startDate,endDate,success) {
$http({
method: 'GET',
url: "../user/printOfficialReceipt" + urlTimeStamp(),
params: {
startDate:startDate,
endDate:endDate
},
headers: {'Content-Type': 'application/json'},
transformRequest: angular.identity,
responseType:'arraybuffer',
}).then(function successCallback(response) {
if(response.data.Error == true){
MessageService.httpRequestFailed(JSON.stringify(response.data))
}else{
success(response.data)
}
},function(err){
DebugService.debug("$http error:", err)
DebugService.debug("----------------------------------------------")
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
} }
}]) }])
\ No newline at end of file
src/main/resources/static/tpl/layout/addFailedCard/addFailedCard.html 0 → 100644
View file @ 35ffc44d
<!--<div class="row" style="font-size: 1.3em;border-bottom:1px solid #CCCCCC;margin-bottom:10px;padding-top:10px;">-->
<!---->
<!--</div>-->
<!--<div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;">-->
<!---->
<!--</div>-->
<div class="col-md-12">
<p>废证补制</p>
</div>
<div id="cardsDiv">
<form ng-submit="createInputs()">
<span style="font-size:20px;">填写废证数：</span>
<input style="margin-top:20px;height: 30px;" type="text" class="failedcount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<form ng-show="showH5==1" ng-submit="saveFailedCards()">
<div style="padding-top:10px;padding-bottom:10px;">请填写废证受理号：</div>
<ul id="cardsUl" style="padding: 0;margin-bottom:10px;">
<li id="0">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failedCardReasonId}}" ng-repeat="type in failedTypeList">{{type.failedCardReason}}</option>
</select>
</li>
<li id="1">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failedCardReasonId}}" ng-repeat="type in failedTypeList">{{type.failedCardReason}}</option>
</select>
</li>
<li id="2">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failedCardReasonId}}" ng-repeat="type in failedTypeList">{{type.failedCardReason}}</option>
</select>
</li>
<li id="3">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failedCardReasonId}}" ng-repeat="type in failedTypeList">{{type.failedCardReason}}</option>
</select>
</li>
<li id="4">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failedCardReasonId}}" ng-repeat="type in failedTypeList">{{type.failedCardReason}}</option>
</select>
</li>
<li id="5">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failedCardReasonId}}" ng-repeat="type in failedTypeList">{{type.failedCardReason}}</option>
</select>
</li>
<li id="6">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failedCardReasonId}}" ng-repeat="type in failedTypeList">{{type.failedCardReason}}</option>
</select>
</li>
<li id="7">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failedCardReasonId}}" ng-repeat="type in failedTypeList">{{type.failedCardReason}}</option>
</select>
</li>
<li id="8">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failedCardReasonId}}" ng-repeat="type in failedTypeList">{{type.failedCardReason}}</option>
</select>
</li>
<li id="9">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failedCardReasonId}}" ng-repeat="type in failedTypeList">{{type.failedCardReason}}</option>
</select>
</li>
</ul>
<p style="font-size:14px;color: red;text-align: left;" ng-if="alertLb">{{alertLb}}</p>
<div style="text-align: right;">
<input type="submit" class="btn btn-primary" value="保存">
<input type="button" class="btn btn-danger" ng-click="cancelAddFailed()" value="取消">
</div>
</form>
</div>
src/main/resources/static/tpl/layout/addFailedCard/addFailedCard.js 0 → 100644
View file @ 35ffc44d
app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if ($rootScope.loginData.login === false) {
$state.go("signin")
} else {
$state.go("layout.addFailedCard")
}
$scope.failedTypeList =[{failed_Card_Reason_Id:2,failed_Card_Reason:'切废1'},{failed_Card_Reason_Id:1,failed_Card_Reason:"切废"}];
$rootScope.showH5 = 0;
$scope.createInputs = function () {
console.log("---查询废证制证类型---")
HttpService.getFailedType(function(data) {
$scope.failedTypeList = data.respData;
console.log($scope.failedTypeList)
})
for (var i=0;i<10;i++){
document.getElementById(i).style.display = 'none';
document.getElementById(i).style.marginBottom = '10px';
}
$scope.failedCount = $(".failedcount").val();
console.log($scope.failedCount)
if ($scope.failedCount == '' || parseInt($scope.failedCount) <= 0 || parseInt($scope.failedCount) > 10) {
$scope.errMsglb = "数量应在0和10之间且不能为空！";
} else {
$scope.errMsglb = "";
$rootScope.showH5 = 1;
for (var i = 0; i <$scope.failedCount; i++) {
document.getElementById(i).style.display = 'block';
}
}
}
$rootScope.emptyForm = function(){
for (var i = 0; i < $scope.failedCount; i++) {
document.getElementById(i).getElementsByTagName("input")[0].value = "";
document.getElementById(i).getElementsByTagName("input")[1].value = "";
}
}
$scope.saveFailedCards = function () {
$rootScope.arr = [];
var checkArr = [];
var jsonStr = {};
var valueArr = [];
var checkValueArr = [];
for (var i = 0; i < $scope.failedCount; i++) {
var json = {};
var checkJson = {};
json.acceptNo = $('#' + i + ' input:eq(0)').val();
json.reson = $('#' + i + ' select').val();
valueArr.push(json);
if(checkValueArr.indexOf($('#' + i + ' input:eq(0)').val())==-1){
checkValueArr.push($('#' + i + ' input:eq(0)').val());
}
}
if(checkValueArr.length == $scope.failedCount){
checkJson.list = checkValueArr;
jsonStr.list = valueArr;
jsonStr.workshop = $rootScope.loginData.workshop;
$rootScope.arr.push(jsonStr);
checkArr.push(checkJson);
console.log($rootScope.arr)
var myFailedcount = 0;
for (var i = 0; i < $rootScope.arr.length; i++) {
for (var j = 0; j < $rootScope.arr[i].list.length; j++) {
if ($rootScope.arr[i].list[j].acceptNo.length == 18 || $rootScope.arr[i].list[j].acceptNo.length == 10) {
myFailedcount++;
}
else {
continue;
}
}
}
var str = "";
if (myFailedcount == (checkArr.length * valueArr.length)) {
HttpService.selectProdCard(checkArr, function (data) {
ngDialog.open({
template: 'dialogs/confirmFailedCardsInfo.html' + urlTimeStamp(),
width: '40%',
cache: false,
controller: ['$scope', '$rootScope', 'HttpService', function ($scope, $rootScope, HttpService) {
$scope.dataInfo = data.respData;
console.log($scope.dataInfo,"-=====$scope.dataInfo====")
var count = 0;
for(var i=0;i<$scope.dataInfo.size;i++){
if($scope.dataInfo[i].name!=null){
count+=1;
}else{
continue;
}
}
$scope.isShowSuccess = 0;
$scope.confirmFailedInfo = function () {
console.log($rootScope.arr)
$(".confirmBtn").attr("disabled", true);
if(count==$scope.dataInfo.length){
HttpService.saveFailedCardsID($rootScope.arr,function(data){
$scope.isShowSuccess = 1;
$scope.AddSuccess = data.respData.string;
$rootScope.emptyForm();
})
}else{
$scope.alertError = "请将您输入有误的受理号修改后再添加！";
}
}
$scope.cancelThisDialog = function(){
$rootScope.showH5 = 0;
$scope.closeThisDialog();
}
}]
})
})
} else {
$scope.alertLb = "请检查您输入的废证受理号和身份证号是否全部正确！";
}
}else{
$scope.alertLb("废证受理号或身份证号存在空值或重复，请检查后再提交。")
}
}
$scope.cancelAddFailed = function () {
$rootScope.showH5 = 0;
$scope.alertLb = "";
$rootScope.emptyForm();
}
}]);
\ No newline at end of file
src/main/resources/static/tpl/layout/addRemainCard/addRemainCard.html 0 → 100644
View file @ 35ffc44d
<!--<div class="row" style="font-size: 1.3em;border-bottom:1px solid #CCCCCC;margin-bottom:10px;padding-top:10px;">-->
<!---->
<!--</div>-->
<!--<div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;">-->
<!---->
<!--</div>-->
<div class="col-md-12">
<p>余证添加</p>
</div>
<div id="cardsDiv">
<form ng-submit="createInputs()">
<span style="font-size:20px;">填写余证数：</span>
<input style="margin-top:20px;height: 30px;" type="text" class="failedcount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<form ng-show="showH5==1" ng-submit="saveRemainCards()">
<div style="padding-top:10px;padding-bottom:10px;">请填写余证受理号：</div>
<ul id="cardsUl" style="padding: 0;margin-bottom:10px;">
<li id="0">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
</li>
<li id="1">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
</li>
<li id="2">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
</li>
<li id="3">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
</li>
<li id="4">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
</li>
<li id="5">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
</li>
<li id="6">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
</li>
<li id="7">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
</li>
<li id="8">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
</li>
<li id="9">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
</li>
</ul>
<p style="font-size:14px;color: red;text-align: left;" ng-if="alertLb">{{alertLb}}</p>
<div style="text-align: right;">
<input type="submit" class="btn btn-primary" value="保存">
<input type="button" class="btn btn-danger" ng-click="cancelAddFailed()" value="取消">
</div>
</form>
</div>
src/main/resources/static/tpl/layout/addRemainCard/addRemainCard.js 0 → 100644
View file @ 35ffc44d
app.controller('addRemainCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if ($rootScope.loginData.login === false) {
$state.go("signin")
} else {
$state.go("layout.addRemainCard")
}
$rootScope.showH5 = 0;
$scope.createInputs = function () {
for (var i=0;i<10;i++){
document.getElementById(i).style.display = 'none';
document.getElementById(i).style.marginBottom = '10px';
}
$scope.failedCount = $(".failedcount").val();
console.log($scope.failedCount)
if ($scope.failedCount == '' || parseInt($scope.failedCount) <= 0 || parseInt($scope.failedCount) > 10) {
$scope.errMsglb = "数量应在0和10之间且不能为空！";
} else {
$scope.errMsglb = "";
$rootScope.showH5 = 1;
for (var i = 0; i <$scope.failedCount; i++) {
document.getElementById(i).style.display = 'block';
}
}
}
$rootScope.emptyForm = function(){
for (var i = 0; i < $scope.failedCount; i++) {
document.getElementById(i).getElementsByTagName("input")[0].value = "";
document.getElementById(i).getElementsByTagName("input")[1].value = "";
}
}
$scope.saveRemainCards = function () {
$rootScope.arr = [];
var checkArr = [];
var jsonStr = {};
var valueArr = [];
var checkValueArr = [];
for (var i = 0; i < $scope.failedCount; i++) {
var json = {};
var checkJson = {};
json.acceptNo = $('#' + i + ' input:eq(0)').val();
json.reson = $('#' + i + ' select').val();
valueArr.push(json);
if(checkValueArr.indexOf($('#' + i + ' input:eq(0)').val())==-1){
checkValueArr.push($('#' + i + ' input:eq(0)').val());
}
}
if(checkValueArr.length == $scope.failedCount){
checkJson.list = checkValueArr;
jsonStr.list = valueArr;
jsonStr.workshop = $rootScope.loginData.workshop;
$rootScope.arr.push(jsonStr);
checkArr.push(checkJson);
console.log($rootScope.arr)
var myFailedcount = 0;
for (var i = 0; i < $rootScope.arr.length; i++) {
for (var j = 0; j < $rootScope.arr[i].list.length; j++) {
if ($rootScope.arr[i].list[j].acceptNo.length == 18 || $rootScope.arr[i].list[j].acceptNo.length == 10) {
myFailedcount++;
}
else {
continue;
}
}
}
var str = "";
if (myFailedcount == (checkArr.length * valueArr.length)) {
HttpService.selectProdCard(checkArr, function (data) {
ngDialog.open({
template: 'dialogs/confirmFailedCardsInfo.html' + urlTimeStamp(),
width: '40%',
cache: false,
controller: ['$scope', '$rootScope', 'HttpService', function ($scope, $rootScope, HttpService) {
$scope.dataInfo = data.respData;
console.log($scope.dataInfo,"-=====$scope.dataInfo====")
var count = 0;
for(var i=0;i<$scope.dataInfo.size;i++){
if($scope.dataInfo[i].name!=null){
count+=1;
}else{
continue;
}
}
$scope.isShowSuccess = 0;
$scope.confirmFailedInfo = function () {
console.log($rootScope.arr)
$(".confirmBtn").attr("disabled", true);
if(count==$scope.dataInfo.length){
HttpService.addRemainCard($rootScope.arr,function(data){
$scope.isShowSuccess = 1;
$scope.AddSuccess = data.respData.string;
$rootScope.emptyForm();
})
}else{
$scope.alertError = "请将您输入有误的受理号修改后再添加！";
}
}
$scope.cancelThisDialog = function(){
$rootScope.showH5 = 0;
$scope.closeThisDialog();
}
}]
})
})
} else {
$scope.alertLb = "请检查您输入的废证受理号和身份证号是否全部正确！";
}
}else{
$scope.alertLb("废证受理号或身份证号存在空值或重复，请检查后再提交。")
}
}
$scope.cancelAddFailed = function () {
$rootScope.showH5 = 0;
$scope.alertLb = "";
$rootScope.emptyForm();
}
}]);
\ No newline at end of file
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.js
View file @ 35ffc44d
...@@ -335,8 +335,6 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -335,8 +335,6 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
// } // }
// ] // ]
// $scope.receiptList = [[358, 0, 0, 0, 82, 0, 0, 1, 0, 205, 646, 3, "郑州 辖区", "410101"], [721, 0, 0, 0, 20, 0, 0, 7, 1, 91, 840, 4, "郑州 中原", "410102"],]
$scope.showtable = -1; $scope.showtable = -1;
$scope.showTable = function (taskID) { $scope.showTable = function (taskID) {
console.log("$scope.-------$scope.showtable----",taskID); console.log("$scope.-------$scope.showtable----",taskID);
......
src/main/resources/static/tpl/layout/receipt/receipt.js
View file @ 35ffc44d
...@@ -66,8 +66,10 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt ...@@ -66,8 +66,10 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt
var date2 = $("#wdate2").val(); var date2 = $("#wdate2").val();
HttpService.getprintReceipt(changeDataFormat(date1), changeDataFormat(date2), function (data) { HttpService.getprintReceipt(changeDataFormat(date1), changeDataFormat(date2), function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"}); var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var fileName = $filter('date')(date,"yyyy年MM月dd日交接单") + ".xls";
var a = document.createElement("a"); var a = document.createElement("a");
document.body.appendChild(a); document.body.appendChild(a);
a.download = fileName;
a.href = URL.createObjectURL(blob); a.href = URL.createObjectURL(blob);
a.click(); a.click();
}) })
...@@ -78,6 +80,7 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt ...@@ -78,6 +80,7 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt
var date2 = $("#wdate2").val(); var date2 = $("#wdate2").val();
HttpService.getPrintOfficialReceipt(changeDataFormat(date1), changeDataFormat(date2), function (data) { HttpService.getPrintOfficialReceipt(changeDataFormat(date1), changeDataFormat(date2), function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"}); var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var fileName = $filter('date')(date,"yyyy年MM月dd日回执单") + ".xls";
var a = document.createElement("a"); var a = document.createElement("a");
document.body.appendChild(a); document.body.appendChild(a);
a.href = URL.createObjectURL(blob); a.href = URL.createObjectURL(blob);
......
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