Commit 9bf5fff5 authored by Administrator's avatar Administrator

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

# Conflicts:
#	src/main/resources/static/tpl/layout/permissionList/permissionList.html
#	src/main/resources/static/tpl/layout/permissionList/permissionList.js
#	src/main/resources/static/tpl/layout/userList/userList.js
parents 26c02f41 ecddba2d
......@@ -88,8 +88,12 @@
<artifactId>poi</artifactId>
<version>3.13</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<!-- MyBatis分页插件 -->
<!-- MyBatis分页插件 -->
<!--<dependency>-->
<!--<groupId>com.github.pagehelper</groupId>-->
<!--<artifactId>pagehelper</artifactId>-->
......
<?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>
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
......@@ -2,6 +2,7 @@ package com.yxproject.start.api;
//import com.yxproject.start.service.FindCbCountByDealdateViewService;
import com.yxproject.start.service.CardBodyService;
import com.yxproject.start.service.FindFinancialReportByViewService;
import com.yxproject.start.service.FindStationCountService;
import com.yxproject.start.service.FindTaskByDealdateViewService;
import com.yxproject.start.utils.YXJSONResponse;
......@@ -24,39 +25,73 @@ public class YingxinApi {
@Autowired
private FindTaskByDealdateViewService findTaskByDealdateViewService;
// private FindCbCountByDealdateViewService findCbCountByDealdateViewService;
@Autowired
private CardBodyService cardBodyService;
@Autowired
private FindStationCountService findStationCountService;
@Autowired
private FindFinancialReportByViewService findFinancialReportByViewService;
/**
* 查询在受理库查询任务单详情 根据处理时间查询;
*
*
*/
@RequestMapping("getGroupInfo")
public List<Map<String, Object>> getGroupInfo() {
List<Map<String, Object>> list = findTaskByDealdateViewService.getAccGroupData();
return list;
public String getGroupInfo(@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime, HttpServletResponse resp) {
List<Map<String, Object>> list = findTaskByDealdateViewService.getAccGroupData(startTime, endTime);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(list);
Map map = new HashMap();
return yxjsonResponse.toJSONString();
}
/**
* 查询卡基统计报表 用视图查询 根据起止时间查询
*
*
*/
@RequestMapping("getCbCountInfo")
public List<Map<String,Object>> getCbCountInfo() {
List<Map<String, Object>> list=cardBodyService.getCbCount();
return list;
public String getCbCountInfo(@RequestParam("startTime")String startTime ,@RequestParam("endTime")String endTime,HttpServletResponse resp) {
List<Map<String, Object>> list=cardBodyService.getCbCount(startTime, endTime);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(list);
Map map = new HashMap();
return yxjsonResponse.toJSONString();
}
@RequestMapping("getCbBodyCountInfo")
public List<Map<String,Object>> getCbBodyCountInfo() {
List<Map<String,Object>> list=cardBodyService.getCbBodyCount();
return list;
}
@RequestMapping("getStationCountInfo")
public String getStationCountInfo(@RequestParam("submitDate") String submitDate, HttpServletResponse resp){
List<Map<String,Object>> list=findStationCountService.getStationCountData(submitDate);
/**
* 查询各个工位的已经完成的数量和当天要完成的数量 根据当前日期 当前状态查询
*
*
*/
@RequestMapping("getStateCountInfo")
public String getStateCountInfo(@RequestParam("submitDate") String submitDate,@RequestParam("state") String state,HttpServletResponse resp){
List<Map<String,Object>> list=findStationCountService.getStationCountData(submitDate,state);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(list);
Map map = new HashMap();
return yxjsonResponse.toJSONString();
}
/**
* 查询财务报表 查询派出所申领表 用视图查询 根据起止时间 类型 地市 区县 派出所查询
*
*
*/
@RequestMapping("getFinancialReportInfo")
public String getFinancialReportInfo(@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime,@RequestParam("cardType") String cardType,@RequestParam("cityCode")String cityCode,HttpServletResponse resp){
List<Map<String,Object>> list=findFinancialReportByViewService.getFinancialReportData(startTime,endTime,cardType,cityCode);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(list);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
}
<?xml version="1.0" encoding="UTF-8"?>
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
version="2.0">
<entity class="com.yxproject.start.entity.AccGroupRelationTEntity">
<table name="ACC_GROUP_RELATION_T" schema="ACC_DBA" catalog=""/>
<attributes>
<id name="groupNo">
<column name="GROUP_NO" length="10"/>
</id>
<basic name="originalNo">
<column name="ORIGINAL_NO" length="25"/>
</basic>
<basic name="dealStatus">
<column name="DEAL_STATUS" nullable="false" length="1"/>
</basic>
<basic name="dealDate">
<column name="DEAL_DATE" length="8"/>
</basic>
<basic name="uploadUnitNo">
<column name="UPLOAD_UNIT_NO" length="12"/>
</basic>
</attributes>
</entity>
</entity-mappings>
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Date;
import java.util.Objects;
/**
* Created by Administrator on 2018/12/19.
*/
@Entity
@Table(name = "CITY_LIST", schema = "DAHAI")
public class CityListEntity {
private long taskId;
private long cardType;
private long oldCardType;
private String citycode;
private Date submitDate;
private Date issuedDate;
private long printState;
private Date downloadDate;
private Date printOutDate;
private Date positionDate;
private Date outWorkshopDate;
private String qualityPeopleName;
private Date qualityTestDate;
private String exceptionInformation;
private Date outStorageDate;
private Date inStorageDate;
private long taskStateId;
private long isException;
private long printerId;
private String cityName;
private long groupCount;
private long groupNo;
private long validCount;
private long invalidCount;
@Id
@Column(name = "taskId", nullable = false, precision = 0)
public long getTaskId() {
return taskId;
}
public void setTaskId(long taskId) {
this.taskId = taskId;
}
@Basic
@Column(name = "cardType", nullable = false, precision = 0)
public long getCardType() {
return cardType;
}
public void setCardType(long cardType) {
this.cardType = cardType;
}
@Basic
@Column(name = "oldCardType", nullable = false, precision = 0)
public long getOldCardType() {
return oldCardType;
}
public void setOldCardType(long oldCardType) {
this.oldCardType = oldCardType;
}
@Basic
@Column(name = "citycode", nullable = true, length = 20)
public String getCitycode() {
return citycode;
}
public void setCitycode(String citycode) {
this.citycode = citycode;
}
@Basic
@Column(name = "submitDate", nullable = true)
public Date getSubmitDate() {
return submitDate;
}
public void setSubmitDate(Date submitDate) {
this.submitDate = submitDate;
}
@Basic
@Column(name = "issuedDate", nullable = true)
public Date getIssuedDate() {
return issuedDate;
}
public void setIssuedDate(Date issuedDate) {
this.issuedDate = issuedDate;
}
@Basic
@Column(name = "printState", nullable = true, precision = 0)
public long getPrintState() {
return printState;
}
public void setPrintState(long printState) {
this.printState = printState;
}
@Basic
@Column(name = "downloadDate", nullable = true)
public Date getDownloadDate() {
return downloadDate;
}
public void setDownloadDate(Date downloadDate) {
this.downloadDate = downloadDate;
}
@Basic
@Column(name = "printOutDate", nullable = true)
public Date getPrintOutDate() {
return printOutDate;
}
public void setPrintOutDate(Date printOutDate) {
this.printOutDate = printOutDate;
}
@Basic
@Column(name = "positionDate", nullable = true)
public Date getPositionDate() {
return positionDate;
}
public void setPositionDate(Date positionDate) {
this.positionDate = positionDate;
}
@Basic
@Column(name = "outWorkshopDate", nullable = true)
public Date getOutWorkshopDate() {
return outWorkshopDate;
}
public void setOutWorkshopDate(Date outWorkshopDate) {
this.outWorkshopDate = outWorkshopDate;
}
@Basic
@Column(name = "qualityPeopleName", nullable = true, length = 20)
public String getQualityPeopleName() {
return qualityPeopleName;
}
public void setQualityPeopleName(String qualityPeopleName) {
this.qualityPeopleName = qualityPeopleName;
}
@Basic
@Column(name = "qualityTestDate", nullable = true)
public Date getQualityTestDate() {
return qualityTestDate;
}
public void setQualityTestDate(Date qualityTestDate) {
this.qualityTestDate = qualityTestDate;
}
@Basic
@Column(name = "exceptionInformation", nullable = true, length = 120)
public String getExceptionInformation() {
return exceptionInformation;
}
public void setExceptionInformation(String exceptionInformation) {
this.exceptionInformation = exceptionInformation;
}
@Basic
@Column(name = "outStorageDate", nullable = true)
public Date getOutStorageDate() {
return outStorageDate;
}
public void setOutStorageDate(Date outStorageDate) {
this.outStorageDate = outStorageDate;
}
@Basic
@Column(name = "inStorageDate", nullable = true)
public Date getInStorageDate() {
return inStorageDate;
}
public void setInStorageDate(Date inStorageDate) {
this.inStorageDate = inStorageDate;
}
@Basic
@Column(name = "taskStateId", nullable = true, precision = 0)
public long getTaskStateId() {
return taskStateId;
}
public void setTaskStateId(long taskStateId) {
this.taskStateId = taskStateId;
}
@Basic
@Column(name = "isException", nullable = true, precision = 0)
public long getIsException() {
return isException;
}
public void setIsException(long isException) {
this.isException = isException;
}
@Basic
@Column(name = "printerId", nullable = true, precision = 0)
public long getPrinterId() {
return printerId;
}
public void setPrinterId(long printerId) {
this.printerId = printerId;
}
@Basic
@Column(name = "cityName", nullable = true, length = 20)
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
@Basic
@Column(name = "groupCount", nullable = true, precision = 0)
public long getGroupCount() {
return groupCount;
}
public void setGroupCount(long groupCount) {
this.groupCount = groupCount;
}
@Basic
@Column(name = "groupNo", nullable = true, precision = 0)
public long getGroupNo() {
return groupNo;
}
public void setGroupNo(long groupNo) {
this.groupNo = groupNo;
}
@Basic
@Column(name = "validCount", nullable = true, precision = 0)
public long getValidCount() {
return validCount;
}
public void setValidCount(long validCount) {
this.validCount = validCount;
}
@Basic
@Column(name = "invalidCount", nullable = true, precision = 0)
public long getInvalidCount() {
return invalidCount;
}
public void setInvalidCount(long invalidCount) {
this.invalidCount = invalidCount;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
CityListEntity that = (CityListEntity) o;
return taskId == that.taskId &&
cardType == that.cardType &&
oldCardType == that.oldCardType &&
Objects.equals(citycode, that.citycode) &&
Objects.equals(submitDate, that.submitDate) &&
Objects.equals(issuedDate, that.issuedDate) &&
Objects.equals(printState, that.printState) &&
Objects.equals(downloadDate, that.downloadDate) &&
Objects.equals(printOutDate, that.printOutDate) &&
Objects.equals(positionDate, that.positionDate) &&
Objects.equals(outWorkshopDate, that.outWorkshopDate) &&
Objects.equals(qualityPeopleName, that.qualityPeopleName) &&
Objects.equals(qualityTestDate, that.qualityTestDate) &&
Objects.equals(exceptionInformation, that.exceptionInformation) &&
Objects.equals(outStorageDate, that.outStorageDate) &&
Objects.equals(inStorageDate, that.inStorageDate) &&
Objects.equals(groupNo, that.groupNo) &&
Objects.equals(validCount, that.validCount) &&
Objects.equals(invalidCount, that.invalidCount) &&
Objects.equals(groupCount, that.groupCount) &&
Objects.equals(cityName, that.cityName) &&
printerId == that.printerId &&
taskStateId == that.taskStateId &&
Objects.equals(isException, that.isException);
}
@Override
public int hashCode() {
return Objects.hash(taskId, cardType, oldCardType, citycode, submitDate, issuedDate, printState, downloadDate, printOutDate, positionDate, outWorkshopDate, qualityPeopleName, qualityTestDate, exceptionInformation,outStorageDate,inStorageDate,printerId,taskStateId,isException,cityName,invalidCount,validCount,groupNo,groupCount);
}
}
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Objects;
/**
* Created by Administrator on 2018/12/19.
*/
@Entity
@Table(name = "COUNTY", schema = "DAHAI")
public class CountyEntity {
private String county_Code;
private long finish_Count;
private long in_Storage_Count;
private long out_Storage_Count;
private String countyName;
private long downloadCount;
private long electric_writeCount;
@Id
@Column(name = "county_Code", nullable = true, length = 20)
public String getCounty_Code() {
return county_Code;
}
public void setCounty_Code(String county_Code) {
this.county_Code = county_Code;
}
@Basic
@Column(name = "finish_Count", nullable = true, precision = 0)
public long getFinish_Count() {
return finish_Count;
}
public void setFinish_Count(long finish_Count) {
this.finish_Count = finish_Count;
}
@Basic
@Column(name = "in_Storage_Count", nullable = true, precision = 0)
public long getIn_Storage_Count() {
return in_Storage_Count;
}
public void setIn_Storage_Count(long in_Storage_Count) {
this.in_Storage_Count = in_Storage_Count;
}
@Basic
@Column(name = "out_Storage_Count", nullable = true, precision = 0)
public long getOut_Storage_Count() {
return out_Storage_Count;
}
public void setOut_Storage_Count(long out_Storage_Count) {
this.out_Storage_Count = out_Storage_Count;
}
@Basic
@Column(name = "countyName", nullable = true, length = 20)
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
@Basic
@Column(name = "downloadCount", nullable = true, precision = 0)
public long getDownloadCount() {
return downloadCount;
}
public void setDownloadCount(long downloadCount) {
this.downloadCount = downloadCount;
}
@Basic
@Column(name = "electric_writeCount", nullable = true, precision = 0)
public long getElectric_writeCount() {
return electric_writeCount;
}
public void setElectric_writeCount(long electric_writeCount) {
this.electric_writeCount = electric_writeCount;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
CountyEntity that = (CountyEntity) o;
return electric_writeCount == that.electric_writeCount &&
downloadCount == that.downloadCount &&
finish_Count == that.finish_Count &&
in_Storage_Count == that.in_Storage_Count &&
out_Storage_Count == that.out_Storage_Count &&
Objects.equals(countyName, that.countyName) &&
Objects.equals(county_Code, that.county_Code);
}
@Override
public int hashCode() {
return Objects.hash(electric_writeCount, downloadCount, finish_Count, in_Storage_Count, out_Storage_Count,countyName,county_Code);
}
}
......@@ -48,6 +48,7 @@ public class CountyListEntity {
public void setSave_Date(Date save_Date) {
this.save_Date = save_Date;
}
@Basic
@Column(name = "COUNTY_CODE", nullable = true, length = 20)
public String getCounty_Code() {
......@@ -57,6 +58,7 @@ public class CountyListEntity {
public void setCounty_Code(String county_Code) {
this.county_Code = county_Code;
}
@Basic
@Column(name = "FINISH_COUNT", nullable = true, precision = 0)
public long getFinish_Count() {
......@@ -66,6 +68,7 @@ public class CountyListEntity {
public void setFinish_Count(long finish_Count) {
this.finish_Count = finish_Count;
}
@Basic
@Column(name = "IN_STORAGE_COUNT", nullable = true, precision = 0)
public long getIn_Storage_Count() {
......@@ -75,6 +78,7 @@ public class CountyListEntity {
public void setIn_Storage_Count(long in_Storage_Count) {
this.in_Storage_Count = in_Storage_Count;
}
@Basic
@Column(name = "OUT_STORAGE_COUNT", nullable = true, precision = 0)
public long getOut_Storage_Count() {
......@@ -103,4 +107,9 @@ public class CountyListEntity {
public int hashCode() {
return Objects.hash(county_List_Id, task_Id, finish_Count, in_Storage_Count, out_Storage_Count,save_Date,county_Code);
}
@Override
public String toString() {
return "COUNTY_LIST [county_List_Id=" + county_List_Id + ", task_Id=" + task_Id + ", finish_Count=" + finish_Count + ", in_Storage_Count=" + in_Storage_Count + ", out_Storage_Count=" + out_Storage_Count + ",save_Date=" + save_Date + "county_Code=" + county_Code +" ]";
}
}
package com.yxproject.start.entity;
import org.springframework.data.annotation.Id;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* Created by Administrator on 2018/12/19.
*/
@Entity
@Table(name = "FIND_FINANCIAL_REPORT_BY_VIEW", schema = "DAHAI", catalog = "")
public class FindFinancialReportByViewEntity {
private String gajg_Mc;
private Long putongzheng;
private Long kuaizheng;
private Long yidiksyou;
private Long yidikspu;
private Long yidiyou;
private Long yidipu;
private Long junrenzheng;
private Long kspu;
private Long ksyou;
private Long youjizheng;
private Long quanguozheng;
@Id
@Column(name = "GAJG_MC", nullable = true, length = 40)
public String getGajgMc() {
return gajg_Mc;
}
public void setGajgMc(String gajgMc) {
this.gajg_Mc = gajgMc;
}
@Basic
@Column(name = "PUTONGZHENG", nullable = true, precision = 0)
public Long getPutongzheng() {
return putongzheng;
}
public void setPutongzheng(Long putongzheng) {
this.putongzheng = putongzheng;
}
@Basic
@Column(name = "KUAIZHENG", nullable = true, precision = 0)
public Long getKuaizheng() {
return kuaizheng;
}
public void setKuaizheng(Long kuaizheng) {
this.kuaizheng = kuaizheng;
}
@Basic
@Column(name = "YIDIKSYOU", nullable = true, precision = 0)
public Long getYidiksyou() {
return yidiksyou;
}
public void setYidiksyou(Long yidiksyou) {
this.yidiksyou = yidiksyou;
}
@Basic
@Column(name = "YIDIKSPU", nullable = true, precision = 0)
public Long getYidikspu() {
return yidikspu;
}
public void setYidikspu(Long yidikspu) {
this.yidikspu = yidikspu;
}
@Basic
@Column(name = "YIDIYOU", nullable = true, precision = 0)
public Long getYidiyou() {
return yidiyou;
}
public void setYidiyou(Long yidiyou) {
this.yidiyou = yidiyou;
}
@Basic
@Column(name = "YIDIPU", nullable = true, precision = 0)
public Long getYidipu() {
return yidipu;
}
public void setYidipu(Long yidipu) {
this.yidipu = yidipu;
}
@Basic
@Column(name = "JUNRENZHENG", nullable = true, precision = 0)
public Long getJunrenzheng() {
return junrenzheng;
}
public void setJunrenzheng(Long junrenzheng) {
this.junrenzheng = junrenzheng;
}
@Basic
@Column(name = "KSPU", nullable = true, precision = 0)
public Long getKspu() {
return kspu;
}
public void setKspu(Long kspu) {
this.kspu = kspu;
}
@Basic
@Column(name = "KSYOU", nullable = true, precision = 0)
public Long getKsyou() {
return ksyou;
}
public void setKsyou(Long ksyou) {
this.ksyou = ksyou;
}
@Basic
@Column(name = "YOUJIZHENG", nullable = true, precision = 0)
public Long getYoujizheng() {
return youjizheng;
}
public void setYoujizheng(Long youjizheng) {
this.youjizheng = youjizheng;
}
@Basic
@Column(name = "QUANGUOZHENG", nullable = true, precision = 0)
public Long getQuanguozheng() {
return quanguozheng;
}
public void setQuanguozheng(Long quanguozheng) {
this.quanguozheng = quanguozheng;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FindFinancialReportByViewEntity that = (FindFinancialReportByViewEntity) o;
if (gajg_Mc != null ? !gajg_Mc.equals(that.gajg_Mc) : that.gajg_Mc != null) return false;
if (putongzheng != null ? !putongzheng.equals(that.putongzheng) : that.putongzheng != null) return false;
if (kuaizheng != null ? !kuaizheng.equals(that.kuaizheng) : that.kuaizheng != null) return false;
if (yidiksyou != null ? !yidiksyou.equals(that.yidiksyou) : that.yidiksyou != null) return false;
if (yidikspu != null ? !yidikspu.equals(that.yidikspu) : that.yidikspu != null) return false;
if (yidiyou != null ? !yidiyou.equals(that.yidiyou) : that.yidiyou != null) return false;
if (yidipu != null ? !yidipu.equals(that.yidipu) : that.yidipu != null) return false;
if (junrenzheng != null ? !junrenzheng.equals(that.junrenzheng) : that.junrenzheng != null) return false;
if (kspu != null ? !kspu.equals(that.kspu) : that.kspu != null) return false;
if (ksyou != null ? !ksyou.equals(that.ksyou) : that.ksyou != null) return false;
if (youjizheng != null ? !youjizheng.equals(that.youjizheng) : that.youjizheng != null) return false;
if (quanguozheng != null ? !quanguozheng.equals(that.quanguozheng) : that.quanguozheng != null) return false;
return true;
}
@Override
public int hashCode() {
int result = gajg_Mc != null ? gajg_Mc.hashCode() : 0;
result = 31 * result + (putongzheng != null ? putongzheng.hashCode() : 0);
result = 31 * result + (kuaizheng != null ? kuaizheng.hashCode() : 0);
result = 31 * result + (yidiksyou != null ? yidiksyou.hashCode() : 0);
result = 31 * result + (yidikspu != null ? yidikspu.hashCode() : 0);
result = 31 * result + (yidiyou != null ? yidiyou.hashCode() : 0);
result = 31 * result + (yidipu != null ? yidipu.hashCode() : 0);
result = 31 * result + (junrenzheng != null ? junrenzheng.hashCode() : 0);
result = 31 * result + (kspu != null ? kspu.hashCode() : 0);
result = 31 * result + (ksyou != null ? ksyou.hashCode() : 0);
result = 31 * result + (youjizheng != null ? youjizheng.hashCode() : 0);
result = 31 * result + (quanguozheng != null ? quanguozheng.hashCode() : 0);
return result;
}
private String id;
@javax.persistence.Id
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
}
package com.yxproject.start.entity;
/**
* Created by Administrator on 2018/12/18.
*/
import javax.persistence.*;
import java.io.Serializable;
import java.sql.Time;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@Entity
@Table(name = "TYPE_LIST", schema = "DAHAI")
public class GroupListEntity implements Serializable {
private long groupNo;
private long validCount;
private long invalidCount;
private long specialCardCount;
@Transient
private List<SpecialCardEntity> specialCardList = new ArrayList <SpecialCardEntity>();
@Id
@Column(name = "groupNo", nullable = false, precision = 0)
public long getGroupNo() {
return groupNo;
}
public void setGroupNo(long groupNo) {
this.groupNo = groupNo;
}
@Basic
@Column(name = "validCount", nullable = true, precision = 0)
public long getValidCount() {
return validCount;
}
public void setValidCount(long validCount) {
this.validCount = validCount;
}
@Basic
@Column(name = "invalidCount", nullable = true, precision = 0)
public long getInvalidCount() {
return invalidCount;
}
public void setInvalidCount(long invalidCount) {
this.invalidCount = invalidCount;
}
@Basic
@Column(name = "specialCardCount", nullable = true, precision = 0)
public long getSpecialCardCount() {
return specialCardCount;
}
public void setSpecialCardCount(long specialCardCount) {
this.specialCardCount = specialCardCount;
}
@Transient
public List <SpecialCardEntity > getSpecialCardList() {
return specialCardList;
}
public void setSpecialCardList( List <SpecialCardEntity> specialCardList ) {
this.specialCardList = specialCardList;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
GroupListEntity that = (GroupListEntity) o;
return groupNo == that.groupNo &&
validCount == that.validCount &&
invalidCount == that.invalidCount &&
specialCardCount == that.specialCardCount;
}
@Override
public int hashCode() {
return Objects.hash(groupNo, validCount,invalidCount,specialCardCount);
}
}
......@@ -11,7 +11,7 @@ import java.util.Objects;
public class GroupNoEntity {
private long task_Id;
private String group_No;
private long vaild_Count;
private long valid_Count;
private long invalid_Count;
private long special_Card_Count;
......@@ -34,13 +34,13 @@ public class GroupNoEntity {
this.group_No = group_No;
}
@Basic
@Column(name = "VAILD_COUNT", nullable = false, precision = 0)
public long getVaild_Count() {
return vaild_Count;
@Column(name = "VALID_COUNT", nullable = false, precision = 0)
public long getValid_Count() {
return valid_Count;
}
public void setVaild_Count(long vaild_Count) {
this.vaild_Count = vaild_Count;
public void setValid_Count(long valid_Count) {
this.valid_Count = valid_Count;
}
@Basic
@Column(name = "INVALID_COUNT", nullable = false, precision = 0)
......@@ -65,7 +65,7 @@ public class GroupNoEntity {
if (this == o) { return true;}
if (o == null || getClass() != o.getClass()){ return false;}
GroupNoEntity that = (GroupNoEntity) o;
return vaild_Count == that.vaild_Count &&
return valid_Count == that.valid_Count &&
invalid_Count == that.invalid_Count &&
special_Card_Count == that.special_Card_Count &&
task_Id == that.task_Id &&
......@@ -74,6 +74,6 @@ public class GroupNoEntity {
@Override
public int hashCode() {
return Objects.hash( group_No, task_Id, vaild_Count, invalid_Count,special_Card_Count);
return Objects.hash( group_No, task_Id, valid_Count, invalid_Count,special_Card_Count);
}
}
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.List;
import java.util.Objects;
/**
* Created by Administrator on 2018/12/19.
*/
@Entity
@Table(name = "RECEIPT_LIST", schema = "DAHAI")
public class ReceiptListEntity {
private String countyName;
private long boxCount;
private long xiaoJi;
private String PTZ;
private String KZ;
private String YDKSY;
private String YDKSP;
private String YDY;
private String YDP;
private String JRZ;
private String KSY;
private String KSP;
private String YJZ;
@Id
@Column(name = "countyName", nullable = false, length = 20)
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
@Basic
@Column(name = "boxCount", nullable = true, precision = 0)
public long getBoxCount() {
return boxCount;
}
public void setBoxCount(long boxCount) {
this.boxCount = boxCount;
}
@Basic
@Column(name = "xiaoJi", nullable = true, precision = 0)
public long getXiaoJi() {
return xiaoJi;
}
public void setXiaoJi(long xiaoJi) {
this.xiaoJi = xiaoJi;
}
@Basic
@Column(name = "PTZ", nullable = true, precision = 0)
public String getPTZ() {
return PTZ;
}
public void setPTZ(String PTZ) {
this.PTZ = PTZ;
}
@Basic
@Column(name = "KZ", nullable = true, precision = 0)
public String getKZ() {
return KZ;
}
public void setKZ(String KZ) {
this.KZ = KZ;
}
@Basic
@Column(name = "YDKSY", nullable = true, precision = 0)
public String getYDKSY() {
return YDKSY;
}
public void setYDKSY(String YDKSY) {
this.YDKSY = YDKSY;
}
@Basic
@Column(name = "YDKSP", nullable = true, precision = 0)
public String getYDKSP() {
return YDKSP;
}
public void setYDKSP(String YDKSP) {
this.YDKSP = YDKSP;
}
@Basic
@Column(name = "YDY", nullable = true, precision = 0)
public String getYDY() {
return YDY;
}
public void setYDY(String YDY) {
this.YDY = YDY;
}
@Basic
@Column(name = "YDP", nullable = true, precision = 0)
public String getYDP() {
return YDP;
}
public void setYDP(String YDP) {
this.YDP = YDP;
}
@Basic
@Column(name = "JRZ", nullable = true, precision = 0)
public String getJRZ() {
return JRZ;
}
public void setJRZ(String JRZ) {
this.JRZ = JRZ;
}
@Basic
@Column(name = "KSY", nullable = true, precision = 0)
public String getKSY() {
return KSY;
}
public void setKSY(String KSY) {
this.KSY = KSY;
}
@Basic
@Column(name = "KSP", nullable = true, precision = 0)
public String getKSP() {
return KSP;
}
public void setKSP(String KSP) {
this.KSP = KSP;
}
@Basic
@Column(name = "YJZ", nullable = true, precision = 0)
public String getYJZ() {
return YJZ;
}
public void setYJZ(String YJZ) {
this.YJZ = YJZ;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ReceiptListEntity that = (ReceiptListEntity) o;
return boxCount == that.boxCount &&
xiaoJi == that.xiaoJi &&
Objects.equals(countyName, that.countyName) &&
Objects.equals(PTZ, that.PTZ) &&
Objects.equals(KZ, that.KZ) &&
Objects.equals(YDKSY, that.YDKSY) &&
Objects.equals(YDKSP, that.YDKSP) &&
Objects.equals(YDY, that.YDY) &&
Objects.equals(YDP, that.YDP) &&
Objects.equals(JRZ, that.JRZ) &&
Objects.equals(KSY, that.KSY) &&
Objects.equals(KSP, that.KSP) &&
Objects.equals(YJZ, that.YJZ);
}
@Override
public int hashCode() {
return Objects.hash(boxCount, xiaoJi, countyName, PTZ, KZ, YDKSY, YDKSP, YDY, YDP, JRZ, KSY, KSP, YJZ);
}
}
......@@ -31,8 +31,6 @@ public class TaskEntity {
private long is_Exception;
private long printer_Id;
@Id
@Column(name = "TASK_ID", nullable = false, precision = 0)
public long getTask_Id() {
......
package com.yxproject.start.entity;
/**
* Created by Administrator on 2018/12/18.
*/
import javax.persistence.*;
import java.sql.Time;
import java.util.Date;
import java.util.Objects;
@Entity
@Table(name = "TYPE_LIST", schema = "DAHAI")
public class TypeListEntity {
private long typeCode;
private long typeCount;
private String typeName;
@Id
@Column(name = "typeCode", nullable = false, precision = 0)
public long getTypeCode() {
return typeCode;
}
public void setTypeCode(long typeCode) {
this.typeCode = typeCode;
}
@Basic
@Column(name = "typeCount", nullable = true, precision = 0)
public long getTypeCount() {
return typeCount;
}
public void setTypeCount(long typeCount) {
this.typeCount = typeCount;
}
@Basic
@Column(name = "typeName", nullable = true, precision = 0)
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
TypeListEntity that = (TypeListEntity) o;
return typeCode == that.typeCode &&
typeCount == that.typeCount &&
Objects.equals(typeName, that.typeName);
}
@Override
public int hashCode() {
return Objects.hash(typeCode, typeCount, typeName);
}
}
......@@ -19,6 +19,7 @@ public class UserInfo implements Serializable {
private String password;
private String salt;
private byte state;
private String workshop;
@ManyToMany(fetch= FetchType.EAGER)
@JoinTable(name = "SysUserRole", joinColumns = { @JoinColumn(name = "userId") }, inverseJoinColumns ={@JoinColumn(name = "roleId") })
private List<SysRole> roleList;
......@@ -78,4 +79,12 @@ public class UserInfo implements Serializable {
public void setRoleList(List<SysRole> roleList) {
this.roleList = roleList;
}
public String getWorkshop() {
return workshop;
}
public void setWorkshop(String workshop) {
this.workshop = workshop;
}
}
\ No newline at end of file
......@@ -2,6 +2,7 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.CardBodyEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
......@@ -14,6 +15,6 @@ import java.util.Map;
public interface CardBodyMapper {
public List <CardBodyEntity> insertCardBody(String cardBodyId);
// public int updateCardBody(CardBodyEntity map);
public List<Map<String,Object>> findCbCountByDealdateViewData();
public List<Map<String,Object>> findCbCountByDealdateViewData(@Param("startTime")String startTime,@Param("endTime")String endTime );
public List<Map<String,Object>> findCbCountByDealdate();
}
\ No newline at end of file
package com.yxproject.start.mapper;
import com.yxproject.start.entity.CountyEntity;
import com.yxproject.start.entity.CountyListEntity;
import com.yxproject.start.entity.ReceiptListEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
......@@ -13,11 +16,10 @@ import java.util.Map;
@Mapper
public interface CountyListMapper {
public List<CountyListEntity> findCountyListByTaskListID(String tasklistID);
public List<CountyListEntity> findCountyListByTaskStateId(String taskStateId);
public List<CountyListEntity> findCountyListByCardType(String cardType);
public int updateBoundCount(CountyListEntity countyListEntity);
public List<Map<String,Object>> getConnectList(String save_Date);
public List<CountyEntity> findCountyList(@Param("taskListId") String taskListId,@Param("taskStateId") String taskStateId,@Param("cardType") String cardType);
public int updateBoundCount(@Param("county_List_Id") String county_List_Id,@Param("out_Storage_Count") String out_Storage_Count,@Param("in_Storage_Count") String in_Storage_Count);
public List<ReceiptListEntity> getReceiptList( @Param("startDate")String startDate , @Param("endDate") String endDate);
public List<CountyListEntity> findStorageCountByTaskListId(String taskListId);
// public List<Map<String, Object>> PrintCountyListXML();
}
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/19.
*/
@Mapper
public interface FindFinancialReportByViewMapper {
public List<Map<String,Object>>findFinancialReportByView(@Param("startTime") String startTime,@Param("endTime")String endTime,@Param("cardType")String cardType,@Param("cityCode")String cityCode);
}
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;
......@@ -10,5 +11,5 @@ import java.util.Map;
*/
@Mapper
public interface FindStationCountMapper {
public List<Map<String,Object>>findStationCountByDealDate(String submitDate);
public List<Map<String,Object>>findStationCountByDealDate(@Param("submitDate") String submitDate,@Param("state") String state);
}
......@@ -3,6 +3,7 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.FindTaskByDealdateViewEntity;
import com.yxproject.start.entity.accu.AccGroupTEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
......@@ -14,5 +15,5 @@ import java.util.Map;
@Mapper
public interface FindTaskByDealdateViewMapper {
public List<Map<String,Object>> findTaskByDealdateViewData();
public List<Map<String,Object>> findTaskByDealdateViewData(@Param("startTime") String startTime,@Param("endTime") String endTime);
}
package com.yxproject.start.mapper;
import com.yxproject.start.entity.GroupListEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......@@ -18,8 +20,7 @@ public interface GroupNoMapper {
public int findGroupNoCountByTaskId(String task_Id);
public List<Map<String,Object>> findSpecialCountyList(String task_Id);
public List<Map<String,Object>> findNormalCountyList(String task_Id);
public List<GroupNoEntity> findGroupNoByTaskListID(String tasklistID);
public List<GroupNoEntity> findGroupNoByTaskStateId(String taskStateId);
public List<GroupNoEntity> findGroupNoByCardType(String cardType);
public List<GroupListEntity> findGroupListByTaskListId( String taskListId);
}
......@@ -2,6 +2,7 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.PoliceStationApplyReasonEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
......@@ -15,7 +16,7 @@ public interface PoliceStationApplyReasonMapper {
public int updatePoliceStationApplyReasonEntity(PoliceStationApplyReasonEntity policeStationApplyReasonEntity);
public List<Map<String,Object>> findNormalApplyReasonByCyclesheetID(String cyclesheetid);
public List<Map<String,Object>> findSpecialApplyReasonByCyclesheetID(String cyclesheetid);
public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String saveDate);
public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate( @Param("startDate") String startDate,@Param("endDate") String endDate);
public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType);
public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String city);
public List<Map<String,Object>> findPoliceStationApplyReasonByCounty(String county);
......
......@@ -14,5 +14,6 @@ public interface SpecialCardMapper {
public void saveSpecialCardEntity(SpecialCardEntity specialCardEntity);
public void updateSpecialCardEntity(SpecialCardEntity specialCardEntity);
public List<SpecialCardEntity> findSpecialCardEntityByGroupNo(String groupNo);
public List <SpecialCardEntity> findSpecialCardList( String groupNo);
}
package com.yxproject.start.mapper;
import com.yxproject.start.entity.TaskEntity;
import com.yxproject.start.entity.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
......@@ -18,7 +19,8 @@ public interface TaskMapper {
public List<TaskEntity> findTaskEntityByState(int state);
public int replaceExceptionInformation(TaskEntity taskEntity);
public int totalNum (int i);
public List<Map<String,Object>> findTypeListByTaskStateId(String taskStateId);
public List<Map<String,Object>> findCityListByTaskStateId(String taskStateId);
public List<Map<String,Object>> findCityListByCardType(String cardType);
public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId);
public List <CityListEntity> findCityList(@Param("taskStateId") String taskStateId,@Param("cardType") String cardType);
public int updateOutStorageDate( @Param("taskListId")String taskId, @Param("inStorageCount")String inStorageCount, @Param("outStorageCount")String outStorageCount);
public int updateInStorageDate(String taskListId,String inStorageCount,String outStorageCount);
}
......@@ -12,7 +12,7 @@ import java.util.Map;
public interface CardBodyService {
public List<CardBodyEntity> insertCardBody(String cardBodyId);
public List<Map<String,Object>> getCbCount();
public List<Map<String,Object>> getCbCount(String startTime,String endTime);
// public int updateCardBody(CardBodyEntity map);
......
package com.yxproject.start.service;
import org.springframework.stereotype.Service;
import com.yxproject.start.entity.*;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/19.
*/
@Service
public interface CityListService {
public List <CityListEntity> findCityList( String taskStateId ,String cardType);
// public List <CityListEntity> findCityListByCardType(String cardType);
}
......@@ -8,10 +8,6 @@ import java.util.Map;
public interface CountyListService {
public List<CountyListEntity> findCountyListByTaskListID(String tasklistID);
public List<CountyListEntity> findCountyListByTaskStateId(String taskStateId);
public int reviseOutBoundCount(CountyListEntity countyListEntity);
public int reviseInBoundCount(CountyListEntity countyListEntity);
public List<Map<String, Object>> getConnectList(String save_Date);
public List<CountyListEntity> findCountyListByCardType(String cardType);
public List<CountyListEntity> findStorageCountByTaskListId(String taskListId);
public int reviseBoundCount(String county_List_Id, String out_Storage_Count, String in_Storage_Count);
}
package com.yxproject.start.service;
import com.yxproject.start.entity.CountyEntity;
import java.util.List;
/**
* Created by Administrator on 2018/12/19.
*/
public interface CountyService {
public List<CountyEntity> findCountyList( String taskListId,String taskStateId,String cardType);
}
package com.yxproject.start.service;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/19.
*/
public interface FindFinancialReportByViewService {
public List<Map<String,Object>> getFinancialReportData(String startTime, String endTime,String cardType,String cityCode);
}
......@@ -7,5 +7,5 @@ import java.util.Map;
* Created by Administrator on 2018/11/29.
*/
public interface FindStationCountService {
public List<Map<String,Object>>getStationCountData(String submitDate);
public List<Map<String,Object>>getStationCountData(String submitDate,String state);
}
......@@ -9,5 +9,5 @@ import java.util.Map;
* Created by Administrator on 2018/11/21.
*/
public interface FindTaskByDealdateViewService {
public List<Map<String,Object>> getAccGroupData();
public List<Map<String,Object>> getAccGroupData(String startTime,String endTime);
}
package com.yxproject.start.service;
import com.yxproject.start.entity.GroupListEntity;
import java.util.List;
/**
* Created by Administrator on 2018/12/18.
*/
public interface GroupListService {
public List<GroupListEntity> findGroupListByTaskListId( String taskListId);
}
package com.yxproject.start.service;
import com.yxproject.start.entity.GroupListEntity;
import com.yxproject.start.entity.GroupNoEntity;
import java.util.List;
......@@ -10,8 +11,6 @@ import java.util.Map;
*/
public interface GroupNoService {
public List<Map<String, Object>> findCountyInfoList(String taskID);
public List<GroupNoEntity> findGroupNoByTaskListID(String tasklistID);
public List<GroupNoEntity> findGroupNoByTaskStateId(String taskStateId);
public List<GroupNoEntity> findGroupNoByCardType(String cardType);
}
......@@ -8,7 +8,7 @@ import java.util.Map;
*/
public interface PoliceStationApplyReasonService {
public int savePoliceStationApplyReasonEntity(String cyclesheetID);
public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String saveDate);
public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String startDate,String endDate);
public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType);
public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String cityCode);
}
package com.yxproject.start.service;
import com.yxproject.start.entity.ReceiptListEntity;
import java.util.List;
/**
* Created by Administrator on 2018/12/19.
*/
public interface ReceiptListService {
public List <ReceiptListEntity> getReceiptList( String startDate, String endDate);
}
......@@ -10,7 +10,7 @@ public interface TaskService {
public List<TaskEntity> findProductionTaskListEntityByID(long id);
public int updateProductionTask(TaskEntity map);
public int updateProductionTask(TaskEntity taskId);
public int addProductionTaskListEntity(TaskEntity taskEntity, List<GroupNoEntity> groupNoEntities);
......@@ -28,15 +28,9 @@ public interface TaskService {
public int addExceptionState(TaskEntity state);
public int updateOutBoundDate(TaskEntity taskEntity, CountyListEntity countyListEntity);
public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount);
public int updateInStorageDate(TaskEntity taskEntity, CountyListEntity countyListEntity );
public List<Map<String,Object>> findTypeListByTaskStateId( String taskStateId);
public List<Map<String,Object>> findCityListByTaskStateId(String taskStateId);
public List<Map<String,Object>> findCityListByCardType(String cardType);
}
package com.yxproject.start.service;
import com.yxproject.start.entity.TypeListEntity;
import java.util.List;
/**
* Created by Administrator on 2018/12/19.
*/
public interface TypeListService {
public List<TypeListEntity> findTypeListByTaskStateId( String taskStateId);
}
......@@ -24,8 +24,8 @@ public class CardBodyServiceImpl implements CardBodyService {
private CardBodyMapper cardBodyMapper;
@Override
public List<Map<String,Object>> getCbCount(){
List<Map<String,Object>> list=cardBodyMapper.findCbCountByDealdateViewData();
public List<Map<String,Object>> getCbCount(String startTime,String endTime){
List<Map<String,Object>> list=cardBodyMapper.findCbCountByDealdateViewData(startTime,endTime);
return list;
}
......
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.CityListEntity;
import com.yxproject.start.mapper.TaskMapper;
import com.yxproject.start.service.CityListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/19.
*/
@Service
public class CityListServiceImpl implements CityListService {
@Autowired
public TaskMapper taskMapper;
@Override
public List <CityListEntity> findCityList( String taskStateId ,String cardType) {
List <CityListEntity> cityList =taskMapper.findCityList(taskStateId, cardType);
return cityList;
}
}
......@@ -6,7 +6,6 @@ import com.yxproject.start.service.CountyListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -20,39 +19,25 @@ public class CountyListServiceImpl implements CountyListService {
@Autowired
public CountyListMapper countyListMapper;
@Override
public List<CountyListEntity> findCountyListByTaskListID(String tasklistid) {
List<CountyListEntity> byTaskListID = countyListMapper.findCountyListByTaskListID(tasklistid);
return byTaskListID;
}
@Override
public List <CountyListEntity> findCountyListByTaskStateId(String taskStateId) {
List<CountyListEntity> TaskStateId = countyListMapper.findCountyListByTaskStateId(taskStateId);
return TaskStateId;
}
@Override
public List <CountyListEntity> findCountyListByCardType( String cardType ) {
List<CountyListEntity> CardType = countyListMapper.findCountyListByCardType(cardType);
return CardType;
}
@Override
public int reviseOutBoundCount(CountyListEntity countyListEntity) {
countyListEntity.setOut_Storage_Count(countyListEntity.getOut_Storage_Count());
return countyListMapper.updateBoundCount(countyListEntity);
}
@Override
public int reviseInBoundCount(CountyListEntity countyListEntity) {
countyListEntity.setIn_Storage_Count(countyListEntity.getIn_Storage_Count());
return countyListMapper.updateBoundCount(countyListEntity);
public int reviseBoundCount(String county_List_Id, String out_Storage_Count, String in_Storage_Count) {
int i= 0;
if(out_Storage_Count.equals(0)&&!in_Storage_Count.equals(0)){
i=countyListMapper.updateBoundCount(county_List_Id, out_Storage_Count, in_Storage_Count);
}
if(!out_Storage_Count.equals(0)&&in_Storage_Count.equals(0)){
i=countyListMapper.updateBoundCount(county_List_Id, out_Storage_Count, in_Storage_Count);
}
if(!out_Storage_Count.equals(0)&&!in_Storage_Count.equals(0)){
i=countyListMapper.updateBoundCount(county_List_Id, out_Storage_Count, in_Storage_Count);
}
return i;
}
@Override
public List<Map<String, Object>> getConnectList(String save_Date) {
return countyListMapper.getConnectList(save_Date);
public List<CountyListEntity> findStorageCountByTaskListId(String taskListId){
return countyListMapper.findStorageCountByTaskListId(taskListId);
}
......
package com.yxproject.start.service.impl;
//import com.yxproject.start.entity.CountyEntity;
import com.yxproject.start.entity.CountyEntity;
import com.yxproject.start.mapper.CountyListMapper;
import com.yxproject.start.service.CountyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* Created by Administrator on 2018/12/19.
*/
@Service
public class CountyServiceImpl implements CountyService {
@Autowired
public CountyListMapper countyListMapper;
@Override
public List <CountyEntity> findCountyList( String taskListId, String taskStateId, String cardType ) {
List<CountyEntity> county = countyListMapper.findCountyList(taskListId,taskStateId,cardType);
return county;
}
}
\ No newline at end of file
package com.yxproject.start.service.impl;
import com.yxproject.start.mapper.FindFinancialReportByViewMapper;
import com.yxproject.start.service.FindFinancialReportByViewService;
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/19.
*/
@Service
public class FindFinancialReportByViewImpl implements FindFinancialReportByViewService {
@Autowired
private FindFinancialReportByViewMapper findFinancialReportByViewMapper;
@Override
public List<Map<String,Object>> getFinancialReportData(String startTime, String endTime,String cardType,String cityCode) {
List<Map<String,Object>> list=findFinancialReportByViewMapper.findFinancialReportByView(startTime, endTime, cardType, cityCode);
return list;
}
}
......@@ -17,8 +17,8 @@ public class FindStationCountServiceImpl implements FindStationCountService {
private FindStationCountMapper findStationCountMapper;
@Override
public List<Map<String,Object>>getStationCountData(String submitDate) {
List<Map<String,Object>> list=findStationCountMapper.findStationCountByDealDate(submitDate);
public List<Map<String,Object>>getStationCountData(String submitDate,String state) {
List<Map<String,Object>> list=findStationCountMapper.findStationCountByDealDate(submitDate,state);
return list;
}
......
......@@ -19,9 +19,9 @@ public class FindTaskByDealdateViewServiceImpl implements FindTaskByDealdateView
@Override
public List<Map<String,Object>> getAccGroupData() {
public List<Map<String,Object>> getAccGroupData(String startTime, String endTime) {
List<Map<String,Object>> list = findTaskByDealdateViewMapper.findTaskByDealdateViewData();
List<Map<String,Object>> list = findTaskByDealdateViewMapper.findTaskByDealdateViewData(startTime, endTime);
return list;
}
}
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.GroupListEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.mapper.GroupNoMapper;
import com.yxproject.start.mapper.SpecialCardMapper;
import com.yxproject.start.service.GroupListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Created by Administrator on 2018/12/18.
*/
@Service
public class GroupListServiceImpl implements GroupListService {
@Autowired
public GroupNoMapper groupNoMapper;
@Autowired
public SpecialCardMapper specialCardMapper;
@Override
public List<GroupListEntity> findGroupListByTaskListId( String taskListId) {
List <GroupListEntity> groupList=groupNoMapper.findGroupListByTaskListId(taskListId);
for ( GroupListEntity groupListEntity:groupList) {
List <SpecialCardEntity> specialCardEntities=specialCardMapper.findSpecialCardList(groupListEntity.getGroupNo()+"");
groupListEntity.setSpecialCardList(specialCardEntities);
}
return groupList;
}
}
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.GroupListEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.mapper.GroupNoMapper;
import com.yxproject.start.service.GroupNoService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -30,22 +32,6 @@ public class GroupNoServiceImpl implements GroupNoService {
return list;
}
@Override
public List<GroupNoEntity> findGroupNoByTaskListID( String tasklistid) {
List<GroupNoEntity> byTaskListID = groupNoMapper.findGroupNoByTaskListID(tasklistid);
return byTaskListID;
}
@Override
public List <GroupNoEntity> findGroupNoByTaskStateId(String taskStateId) {
List<GroupNoEntity> TaskStateId = groupNoMapper.findGroupNoByTaskStateId(taskStateId);
return TaskStateId;
}
@Override
public List <GroupNoEntity> findGroupNoByCardType( String cardType ) {
List<GroupNoEntity> CardType = groupNoMapper.findGroupNoByCardType(cardType);
return CardType;
}
}
......@@ -54,8 +54,8 @@ public class PoliceStationApplyReasonServiceImpl implements PoliceStationApplyRe
* @return
*/
@Override
public List <Map <String, Object>> findPoliceStationApplyReasonBySaveDate( String saveDate ) {
List <Map <String, Object>> SaveData =policeStationApplyReasonMapper.findPoliceStationApplyReasonBySaveDate(saveDate);
public List <Map <String, Object>> findPoliceStationApplyReasonBySaveDate(String startDate,String endDate) {
List <Map <String, Object>> SaveData =policeStationApplyReasonMapper.findPoliceStationApplyReasonBySaveDate(startDate,endDate);
return SaveData;
}
......
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.ReceiptListEntity;
import com.yxproject.start.mapper.CountyListMapper;
import com.yxproject.start.service.ReceiptListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Created by Administrator on 2018/12/19.
*/
@Service
public class ReceiptListServiceImpl implements ReceiptListService {
@Autowired
public CountyListMapper countyListMapper;
@Override
public List <ReceiptListEntity> getReceiptList( String startDate, String endDate ) {
return countyListMapper.getReceiptList(startDate,endDate);
}
}
......@@ -62,7 +62,7 @@ public class TaskServiceImpl implements TaskService {
* @return
*/
@Override
public int updateProductionTask(TaskEntity taskEntity) {
public int updateProductionTask( TaskEntity taskEntity ) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
//todo 状态更新时间
Long state = taskEntity.getTask_State_Id();
......@@ -209,7 +209,7 @@ public class TaskServiceImpl implements TaskService {
groupNoEntity1.setTask_Id(taskEntity.getTask_Id());
groupNoEntity1.setGroup_No(group_no.toString());
groupNoEntity1.setInvalid_Count(Long.valueOf(invalid_count.toString()));
groupNoEntity1.setVaild_Count(Long.valueOf(valid_count.toString()));
groupNoEntity1.setValid_Count(Long.valueOf(valid_count.toString()));
groupNoEntity1.setSpecial_Card_Count((long) 1);
groupNoMapper.insertGroupNoEntity(groupNoEntity1);
......@@ -433,79 +433,25 @@ public class TaskServiceImpl implements TaskService {
return i;
}
/**
* 更新出库时间
* 更新出库时间
* @param
* @param countyListEntity
* @return
*/
@Override
public int updateOutBoundDate(TaskEntity taskEntity, CountyListEntity countyListEntity) {
public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount ) {
int i=0;
i= taskMapper.totalNum(i);
if (countyListEntity.getOut_Storage_Count()==i){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
taskEntity.setOut_Storage_Date(new Date());
return taskMapper.updateTaskEntity(taskEntity);
}
else{
return 0;
}
}
/**
* 更新入库时间
* @param
* @return
*/
@Override
public int updateInStorageDate(TaskEntity taskEntity, CountyListEntity countyListEntity ) {
int i=0;
i= taskMapper.totalNum(i);
if (countyListEntity.getIn_Storage_Count()==i){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
taskEntity.setIn_Storage_Date(new Date());
return taskMapper.updateTaskEntity(taskEntity);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
if (inStorageCount.equals(i)){
return taskMapper.updateInStorageDate(taskListId,inStorageCount,outStorageCount);
}
else{
return 0;
if(outStorageCount.equals(i)){
return taskMapper.updateOutStorageDate(taskListId,inStorageCount,outStorageCount);
}
return 0;
}
/**
* 通过状态查找TypeList
* @param
* @return
*/
@Override
public List <Map <String, Object>> findTypeListByTaskStateId( String taskStateId ) {
List <Map <String, Object>> TaskStateId =taskMapper.findTypeListByTaskStateId(taskStateId);
return TaskStateId;
}
/**
* 通过状态查找CityList
* @param
* @return
*/
@Override
public List <Map <String, Object>> findCityListByTaskStateId( String taskStateId ) {
List <Map <String, Object>> TaskStateId =taskMapper.findCityListByTaskStateId(taskStateId);
return TaskStateId;
}
/**
* 通过制证类型查找CityList
* @param
* @return
*/
@Override
public List <Map <String, Object>> findCityListByCardType( String cardType ) {
List <Map <String, Object>> CardType =taskMapper.findCityListByCardType(cardType);
return CardType;
}
/**
* 测试查询
......
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.TypeListEntity;
import com.yxproject.start.mapper.TaskMapper;
import com.yxproject.start.service.TypeListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Created by Administrator on 2018/12/19.
*/
@Service
public class TypeListServiceImpl implements TypeListService {
@Autowired
public TaskMapper taskMapper;
/**
* 通过状态查找TypeList
* @param
* @return
*/
@Override
public List<TypeListEntity> findTypeListByTaskStateId( String taskStateId ) {
List<TypeListEntity> typeListEntity = taskMapper.findTypeListByTaskStateId(taskStateId);
return typeListEntity;
}
}
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
......@@ -28,9 +28,9 @@
</update>
<select id="findCbCountByDealdateViewData" resultType="java.util.HashMap">
select * from FINDCBCOUNTBYDEALDATE_VIEW
</select>
<select id="findCbCountByDealdateViewData" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM FINDCBCOUNTBYDEALDATE_VIEW WHERE FIND_CBCOUNT_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime} AND FIND_CBCOUNT_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime}
</select>
<select id="findCbCountByDealdate" resultType="java.util.HashMap">
WITH
......
......@@ -14,24 +14,63 @@
<!--<insert id="addPermissionByMap" parameterType="com.yxproject.start.entity.SysPermission">-->
<!--Insert into DAHAI.SYS_PERMISSION (ID,AVAILABLE,NAME,PARENT_ID,PARENT_IDS,PERMISSION,RESOURCE_TYPE,URL) values (PERMISSION_seq.nextval,0,#{name},#{parentId},#{parentIds},#{permission},#{resourceType},#{url})-->
<!--</insert>-->
<select id="findCountyListByTaskListID" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">
SELECT * FROM COUNTY_LIST where TASK_ID=#{task_Id}
<select id="findCountyList" resultType="com.yxproject.start.entity.CountyEntity" parameterType="String">
SELECT COUNTY_LIST.COUNTY_CODE,FINISH_COUNT,IN_STORAGE_COUNT,OUT_STORAGE_COUNT,COUNTY_DIC.COUNTYNAME FROM COUNTY_LIST
LEFT JOIN TASK ON COUNTY_LIST.TASK_ID = TASK.TASK_ID
LEFT JOIN COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE
WHERE TASK.TASK_ID=#{taskListId} AND TASK.CARD_TYPE=#{cardType} AND TASK.TASK_STATE_ID=#{taskStateId}
</select>
<select id="findCountyListByTaskStateId" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">
SELECT * FROM COUNTY_LIST left join TASK on COUNTY_LIST.TASK_ID = TASK.TASK_ID where TASK_STATE_ID=#{task_State_Id}
</select>
<select id="findCountyListByCardType" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">
SELECT * FROM COUNTY_LIST left join TASK on COUNTY_LIST.TASK_ID = TASK.TASK_ID left join CARD_TYPE_DIC on TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID where CARD_TYPE_DIC.CARD_TYPE=#{card_Type}
</select>
<update id="updateBoundCount" parameterType="com.yxproject.start.entity.CountyListEntity" >
<update id="updateBoundCount" parameterType="String" >
update COUNTY_LIST SET OUT_STORAGE_COUNT =#{out_Storage_Count},IN_STORAGE_COUNT =#{in_Storage_Count} where COUNTY_LIST_ID =#{county_List_Id}
</update>
<select id="getConnectList" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">
SELECT OUT_STORAGE_COUNT FROM COUNTY_LIST
<select id="getReceiptList" resultType="com.yxproject.start.entity.ReceiptListEntity" parameterType="String">
WITH
t_county
AS(
SELECT COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,SUM(COUNTY_LIST.OUT_STORAGE_COUNT) AS TYPE_COUNT,floor(SUM(COUNTY_LIST.OUT_STORAGE_COUNT)/250)+1 AS BOX_COUNT,SAVE_DATE
FROM (SELECT CARD_TYPE_ID,CARD_TYPE FROM CARD_TYPE_DIC GROUP BY CARD_TYPE_ID,CARD_TYPE ) CARD_TYPE_DIC
LEFT JOIN (SELECT TASK_ID,CARD_TYPE FROM TASK GROUP BY TASK_ID,CARD_TYPE) TASK ON CARD_TYPE_DIC.CARD_TYPE_ID = TASK.CARD_TYPE
LEFT JOIN (SELECT COUNTY_CODE,TASK_ID,OUT_STORAGE_COUNT,SAVE_DATE FROM COUNTY_LIST GROUP BY COUNTY_CODE,TASK_ID,OUT_STORAGE_COUNT,SAVE_DATE) COUNTY_LIST ON COUNTY_LIST.TASK_ID = TASK.TASK_ID
LEFT JOIN (SELECT COUNTY_CODE,COUNTYNAME FROM COUNTY_DIC GROUP BY COUNTY_CODE,COUNTYNAME ) COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE
GROUP BY COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,SAVE_DATE
),
t_total_count
AS(
SELECT * FROM (SELECT COUNTYNAME,CARD_TYPE,TYPE_COUNT,BOX_COUNT,SAVE_DATE FROM t_county) PIVOT(SUM(TYPE_COUNT) FOR CARD_TYPE IN ('普通证' AS PTZ,'快证' AS KZ,'省内异地快速通道邮' AS YDKSY,'省内异地快速通道
普' AS YDKSP,'省内异地邮' AS YDY,'省内异地普' AS YDP,'军人证' AS JRZ,'快速通道普' AS KSP,'快速通道邮' AS KSY,'邮寄证' AS YJZ))
),
county_xiaoji
AS(
SELECT COUNTYNAME,SUM(TYPE_COUNT) AS XIAOJI FROM t_county GROUP BY COUNTYNAME
)
SELECT DECODE(GROUPING(t_total_count.COUNTYNAME),1,'总计',t_total_count.COUNTYNAME)COUNTYNAME,
SUM(PTZ)PTZ,
SUM(KZ)KZ,
SUM(YDKSY)YDKSY,
SUM(YDKSP)YDKSP,
SUM(YDY)YDY,
SUM(YDP)YDP,
SUM(JRZ)JRZ,
SUM(KSP)KSP,
SUM(KSY)KSY,
SUM(YJZ)YJZ,
SUM(XIAOJI)XIAOJI,
SUM(BOX_COUNT)BOX_COUNT
FROM t_total_count,county_xiaoji WHERE t_total_count.COUNTYNAME=county_xiaoji.COUNTYNAME AND substr(TO_CHAR(SAVE_DATE,'yyyyMMdd'),0,8) >= #{startDate} AND #{endDate} >= substr(TO_CHAR(SAVE_DATE,'yyyyMMdd'),0,8)
GROUP BY ROLLUP(t_total_count.COUNTYNAME)
</select>
<select id="findStorageCountByTaskListId" resultType="java.util.HashMap" parameterType="String">
SELECT TASK_ID,FINISH_COUNT,IN_STORAGE_COUNT,OUT_STORAGE_COUNT,CITY_DIC.CITYNAME||' '||COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE FROM COUNTY_LIST
LEFT JOIN COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE
LEFT JOIN CITY_DIC ON substr(CITY_DIC.CITYCODE,1,4) = substr(COUNTY_LIST.COUNTY_CODE,1,4)
WHERE TASK_ID=#{task_Id}
</select>
<!--<select id="PrintCountyListXML" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">-->
<!--SELECT * FROM COUNTY_LIST-->
<!--</select>-->
</mapper>
<?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.FindFinancialReportByViewMapper">
<resultMap id="FindFinancialReportByViewMapper" type="com.yxproject.start.entity.FindFinancialReportByViewEntity">
<id column="GAJG_MC" property="gajg_Mc" jdbcType="VARCHAR"/>
<result column="PUTONGZHENG" property="putongzheng" jdbcType="NUMERIC"/>
<result column="KUAIZHENG" property="kuaizheng" jdbcType="NUMERIC"/>
<result column="YIDIKSYOU" property="yidiksyou" jdbcType="NUMERIC"/>
<result column="YIDIKSPU" property="yidikspu" jdbcType="NUMERIC"/>
<result column="YIDIYOU" property="yidiyou" jdbcType="NUMERIC"/>
<result column="YIDIPU" property="yidipu" jdbcType="NUMERIC"/>
<result column="JUNRENZHENG" property="junrenzheng" jdbcType="NUMERIC"/>
<result column="KSPU" property="kspu" jdbcType="NUMERIC"/>
<result column="KSYOU" property="ksyou" jdbcType="NUMERIC"/>
<result column="YOUJIZHENG" property="youjizheng" jdbcType="NUMERIC"/>
<result column="QUANGUOZHENG" property="quanguozheng" jdbcType="NUMERIC"/>
</resultMap>
<select id="findFinancialReportByView" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM FIND_FINANCIAL_REPORT_BY_VIEW WHERE FIND_FINANCIAL_REPORT_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime} AND FIND_FINANCIAL_REPORT_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime} AND FIND_FINANCIAL_REPORT_LIST.SET_CARDTYPE_PARAM(#{cardType})=#{cardType} AND FIND_FINANCIAL_REPORT_LIST.SET_CITYCODE_PARAM(SUBSTR(#{cityCode},1,4))=SUBSTR(#{cityCode},1,4) AND FIND_FINANCIAL_REPORT_LIST.SET_COUNTYCODE_PARAM(SUBSTR(#{cityCode},1,6))=SUBSTR(#{cityCode},1,6) AND FIND_FINANCIAL_REPORT_LIST.SET_GAJGDM_PARAM(SUBSTR(#{cityCode},1,8))=SUBSTR(#{cityCode},1,8)
</select>
</mapper>
\ No newline at end of file
......@@ -15,8 +15,8 @@
<result column="APPLY_COUNT" property="applyCount" jdbcType="NUMERIC"/>
</resultMap>
<select id="findStationCountByDealDate" resultType="java.util.HashMap">
SELECT * FROM FIND_STATION_COUNT_BY_VIEW WHERE SUBMIT_DATE=#{submit_Date}
<select id="findStationCountByDealDate" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM FIND_STATE_COUNT_VIEW WHERE FIND_STATE_COUNT_LIST.SET_SUBMITDATE_PARAM(#{submitDate})=#{submitDate} AND FIND_STATE_COUNT_LIST.SET_STATE_PARAM(#{state})=#{state}
</select>
</mapper>
\ No newline at end of file
......@@ -12,8 +12,8 @@
<result column="IMPORT_TIME" property="importTime" jdbcType="VARCHAR"/>
</resultMap>
<select id="findTaskByDealdateViewData" resultType="java.util.HashMap">
select * from FIND_TASK_BY_DEALDATE_VIEW
<select id="findTaskByDealdateViewData" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM FIND_TASK_BY_DEALDATE_VIEW WHERE FIND_TASK_BY_DEALDATE_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime} AND FIND_TASK_BY_DEALDATE_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime}
</select>
......
......@@ -4,7 +4,7 @@
<resultMap id="GroupNoMapper" type="com.yxproject.start.entity.GroupNoEntity">
<id column="GROUP_NO" property="group_No" jdbcType="VARCHAR"/>
<result column="TASK_ID" property="task_Id" jdbcType="NUMERIC"/>
<result column="VAILD_COUNT" property="vaild_Count" jdbcType="NUMERIC"/>
<result column="VALID_COUNT" property="valid_Count" jdbcType="NUMERIC"/>
<result column="INVALID_COUNT" property="invalid_Count" jdbcType="NUMERIC"/>
<result column="SPECIAL_CARD_COUNT" property="special_Card_Count" jdbcType="NUMERIC"/>
</resultMap>
......@@ -14,8 +14,8 @@
</select>
<insert id="insertGroupNoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity">
Insert into GROUP_NO (GROUP_NO,task_Id,VAILD_COUNT,INVALID_COUNT,special_Card_Count) values
(#{group_No},#{task_Id},#{vaild_Count},#{invalid_Count},#{special_Card_Count})
Insert into GROUP_NO (GROUP_NO,task_Id,VALID_COUNT,INVALID_COUNT,special_Card_Count) values
(#{group_No},#{task_Id},#{valid_Count},#{invalid_Count},#{special_Card_Count})
</insert>
<select id="findGroupNoEntityByAcceptNo" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
......@@ -25,7 +25,7 @@
<update id="updateGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity">
update GROUP_NO set group_No =#{group_No}
<if test="task_Id">,task_Id =#{task_Id}</if>
<if test="vaild_Count">,vaild_Count =#{vaild_Count}</if>
<if test="valid_Count">,valid_Count =#{valid_Count}</if>
<if test="invalid_Count">,invalid_Count =#{invalid_Count}</if>
<if test="special_Card_Count">,special_Card_Count =#{special_Card_Count}</if>
where group_No=#{group_No}
......@@ -43,16 +43,14 @@
SELECT * FROM TABLE(find_normal_county_list.GET_county_infos(#{task_Id}))
</select>
<select id="findGroupNoByTaskListID" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
SELECT * FROM GROUP_NO left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID where TASK_ID=#{task_Id}
<select id="findGroupListByTaskListId" resultType="com.yxproject.start.entity.GroupListEntity" parameterType="String">
select GROUP_NO as groupNo,sum(VALID_COUNT) as validCount,sum(INVALID_COUNT) as invalidCount,sum(SPECIAL_CARD_COUNT) as specialCardCount from (select sum(VALID_COUNT),sum(INVALID_COUNT),sum(SPECIAL_CARD_COUNT),COUNT(GROUP_NO),TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT from GROUP_NO group by TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT ) GROUP_NO
left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID
where TASK.TASK_ID=#{task_Id}
group by GROUP_NO
</select>
<select id="findGroupNoByTaskStateId" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
SELECT * FROM GROUP_NO left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID where TASK_STATE_ID=#{task_State_Id}
</select>
<select id="findGroupNoByCardType" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
SELECT * FROM GROUP_NO left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID where CARD_TYPE=#{card_type}
</select>
</mapper>
\ No newline at end of file
......@@ -33,24 +33,37 @@
SELECT * FROM TABLE(find_special_apply_reason_list.get_apply_reason_list(#{cyclesheetid}))
</select>
<select id="findPoliceStationApplyReasonBySaveDate" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
SELECT * FROM POLICE_STATION_APPLY_REASON where SAVE_DATE=#{save_Data}
<select id="findPoliceStationApplyReasonBySaveDate" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM POLICE_STATION_APPLY_REASON WHERE substr(TO_CHAR(SAVE_DATE,'yyyyMMdd'),0,8) >= #{startDate}
AND #{endDate} >= substr(TO_CHAR(SAVE_DATE,'yyyyMMdd'),0,8)
</select>
<select id="findPoliceStationApplyReasonByCardType" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
<select id="findPoliceStationApplyReasonByCardType" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM POLICE_STATION_APPLY_REASON left join TASK on POLICE_STATION_APPLY_REASON.TASK_ID = TASK.TASK_ID where CARD_TYPE=#{card_Type}
</select>
<select id="findPoliceStationApplyReasonByCity" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,5) left join CITY_DIC on CITY_DIC.CITYCODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,3) where CITYCODE=#{citycode}
<select id="findPoliceStationApplyReasonByCity" resultType="java.util.HashMap" parameterType="String">
select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON
left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE
left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,1,6)
left join CITY_DIC on substr(CITY_DIC.CITYCODE,1,4) = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,1,4)
where substr(CITY_DIC.CITYCODE,1,4)=#{citycode}
</select>
<select id="findPoliceStationApplyReasonByCounty" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,5) left join CITY_DIC on CITY_DIC.CITYCODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,3) where COUNTY_CODE=#{county_Code}
<select id="findPoliceStationApplyReasonByCounty" resultType="java.util.HashMap" parameterType="String">
select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON
left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE
left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,1,6)
left join CITY_DIC on substr(CITY_DIC.CITYCODE,1,4) = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,1,4)
where COUNTY_CODE=#{county_Code}
</select>
<select id="findPoliceStationApplyReasonByPoliceStation" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,5) left join CITY_DIC on CITY_DIC.CITYCODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,3) where POLICE_STATION_CODE=#{police_Station_Code}
<select id="findPoliceStationApplyReasonByPoliceStation" resultType="java.util.HashMap" parameterType="String">
select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON
left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE
left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,1,6)
left join CITY_DIC on substr(CITY_DIC.CITYCODE,1,4) = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,1,4)
where POLICE_STATION_CODE=#{police_Station_Code}
</select>
</mapper>
\ No newline at end of file
......@@ -30,4 +30,8 @@
select * from SPECIAL_CARD where GROUP_NO =#{group_No}
</select>
<select id="findSpecialCardList" resultType="com.yxproject.start.entity.SpecialCardEntity" parameterType="String">
SELECT * FROM SPECIAL_CARD LEFT JOIN GROUP_NO ON GROUP_NO.GROUP_NO = SPECIAL_CARD.GROUP_NO WHERE GROUP_NO.GROUP_NO=#{group_No}
</select>
</mapper>
\ No newline at end of file
......@@ -69,67 +69,34 @@
</select>
<update id="replaceExceptionInformation" parameterType="com.yxproject.start.entity.TaskEntity" >
update TASK SET exception_Information = NULL,IS_EXCEPTION =#{is_Exception} where TASK_ID =#{task_Id}
update TASK set exception_Information = NULL and IS_EXCEPTION =#{is_Exception} where TASK_ID =#{task_Id}
</update>
<select id="totalNum" resultType="Integer">
select nvl(SUM(VAILD_COUNT),0) FROM GROUP_NO where TASK_ID =#{task_Id}
select nvl(SUM(VALID_COUNT),0) FROM GROUP_NO
</select>
<select id="findTypeListByTaskStateId" resultType="java.util.HashMap">
WITH
t_Type_List
AS(
select CARD_TYPE_ID,CARD_TYPE_DIC.CARD_TYPE from TASK left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = TASK.CARD_TYPE where TASK_STATE_ID=#{task_State_Id}
),
t_Count_Card_Type
AS(
select CARD_TYPE_ID, count(CARD_TYPE_ID) qty from t_Type_List group by CARD_TYPE_ID
)
SELECT t1.CARD_TYPE_ID,t1.CARD_TYPE ,nvl(t2.qty,0) FROM t_Type_List t1 left join t_Count_Card_Type t2 on t1.CARD_TYPE_ID = t2.CARD_TYPE_ID
<update id="updateOutStorageDate" parameterType="String">
update TASK SET OUT_STORAGE_DATE = SYSDATE where TASK_ID =#{task_Id}
</update>
</select>
<update id="updateInStorageDate" parameterType="String">
update TASK SET IN_STORAGE_DATE = SYSDATE where TASK_ID =#{task_Id}
</update>
<select id="findCityListByCardType" resultType="java.util.HashMap">
WITH
t_City_List
AS(
select GROUP_NO.GROUP_NO,CITY_DIC.CITYNAME,GROUP_NO.VAILD_COUNT,GROUP_NO.INVALID_COUNT,TASK.CITYCODE from TASK left join GROUP_NO on GROUP_NO.TASK_ID = TASK.TASK_ID left join CITY_DIC on TASK.CITYCODE=CITY_DIC.CITYCODE where CARD_TYPE=#{card_Type}
),
t_Count_VAILD_COUNT
AS(
select VAILD_COUNT, count(VAILD_COUNT) qty1 from t_City_List group by VAILD_COUNT
),
t_Count_INVALID_COUNT
AS(
select INVALID_COUNT, count(INVALID_COUNT) qty2 from t_City_List group by INVALID_COUNT
),
t_Sum_VAILD_COUNT
AS(
select VAILD_COUNT, SUM(VAILD_COUNT) qty3 from t_City_List group by VAILD_COUNT
)
SELECT t1.GROUP_NO,t1.CITYNAME,t1.CITYCODE,t1.VAILD_COUNT,t1.INVALID_COUNT,nvl(t2.qty1,0),nvl(t3.qty2,0),nvl(t4.qty3,0) FROM t_City_List t1 left join t_Count_VAILD_COUNT t2 on t1.VAILD_COUNT = t2.VAILD_COUNT left join t_Count_INVALID_COUNT t3 on t1.INVALID_COUNT=t3.INVALID_COUNT left join t_Sum_VAILD_COUNT t4 on t1.VAILD_COUNT=t4.VAILD_COUNT
<select id="findTypeListByTaskStateId" resultType="com.yxproject.start.entity.TypeListEntity" parameterType="String">
SELECT TASK.CARD_TYPE AS typeCode,count(CARD_TYPE_ID) AS typeCount,CARD_TYPE_DIC.CARD_TYPE AS typeName FROM TASK
left join (SELECT CARD_TYPE,count(CARD_TYPE_ID),CARD_TYPE_ID FROM CARD_TYPE_DIC GROUP BY CARD_TYPE,CARD_TYPE_ID) CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = TASK.CARD_TYPE
where TASK_STATE_ID=#{task_State_Id}
GROUP BY CARD_TYPE_DIC.CARD_TYPE,TASK.CARD_TYPE
</select>
<select id="findCityListByTaskStateId" resultType="java.util.HashMap">
WITH
t_City_List
AS(
select GROUP_NO.GROUP_NO,CITY_DIC.CITYNAME,GROUP_NO.VAILD_COUNT,GROUP_NO.INVALID_COUNT,TASK.CITYCODE from TASK left join GROUP_NO on GROUP_NO.TASK_ID = TASK.TASK_ID left join CITY_DIC on TASK.CITYCODE=CITY_DIC.CITYCODE where TASK_STATE_ID=#{task_State_Id}
),
t_Count_VAILD_COUNT
AS(
select VAILD_COUNT, count(VAILD_COUNT) qty1 from t_City_List group by VAILD_COUNT
),
t_Count_INVALID_COUNT
AS(
select INVALID_COUNT, count(INVALID_COUNT) qty2 from t_City_List group by INVALID_COUNT
),
t_Sum_VAILD_COUNT
AS(
select VAILD_COUNT, SUM(VAILD_COUNT) qty3 from t_City_List group by VAILD_COUNT
)
SELECT t1.GROUP_NO,t1.CITYNAME,t1.CITYCODE,t1.VAILD_COUNT,t1.INVALID_COUNT,nvl(t2.qty1,0),nvl(t3.qty2,0),nvl(t4.qty3,0) FROM t_City_List t1 left join t_Count_VAILD_COUNT t2 on t1.VAILD_COUNT = t2.VAILD_COUNT left join t_Count_INVALID_COUNT t3 on t1.INVALID_COUNT=t3.INVALID_COUNT left join t_Sum_VAILD_COUNT t4 on t1.VAILD_COUNT=t4.VAILD_COUNT
<select id="findCityList" resultType="com.yxproject.start.entity.CityListEntity">
SELECT CARD_TYPE,TASK.CITYCODE,CITYNAME AS cityName,sum(VALID_COUNT) AS validCount,sum(INVALID_COUNT) AS invalidCount,COUNT(GROUP_NO) AS groupCount,GROUP_NO AS groupNo,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID from (select sum(VALID_COUNT),sum(INVALID_COUNT),COUNT(GROUP_NO),TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT from GROUP_NO group by TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT ) GROUP_NO
left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID
left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on CITY_DIC.CITYCODE = TASK.CITYCODE
where CARD_TYPE=#{cardType} and TASK_STATE_ID = #{taskStateId}
GROUP BY CARD_TYPE,TASK.CITYCODE,CITYNAME,GROUP_NO,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID
</select>
</mapper>
\ No newline at end of file
<div class="ui-dialog-title">
特殊证件列表
</div>
<div class="ui-dialog-content">
<table>
<tr>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>受理号</th>
<th>类型</th>
</thead>
<tbody>
<tr ng-repeat="specialCard in specialCardList">
<td>{{specialCard.acceptNo}}</td>
<td ng-if="specialCard.specialType==0">余证</td>
<td ng-if="specialCard.specialType==1">快证</td>
<td ng-if="specialCard.specialType==2">退证</td>
</tr>
</tbody>
</table>
</td>
</tr>
</table>
</div>
<div>
<table class="table table-hover table-responsive" id="enterStoreTr">
<thead>
<th><input id="checkCkAllCountyBox" value="0" style="zoom:180%;vertical-align: bottom;" type="checkbox" ng-click="getAllCkCountyBox()"/>全选</th>
<th>循环单编号</th>
<th>区县</th>
<th>证件数量</th>
<th>已入库数量</th>
<th>入库数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="county in countyList | orderBy:countyCode">
<td><input type="checkbox" class="checkCkCountyBox" value="{{county.cycleSheetId}}_{{county.countyCode}}_0_{{county.electricSum- county.numberOfPutInStorage}}_0_0" style="zoom:180%;"/></td>
<td>{{county.cycleSheetId}}</td>
<td>{{county.countyName}}</td>
<td >{{county.electricSum}}</td>
<!--<td ng-if="county.numberOfPutInStorage==0">-->
<!--{{county.electricSum}}<i style="padding-left:15px;cursor: pointer;" class="glyphicon glyphicon-pencil" ng-click="updateEnterSum(county.countyCode)"></i>-->
<!--</td> -->
<!--<td ng-if="county.numberOfPutInStorage!=0">-->
<!--{{county.numberOfPutInStorage}}<i style="padding-left:15px;cursor: pointer;" class="glyphicon glyphicon-pencil" ng-click="updateEnterSum(county.countyCode)"></i>-->
<!--</td>-->
<td>
{{county.numberOfPutInStorage}}
</td>
<td >{{county.electricSum - county.numberOfPutInStorage}}<i style="padding-left:15px;cursor: pointer;" class="glyphicon glyphicon-pencil" ng-click="updateEnterSum(county.countyCode)"></i></td>
<td ng-show="showSum == county.countyCode">
<input type="text" ng-model="enterStoreSum">
<i style="cursor: pointer;" class="glyphicon glyphicon-ok" ng-click="saveEnterStoreSum(enterStoreSum,0,county.cycleSheetId,county.countyCode)">修改</i>
<i style="cursor: pointer;" class="glyphicon glyphicon-remove" ng-click="cancelEnterStoreSum()">取消</i>
</td>
</tr>
</tbody>
</table>
<div style="text-align: right;">
<div style="color: red;padding: 5px;" ng-if="showAlertCk">{{alertCk}}</div>
<div style="color: red;padding: 5px;" ng-if="showUpdateSuccessMsg">{{updateSuccessMsg}}</div>
<button class="btn btn-info" ng-click="saveTheseCountySum()">更新</button>
<button class="btn btn-info" ng-click="closeThisDialog()">关闭</button>
</div>
</div>
\ No newline at end of file
<div>
<table class="table table-hover table-responsive" id="enterStoreTr">
<thead>
<th><input id="checkCkAllCountyBox" value="0" style="zoom:180%;vertical-align: bottom;" type="checkbox"
ng-click="getAllCkCountyBox()"/>全选
</th>
<th>循环单编号</th>
<th>区县</th>
<th>证件数量</th>
<th>已出库数量</th>
<th>出库数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="county in countyList | orderBy:countyCode">
<td><input type="checkbox" class="checkCkCountyBox"
value="{{county.cycleSheetId}}_{{county.countyCode}}_0_0_{{county.electricSum - county.numberOfOutbound}}_0"
style="zoom:180%;"/></td>
<td>{{county.cycleSheetId}}</td>
<td>{{county.countyName}}</td>
<td>{{county.electricSum}}</td>
<td>
{{county.numberOfOutbound}}
</td>
<td>{{county.electricSum - county.numberOfOutbound}}<i style="padding-left:15px;cursor: pointer;"
class="glyphicon glyphicon-pencil"
ng-click="updateLeaveSum(county.countyCode)"></i>
</td>
<td ng-show="showSum == county.countyCode">
<input type="text" ng-model="leaveStoreSum">
<i style="cursor: pointer;" class="glyphicon glyphicon-ok"
ng-click="saveLeaveStoreSum(leaveStoreSum,0,county.cycleSheetId,county.countyCode)">修改</i>
<i style="cursor: pointer;" class="glyphicon glyphicon-remove" ng-click="cancelLeaveStoreSum()">取消</i>
</td>
</tr>
</tbody>
</table>
<div style="text-align: right;">
<div style="color: red;padding: 5px;" ng-if="showAlertCk">{{alertCk}}</div>
<div style="color: red;padding: 5px;" ng-if="showUpdateSuccessMsg">{{updateSuccessMsg}}</div>
<button class="btn btn-info" ng-click="saveTheseCountySum()">更新</button>
<button class="btn btn-info" ng-click="closeThisDialog()">关闭</button>
</div>
</div>
\ No newline at end of file
<div class="ui-dialog-title">
添加权限
</div>
......@@ -6,21 +5,21 @@
<form name="form" class="form-validation">
<div class="form-group">
<label>名称</label>
<input type="text" class="form-control" ng-model="name" required >
<input type="text" class="form-control" ng-model="name" required>
</div>
<div class="form-group">
<label>资源路径</label>
<input type="text" class="form-control" ng-model="url" required >
<input type="text" class="form-control" ng-model="url" required>
</div>
<div class="form-group">
<label>权限字符串</label>
<input type="text" class="form-control" ng-model="permission" required >
<input type="text" class="form-control" ng-model="permission" required>
</div>
<div class="form-group">
<label>资源类型</label>
<div class="radio">
<label class="i-checks">
<input type="radio" ng-model="resourceType" value="menu">
<input type="radio" ng-model="resourceType" value="menu">
<i></i>
menu
</label>
......
<div class="ui-dialog-title">
添加角色
</div>
......@@ -6,16 +5,17 @@
<form name="form" class="form-validation">
<div class="form-group">
<label>角色名称</label>
<input type="text" class="form-control" ng-model="role" required >
<input type="text" class="form-control" ng-model="role" required>
</div>
<div class="form-group">
<label>角色描述</label>
<input type="text" class="form-control" ng-model="description" required >
<input type="text" class="form-control" ng-model="description" required>
</div>
<div class="form-group pull-in clearfix">
<div class="col-sm-6">
<label>权限</label>
<select ui-jq="chosen" multiple class="form-control w-md" ng-model="permissionId" ng-options="perm.id as perm.name for perm in activePermissionList"></select>
<select ui-jq="chosen" multiple class="form-control w-md" ng-model="permissionId"
ng-options="perm.id as perm.name for perm in activePermissionList"></select>
</div>
</div>
</form>
......
<div class="ui-dialog-title">
添加用户
</div>
......@@ -6,27 +5,29 @@
<form name="form" class="form-validation">
<div class="form-group">
<label>用户名</label>
<input type="text" class="form-control" ng-model="username" required >
<input type="text" class="form-control" ng-model="username" required>
</div>
<div class="form-group">
<label>昵称</label>
<input type="text" class="form-control" ng-model="name" required >
<input type="text" class="form-control" ng-model="name" required>
</div>
<div class="form-group pull-in clearfix">
<div class="col-sm-6">
<label>密码</label>
<input type="password" class="form-control" name="password" ng-model="password" required >
<input type="password" class="form-control" name="password" ng-model="password" required>
</div>
<div class="col-sm-6">
<label>确认密码</label>
<input type="password" class="form-control" name="confirm_password" required ng-model="confirm_password" ui-validate=" '$value==password' " ui-validate-watch=" 'password' ">
<input type="password" class="form-control" name="confirm_password" required ng-model="confirm_password"
ui-validate=" '$value==password' " ui-validate-watch=" 'password' ">
<span ng-show='form.confirm_password.$error.validator' style="color:red;">两次密码不一致!</span>
</div>
</div>
<div class="form-group pull-in clearfix">
<div class="col-sm-6">
<label>角色</label>
<select class="form-control w-md" ng-model="roleId" ng-options="role.id as role.role for role in activeRoleList"></select>
<select class="form-control w-md" ng-model="roleId"
ng-options="role.id as role.role for role in activeRoleList"></select>
</div>
</div>
</form>
......
<div class="ui-dialog-title">
提示
</div>
<div class="ui-dialog-content">
<div>{{msgText}}</div>
<div><span style="color: red">{{errText}}</span></div>
</div>
<div class="ui-dialog-confirm">
<button class="btn btn-info" ng-click="confirmYes()">确定</button>
</div>
<div class="ui-dialog-title">
提示
</div>
<div class="ui-dialog-content">
<div>{{msgText}}</div>
<div><span style="color: red">{{errText}}</span></div>
</div>
<div class="ui-dialog-confirm">
<button class="btn btn-info" ng-click="confirmYes()">确定</button>
</div>
<div class="ui-dialog-title">
特殊证件列表
</div>
<div class="ui-dialog-content">
<table>
<tr>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>受理号</th>
<th>类型</th>
</thead>
<tbody>
<tr ng-repeat="specialCard in specialCardList">
<td>{{specialCard.acceptNo}}</td>
<td ng-if="specialCard.specialType==0">余证</td>
<td ng-if="specialCard.specialType==1">快证</td>
<td ng-if="specialCard.specialType==2">退证</td>
</tr>
</tbody>
</table>
</td>
</tr>
</table>
</div>
<div class="ui-dialog-title">
修改权限
</div>
......@@ -6,7 +5,7 @@
<form name="form" class="form-validation">
<div class="form-group">
<label>名称</label>
<input type="text" class="form-control" ng-model="thisPerm.name" ng-value="thisPerm.name" required >
<input type="text" class="form-control" ng-model="thisPerm.name" ng-value="thisPerm.name" required>
</div>
<div class="form-group">
<label>路径</label>
......@@ -14,13 +13,14 @@
</div>
<div class="form-group">
<label>权限字符串</label>
<input type="text" class="form-control" ng-model="thisPerm.permission" ng-value="thisPerm.permission" required >
<input type="text" class="form-control" ng-model="thisPerm.permission" ng-value="thisPerm.permission"
required>
</div>
<div class="form-group">
<label>资源类型</label>
<div class="radio">
<label class="i-checks">
<input type="radio" ng-model="resourceType" value="menu">
<input type="radio" ng-model="resourceType" value="menu">
<i></i>
menu
</label>
......
<div class="ui-dialog-title">
修改角色
</div>
......@@ -6,16 +5,18 @@
<form name="form" class="form-validation">
<div class="form-group">
<label>角色名称</label>
<input type="text" class="form-control" ng-value="thisRole.role" ng-model="thisRole.role" required >
<input type="text" class="form-control" ng-value="thisRole.role" ng-model="thisRole.role" required>
</div>
<div class="form-group">
<label>角色描述</label>
<input type="text" class="form-control" ng-value="thisRole.description" ng-model="thisRole.description" required >
<input type="text" class="form-control" ng-value="thisRole.description" ng-model="thisRole.description"
required>
</div>
<div class="form-group pull-in clearfix">
<div class="col-sm-6">
<label>权限</label>
<select ui-jq="chosen" multiple class="form-control w-md" ng-model="permissionId" ng-options="perm.id as perm.name for perm in activePermissionList"></select>
<select ui-jq="chosen" multiple class="form-control w-md" ng-model="permissionId"
ng-options="perm.id as perm.name for perm in activePermissionList"></select>
</div>
</div>
</form>
......
......@@ -106,6 +106,42 @@ angular.module('app')
}]
}
})
.state('layout.searchSpecialCard', {
url: '/searchSpecialCard',
templateUrl: 'tpl/layout/searchSpecialCard/searchSpecialCard.html',
cache:false,
controller:'searchSpecialCardCtrl',
resolve: {
deps: ['uiLoad',
function( uiLoad ){
return uiLoad.load( ['tpl/layout/searchSpecialCard/searchSpecialCard.js'] );
}]
}
})
.state('layout.failedCard', {
url: '/failedCard',
templateUrl: 'tpl/layout/failedCard/failedCard.html',
cache:false,
controller:'failedCardCtrl',
resolve: {
deps: ['uiLoad',
function( uiLoad ){
return uiLoad.load( ['tpl/layout/failedCard/failedCard.js'] );
}]
}
})
.state('layout.receipt', {
url: '/receipt',
templateUrl: 'tpl/layout/receipt/receipt.html',
cache:false,
controller:'receiptCtrl',
resolve: {
deps: ['uiLoad',
function( uiLoad ){
return uiLoad.load( ['tpl/layout/receipt/receipt.js'] );
}]
}
})
}
]
......
......@@ -380,7 +380,125 @@ app.service('MessageService', function (ngDialog) {
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getTypeListByTaskStateId:function(state,success){
$http({
method: 'GET',
url: "../user/getTypeListByTaskStateId" + urlTimeStamp(),
params:{
taskStateId:state
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getCityListByCardType:function(cardType,state,success){
$http({
method: 'GET',
url: "../user/getCityListByCardType" + urlTimeStamp(),
params:{
state:state,
cardType:cardType
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getGroupNoByTaskListId:function(taskStateId,success){
$http({
method: 'GET',
url: "../user/getGroupNoByTaskListId" + urlTimeStamp(),
params:{
taskStateId:taskStateId
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getCountyListByTaskListId:function(taskStateId,success){
$http({
method: 'GET',
url: "../user/getCountyListByTaskListId" + urlTimeStamp(),
params:{
taskStateId:taskStateId
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
updateProductionTask:function(taskId,state,success){
$http({
method: 'GET',
url: "../user/updateProductionTask" + urlTimeStamp(),
params:{
taskId:taskId,
state:state
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
findFailedinfo:function(state,workShop,success){
$http({
method: 'GET',
url: "../user/findFailedinfo" + urlTimeStamp(),
params:{
workShop:workShop,
state:state
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getReceiptData:function(startTime, endTime,success){
$http({
method: 'GET',
url: "../user/getConnectList" + urlTimeStamp(),
params:{
startTime:startTime,
endTime:endTime
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getprintReceipt:function(startTime, endTime,success){
$http({
method: 'GET',
url: "../user/getConnectList" + urlTimeStamp(),
params:{
startTime:startTime,
endTime:endTime
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
}
}
}])
\ No newline at end of file
......@@ -34,7 +34,7 @@
</span>
</div>
</span>
<span class="col-lg-1" style="margin-left: 1em">
<span class="col-lg-1" style="margin-left: 6em">
<button type="button" class="btn btn-primary" ng-click="task_click()">查询</button>
</span>
</div>
......@@ -55,7 +55,7 @@
<th>不合格</th>
<th>机器号</th>
<th>状态</th>
<th></th>
<th>操作</th>
</thead>
<tbody ng-repeat="city in cityList| orderBy:citycode:desc">
<tr>
......@@ -73,33 +73,58 @@
ng-show="city.printer_Id!=null">机器<span>{{city.printer_Id}}</span></span>
</td>
<td>{{city.state}}</td>
<td><a ng-click="showTable(city.task_Id)">组号列表</a></td>
<td ng-if="userState<=4"><a ng-click="showTable(city.task_Id)">组号列表</a></td>
<td ng-if="userState>4"><a ng-click="showTable(city.task_Id)">区县列表</a></td>
<td><a ng-click="finishClick(city.task_Id,userState)">完成</a></td>
</tr>
<tr ng-show="showtable==city.task_Id">
<tr ng-show="showtable==city.task_Id && userState<=4">
<td></td>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>组号</th>
<th>合格数量</th>
<th>不合格数量</th>
<th></th>
<th>特殊证件数量</th>
<th>特殊证件列表</th>
</thead>
<tbody>
<tr ng-repeat="groups in city.list">
<td>{{groups.groupNo}}</td>
<td>{{groups.downloadCount}}</td>
<td>{{groups.type}}</td>
<td></td>
<tr ng-repeat="group in groupList">
<td>{{group.groupNO}}</td>
<td>{{group.vaildCount}}</td>
<td>{{group.invaildCount}}</td>
<td>{{group.specialCardCount}}</td>
<td><a ng-click="showTableGroup(group.specialCardList)">特殊证件列表</a></td>
</tr>
</tbody>
</table>
</td>
</tr>
<tr ng-show="showtable==city.task_Id && userState>4">
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>区县名称</th>
<th>卸载数量</th>
<th>完成数量</th>
<th>电写入数量</th>
<th>出库数量</th>
<th>入库数量</th>
</thead>
<tbody>
<tr ng-repeat="county in countyList">
<td>{{county.countyName}}</td>
<td>{{county.downloadCount}}</td>
<td>{{county.finish_Count}}</td>
<td>{{county.electric_writerCount}}</td>
<td>{{county.out_Storage_Count}}</td>
<td>{{county.in_Storage_Count}}</td>
</tr>
</tbody>
</table>
</td>
</tr>
......
<div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }">
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light "
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div class="hbox hbox-auto-xs hbox-auto-sm">
<div class="col w-md bg-light dk b-r bg-auto">
<div class="wrapper b-b bg">
<button class="btn btn-sm btn-default pull-right visible-sm visible-xs" ui-toggle-class="show"
target="#email-menu"><i class="fa fa-bars"></i></button>
<a class="w-xs font-bold">废证任务单</a>
</div>
</div>
<div class="col">
<div class="wrapper-md">
<div class="panel panel-default">
<div class="panel-heading">
废证任务
</div>
<div class="table-responsive">
<table class="table table-striped b-t b-light">
<thead>
<th>废证受理号</th>
<th>循环单号</th>
<th>废证原因</th>
<th>打印时间</th>
<th>分配时间</th>
<th>预订位时间</th>
<th>状态</th>
<th>操作</th>
</thead>
<tbody ng-repeat="failedCard in failedCardList">
<tr>
<td>{{failedCard.acceptNo}}</td>
<td>{{failedCard.taskID}}</td>
<td>{{failedCard.failedCardReason}}</td>
<td>{{failedCard.printDate}}</td>
<td>
<span style="padding-left:10px;"
ng-show="failedCard.allotDate==null">未分配</span>
<span style="padding-left:10px;"
ng-show="failedCard.allotDate!=null">{{failedCard.allotDate}}}</span></span>
</td>
<td>{{failedCard.positionDate}}</td>
<td>{{failedCard.state}}</td>
<td><a ng-click="finishClick(failedCard.failedCardId,userState)">完成</a></td>
</tr>
</tbody>
</table>
</div>
<footer class="panel-footer">
<div class="row">
<div class="col-sm-4 text-right text-center-xs">
<ul class="pagination pagination-sm m-t-none m-b-none">
<li><a href><i class="fa fa-chevron-left"></i></a></li>
<li><a href>1</a></li>
<li><a href>2</a></li>
<li><a href>3</a></li>
<li><a href>4</a></li>
<li><a href>5</a></li>
<li><a href><i class="fa fa-chevron-right"></i></a></li>
</ul>
</div>
</div>
</footer>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
app.controller('failedCardCtrl', ['$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.failedCard")
}
$scope.userState = $rootScope.loginData.state;
var getNowFormatDate = function () {
var date = new Date();
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + "/" + month + "/" + strDate;
return currentdate;
}
$scope.today = function () {
$scope.dt = getNowFormatDate();
};
$scope.today();
$scope.clear = function () {
$scope.dt = null;
};
$scope.disabled = function (date, mode) {
return (mode === 'day' && (date.getDay() === 0 || date.getDay() === 6));
};
$scope.toggleMin = function () {
$scope.minDate = $scope.minDate ? null : new Date();
};
$scope.toggleMin();
$scope.open = function ($event) {
$event.preventDefault();
$event.stopPropagation();
$scope.opened = true;
};
$scope.dateOptions = {
formatYear: 'yy',
startingDay: 1,
class: 'datepicker'
};
$scope.initDate = new Date('2016-15-20');
$scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
$scope.format = $scope.formats[1];
$scope.task_click = function () {
console.log($rootScope.loginData.state, "----测试-----", $scope.dt, "====");
}
$scope.cardType = 0;
$scope.check_type = function (typeCode) {
cardType = typeCode;
console.log($rootScope.loginData.state, "----测试-----", $scope.dt, "====", typeCode, "+++++++++++++");
}
// // 查询废证列表
// var getFailedCardListData = function (state,workshop) {
// HttpService.findFailedinfo(1,workshop,function (data) {
// $scope.failedCardList = data.respData;
// console.log("---制证类型--数据源:")
// console.log(data.respData)
//
// })
// }
// getFailedCardListData($rootScope.loginData.state,$rootScope.loginData.workshop);
$scope.failedCardList = [
{
"acceptNo": "201802",
"failedCardReason": "切废",
failedCardId: 201811205,
taskID: 201811203,
positionDate: "20181108",
finishDate: "20181109",
allotDate: "20181203",
printDate: "20181204",
state: 2
},
{
"acceptNo": "2018035",
"failedCardReason": "电写入废",
failedCardId: 201811206,
taskID: 201811204,
positionDate: "20181108",
finishDate: "20181109",
allotDate: "20181203",
printDate: "20181204",
state: 2
},
{
"acceptNo": "2018036",
"failedCardReason": "冲切废",
failedCardId: 201811207,
taskID: 201811205,
positionDate: "20181108",
finishDate: "20181109",
allotDate: "20181203",
printDate: "20181204",
state: 2
}
]
$scope.finishClick = function (taskId, userState) {
HttpService.updateProductionTask(taskId, userState, function (data) {
//点击确认成功后 再次废证列表
getFailedCardListData($rootScope.loginData.state, $rootScope.loginData.workshop);
})
}
$scope.folds = [
{
id: 1, name: '普通证', count: 10000, filter: '', isActive: true, dataTable: {
"aaData": [
{
"engine": "Trident",
"browser": "Internet Explorer 4.0",
"platform": "Win 95+",
"version": "4",
"grade": "X"
},
{
"engine": "Trident",
"browser": "Internet Explorer 5.0",
"platform": "Win 95+",
"version": "5",
"grade": "C"
}]
}
},
{
id: 2, name: '邮寄证', count: 20000, filter: 'starred', dataTable: {
"aaData": [
{
"engine": "Trident",
"browser": "Internet Explorer 5.5",
"platform": "Win 95+",
"version": "5.5",
"grade": "A"
},
{
"engine": "Trident",
"browser": "Internet Explorer 6",
"platform": "Win 98+",
"version": "6",
"grade": "A"
},
{
"engine": "Trident",
"browser": "Internet Explorer 7",
"platform": "Win XP SP2+",
"version": "7",
"grade": "A"
}]
}
},
{
id: 3, name: '军人证', count: 32000, filter: 'sent', dataTable: {
"aaData": [
{
"engine": "Trident",
"browser": "Internet Explorer 5.5",
"platform": "Win 95+",
"version": "5.5",
"grade": "A"
}]
}
},
{
id: 4, name: '快证', count: 40, filter: 'important', dataTable: {
"aaData": [
{
"engine": "Webkit",
"browser": "Safari 1.3",
"platform": "OSX.3",
"version": "312.8",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "Safari 2.0",
"platform": "OSX.4+",
"version": "419.3",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "Safari 3.0",
"platform": "OSX.4+",
"version": "522.1",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "OmniWeb 5.5",
"platform": "OSX.4+",
"version": "420",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "iPod Touch / iPhone",
"platform": "iPod",
"version": "420.1",
"grade": "A"
}]
}
}
];
$scope.currentTab = 1;
$scope.func = function (id) {
for (var i = 0; i < $scope.folds.length; i++) {
if (id == $scope.folds[i].id) {
$scope.folds[i].isActive = true;
} else {
$scope.folds[i].isActive = false;
}
}
$scope.currentTab = id;
}
}]);
\ No newline at end of file
<!-- navbar -->
<div class="app-header navbar">
<!-- navbar -->
<div class="app-header navbar">
<!-- navbar header -->
<div class="navbar-header {{app.settings.navbarHeaderColor}}">
<button class="pull-right visible-xs dk" ui-toggle-class="show" data-target=".navbar-collapse">
<i class="glyphicon glyphicon-cog"></i>
</button>
<button class="pull-right visible-xs" ui-toggle-class="off-screen" data-target=".app-aside" ui-scroll="app">
<i class="glyphicon glyphicon-align-justify"></i>
</button>
<!-- brand -->
<a href="#/" class="navbar-brand text-lt">
<i class="fa fa-credit-card"></i>
<span class="hidden-folded m-l-xs">{{app.name}}</span>
</a>
<!-- / brand -->
<button class="pull-right visible-xs dk" ui-toggle-class="show" data-target=".navbar-collapse">
<i class="glyphicon glyphicon-cog"></i>
</button>
<button class="pull-right visible-xs" ui-toggle-class="off-screen" data-target=".app-aside" ui-scroll="app">
<i class="glyphicon glyphicon-align-justify"></i>
</button>
<!-- brand -->
<a href="#/" class="navbar-brand text-lt">
<i class="fa fa-credit-card"></i>
<span class="hidden-folded m-l-xs">{{app.name}}</span>
</a>
<!-- / brand -->
</div>
<!-- / navbar header -->
<!-- navbar collapse -->
<div class="collapse pos-rlt navbar-collapse box-shadow {{app.settings.navbarCollapseColor}}">
<!-- buttons -->
<div class="nav navbar-nav hidden-xs">
<a href class="btn no-shadow navbar-btn" ng-click="app.settings.asideFolded = !app.settings.asideFolded">
<i class="fa {{app.settings.asideFolded ? 'fa-indent' : 'fa-dedent'}} fa-fw"></i>
</a>
</div>
<!-- / buttons -->
<!-- search form -->
<form class="navbar-form navbar-form-sm navbar-left shift" ui-shift="prependTo" target=".navbar-collapse" role="search" ng-controller="TypeaheadDemoCtrl">
<div class="form-group">
<div class="input-group">
<input type="text" ng-model="selected" typeahead="state for state in states | filter:$viewValue | limitTo:8" class="form-control input-sm bg-light no-border rounded padder" placeholder="Search projects...">
<span class="input-group-btn">
<button type="submit" class="btn btn-sm bg-light rounded"><i class="fa fa-search"></i></button>
</span>
</div>
<!-- buttons -->
<div class="nav navbar-nav hidden-xs">
<a href class="btn no-shadow navbar-btn" ng-click="app.settings.asideFolded = !app.settings.asideFolded">
<i class="fa {{app.settings.asideFolded ? 'fa-indent' : 'fa-dedent'}} fa-fw"></i>
</a>
</div>
</form>
<!-- / search form -->
<!-- / buttons -->
<!-- nabar right -->
<ul class="nav navbar-nav navbar-right">
<li class="hidden-xs">
<a ui-fullscreen></a>
</li>
<li class="dropdown" dropdown>
<a href class="dropdown-toggle clear" dropdown-toggle>
<span class="thumb-sm avatar pull-right m-t-n-sm m-b-n-sm m-l-sm">
<img src="../img/a0.jpg" alt="...">
<i class="on md b-white bottom"></i>
</span>
<span class="hidden-sm hidden-md">{{loginData.username}}</span> <b class="caret"></b>
</a>
<!-- dropdown -->
<ul class="dropdown-menu animated fadeInRight w">
<li>
<a ng-click="logout()">Logout</a>
<!-- search form -->
<form class="navbar-form navbar-form-sm navbar-left shift" ui-shift="prependTo" target=".navbar-collapse"
role="search" ng-controller="TypeaheadDemoCtrl">
<div class="form-group">
<div class="input-group">
<input type="text" ng-model="selected"
typeahead="state for state in states | filter:$viewValue | limitTo:8"
class="form-control input-sm bg-light no-border rounded padder"
placeholder="Search projects...">
<span class="input-group-btn">
<button type="submit" class="btn btn-sm bg-light rounded">
<i class="fa fa-search"></i>
</button>
</span>
</div>
</div>
</form>
<!-- / search form -->
<!-- nabar right -->
<ul class="nav navbar-nav navbar-right">
<li class="hidden-xs">
<a ui-fullscreen></a>
</li>
<li class="dropdown" dropdown>
<a href class="dropdown-toggle clear" dropdown-toggle>
<span class="thumb-sm avatar pull-right m-t-n-sm m-b-n-sm m-l-sm">
<img src="../img/a0.jpg" alt="...">
<i class="on md b-white bottom"></i>
</span>
<span class="hidden-sm hidden-md">{{loginData.username}}</span>
<b class="caret"></b>
</a>
<!-- dropdown -->
<ul class="dropdown-menu animated fadeInRight w">
<li>
<a ng-click="logout()">Logout</a>
</li>
</ul>
<!-- / dropdown -->
</li>
</ul>
<!-- / dropdown -->
</li>
</ul>
<!-- / navbar right -->
</ul>
<!-- / navbar right -->
</div>
<!-- / navbar collapse -->
</div>
<!-- / navbar -->
</div>
<!-- / navbar -->
<!-- menu -->
<div class="app-aside hidden-xs {{app.settings.asideColor}}">
<!-- menu -->
<div class="app-aside hidden-xs {{app.settings.asideColor}}">
<div class="aside-wrap">
<!-- if you want to use a custom scroll when aside fixed, use the slimScroll
<div class="navi-wrap" ui-jq="slimScroll" ui-options="{height:'100%', size:'8px'}">
-->
<div class="navi-wrap">
<!-- if you want to use a custom scroll when aside fixed, use the slimScroll
<div class="navi-wrap" ui-jq="slimScroll" ui-options="{height:'100%', size:'8px'}">
-->
<div class="navi-wrap">
<!-- nav -->
<nav ui-nav class="navi">
<!-- list -->
<ul class="nav">
<li class="hidden-folded padder m-t m-b-sm text-muted text-xs">
<span>导航</span>
</li>
<li ui-sref-active="active" ng-repeat="menu in menuList">
<a ui-sref="{{menu.url}}">
<i class="{{icons[$index]}}"></i>
<span class="font-bold" >{{menu.name}}</span>
</a>
</li>
<li class="line dk"></li>
</ul>
<!-- / list -->
</nav>
<!-- nav -->
</div>
<!-- nav -->
<nav ui-nav class="navi">
<!-- list -->
<ul class="nav">
<li class="hidden-folded padder m-t m-b-sm text-muted text-xs">
<span>导航</span>
</li>
<li ui-sref-active="active" ng-repeat="menu in menuList">
<a ui-sref="{{menu.url}}">
<i class="{{icons[$index]}}"></i>
<span class="font-bold">{{menu.name}}</span>
</a>
</li>
<li class="line dk"></li>
</ul>
<!-- / list -->
</nav>
<!-- nav -->
</div>
</div>
</div>
<!-- / menu -->
</div>
<!-- / menu -->
<!-- view -->
<div class="app-content" ng-class="{'m-n': app.hideAside, 'h-full': app.hideFooter }">
<!-- view -->
<div class="app-content" ng-class="{'m-n': app.hideAside, 'h-full': app.hideFooter }">
<div ui-view></div>
</div>
</div>
<!-- / view -->
<!-- / view -->
<!-- footer -->
<div class="app-footer wrapper b-t bg-white">
<!-- footer -->
<div class="app-footer wrapper b-t bg-white">
<span class="pull-right">version:{{app.version}}</span>
&copy; 2018 Copyright.
</div>
<!-- / footer -->
\ No newline at end of file
</div>
<!-- / footer -->
\ No newline at end of file
app.controller('layOutCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage','HttpService', function($scope,$rootScope, $http,$state, $filter,$localStorage,HttpService) {
if($rootScope.loginData.login == false){
app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService) {
if ($rootScope.loginData.login == false) {
$state.go("signin")
}else{
$scope.logout = function(){
HttpService.logout(function(data) {})
} else {
$scope.logout = function () {
HttpService.logout(function (data) {
})
$state.go("signin")
localStorage.removeItem("ngStorage-loginData");
location.reload();
......
<div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }">
<!-- hbox layout -->
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light " ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<!-- hbox layout -->
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light "
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div style="padding: 20px;" class="layui-anim layui-anim-up">
<xblock>
<button class="layui-btn" ng-click="addPerms()"><i class="layui-icon" ></i>添加</button>
</xblock>
<table class="layui-table">
<thead>
<tr>
<th>ID</th>
<th>权限</th>
<th>名称</th>
<th>路径</th>
<th>类型</th>
<!--<th>父类id</th>-->
<!--<th>父类id树</th>-->
<th>状态</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="permission in permissionList | orderBy:id track by permission.id">
<td>{{permission.id}}</td>
<td>{{permission.permission}}</td>
<td>{{permission.name}}</td>
<td>{{permission.url}}</td>
<td>{{permission.resource_type}}</td>
<!--<td>{{permission.parent_id}}</td>-->
<!--<td>{{permission.parent_ids}}</td>-->
<td class="td-status">
<span ng-if="permission.available==1" class="layui-btn layui-btn-normal layui-btn-mini layui-btn-disabled">已停用</span>
<span ng-if="permission.available==0" class="layui-btn layui-btn-normal layui-btn-mini">已启用</span>
</td>
<td>
<a class="layui-btn layui-btn" ng-click="updatePerms(permission.id)">修改</a>
<a class="layui-btn layui-btn-danger" ng-if="permission.available==0" ng-click="permissionDel(permission.id)">删除</a>
<a class="layui-btn layui-btn-info" ng-if="permission.available==1" ng-click="permissionOpen(permission.id)">启用</a>
</td>
</tr>
</tbody>
</table>
<div style="padding: 20px;" class="layui-anim layui-anim-up">
<xblock>
<button class="layui-btn" ng-click="addPerms()"><i class="layui-icon"></i>添加</button>
</xblock>
<table class="layui-table">
<thead>
<tr>
<th>ID</th>
<th>权限</th>
<th>名称</th>
<!--<th>路径</th>-->
<th>类型</th>
<!--<th>父类id</th>-->
<!--<th>父类id树</th>-->
<th>状态</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="permission in permissionList | orderBy:id track by permission.id">
<td>{{permission.id}}</td>
<td>{{permission.permission}}</td>
<td>{{permission.name}}</td>
<!--<td>{{permission.url}}</td>-->
<td>{{permission.resource_type}}</td>
<!--<td>{{permission.parent_id}}</td>-->
<!--<td>{{permission.parent_ids}}</td>-->
<td class="td-status">
<span ng-if="permission.available==1"
class="layui-btn layui-btn-normal layui-btn-mini layui-btn-disabled">已停用</span>
<span ng-if="permission.available==0"
class="layui-btn layui-btn-normal layui-btn-mini">已启用</span>
</td>
<td>
<a class="layui-btn layui-btn" ng-click="updatePerms(permission.id)">修改</a>
<a class="layui-btn layui-btn-danger" ng-if="permission.available==0"
ng-click="permissionDel(permission.id)">删除</a>
<a class="layui-btn layui-btn-info" ng-if="permission.available==1"
ng-click="permissionOpen(permission.id)">启用</a>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<!-- /hbox layout -->
</div>
<!-- /hbox layout -->
</div>
\ No newline at end of file
app.controller('permissionListCtrl', ['$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.permissionList")
}
app.controller('permissionListCtrl', ['$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.permissionList")
}
$scope.id = 'id';
$scope.id = 'id';
var getPermissionList = function(){
HttpService.getPermissionListData(function(data) {
$scope.permissionList = data;
console.log($scope.permissionList);
})
}
getPermissionList();
var getPermissionList = function () {
HttpService.getPermissionListData(function (data) {
$scope.permissionList = data;
console.log($scope.permissionList);
})
}
getPermissionList();
// 删除权限
$scope.permissionDel = function(id){
HttpService.delPermission(id,function(data){
getPermissionList();
})
}
// 删除权限
$scope.permissionDel = function (id) {
HttpService.delPermission(id, function (data) {
getPermissionList();
})
}
// 启用权限
$scope.permissionOpen = function(id){
HttpService.openPermission(id,function(data){
getPermissionList();
})
}
// 启用权限
$scope.permissionOpen = function (id) {
HttpService.openPermission(id, function (data) {
getPermissionList();
})
}
// 添加
$scope.addPerms = function(){
ngDialog.open({
template: 'dialogs/addPermission.html' + urlTimeStamp(),
width:800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
$scope.permissionAdd = function(resourceType){
var permission={};
permission.name=$scope.name;
permission.url=$scope.url;
permission.permission=$scope.permission;
permission.resourceType=resourceType;
console.log(permission)
HttpService.addPermission(permission,function(data){
$scope.closeThisDialog();
getPermissionList();
// 添加
$scope.addPerms = function () {
ngDialog.open({
template: 'dialogs/addPermission.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
$scope.permissionAdd = function (resourceType) {
var permission = {};
permission.name = $scope.name;
permission.url = $scope.url;
permission.permission = $scope.permission;
permission.resourceType = resourceType;
console.log(permission)
HttpService.addPermission(permission, function (data) {
$scope.closeThisDialog();
getPermissionList();
})
}
}]
})
}
// 修改
$scope.updatePerms = function (id) {
ngDialog.open({
template: 'dialogs/updatePerms.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getPermsById(id, function (data) {
$scope.thisPerm = data.permission;
console.log($scope.thisPerm)
})
}
}]
})
}
// 修改
$scope.updatePerms = function(id){
ngDialog.open({
template: 'dialogs/updatePerms.html' + urlTimeStamp(),
width:800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getPermsById(id,function(data){
$scope.thisPerm = data.permission;
console.log($scope.thisPerm)
})
$scope.permUpdate = function(resourceType){
var jsonPerm = {};
jsonPerm.id = $scope.thisPerm.id;
jsonPerm.name=$scope.thisPerm.name;
jsonPerm.url=$scope.thisPerm.url;
jsonPerm.permission =$scope.thisPerm.permission;
jsonPerm.resourceType=resourceType;
console.log(jsonPerm)
HttpService.updatePerm(jsonPerm,function(data){
$scope.closeThisDialog();
getPermissionList();
})
}
}]
$scope.permUpdate = function (resourceType) {
var jsonPerm = {};
jsonPerm.id = $scope.thisPerm.id;
jsonPerm.name = $scope.thisPerm.name;
// jsonPerm.url=$scope.thisPerm.url;
jsonPerm.permission = $scope.thisPerm.permission;
jsonPerm.resourceType = resourceType;
console.log(jsonPerm)
HttpService.updatePerm(jsonPerm, function (data) {
$scope.closeThisDialog();
getPermissionList();
})
}
}]
})
})
}
}
}])
\ No newline at end of file
}])
\ No newline at end of file
<div class="row" style="font-size: 1.3em;border-bottom:1px solid #CCCCCC;margin-bottom:10px;padding-top:10px;">
<div class="col-md-1">
<div>交接单</div>
</div>
<div class="col-md-11" style="text-align: right;">
<div style="width: auto">
<span>起始时间:</span>
<input type="text" ng-model="nowDataEight" value="currentDetailDate" id="wdate1" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm',autoPickDate:'true'})">
<span>结束时间:</span>
<input type="text" ng-model="nowDate" value="currentDetailDate" id="wdate2" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm',autoPickDate:'true'})">
<input type="submit" class="btn btn-primary" value="查询" ng-click="myClick()">
</div>
</div>
</div>
<div class="loading">
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>
<div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;">
<div>
<div ng-if="receiptData.length>0">
<table class="table table-hover" style="margin-top:10px;">
<thead>
<th></th>
<th>普通证</th>
<!--<th><a ng-click="showSpecialCardInfo()">快证</a></th>-->
<th>快证</th>
<th>异地KS邮</th>
<th>异地KS普</th>
<th>异地邮</th>
<th>异地普</th>
<th>军人证</th>
<th>KS普</th>
<th>KS邮</th>
<th>邮寄证</th>
<th>小计</th>
<th>盒数</th>
</thead>
<tbody>
<tr ng-repeat="county in receiptData">
<td width="100px">{{county[12]}}</td>
<td width="100px" ng-repeat="item in county track by $index" ng-if="$index!=12 && $index!=13">
<span ng-if="item!=0">{{item}}</span>
<span ng-if="item==0"></span>
</td>
</tr>
</tbody>
</table>
</div>
<div ng-if="receiptData.length==0" style="font-size:1.5em;">
当天暂无报表数据。
</div>
<div ng-if="receiptData.length!=0 && receiptData[0][11] != 0" style="font-size:1.5em;">
<input type="button" class="btn btn-primary" value="下载交接单" ng-click="printReceipt()">
<input type="button" class="btn btn-primary" value="下载回执单" ng-click="printOfficialReceipt()">
</div>
</div>
</div>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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