Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 6bfb214c authored by dahai's avatar dahai
Browse files
Options

push

parents a2f7694b ee8658b9
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 44 deletions
src/main/java/com/yxproject/start/api/LogApi.java
View file @ 6bfb214c
...@@ -153,7 +153,6 @@ public class LogApi { ...@@ -153,7 +153,6 @@ public class LogApi {
for (int i=0;i<idList.size();i++){ for (int i=0;i<idList.size();i++){
logService.deleteFile(idList.get(i)); logService.deleteFile(idList.get(i));
} }
return true; return true;
} }
......
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ 6bfb214c
...@@ -69,7 +69,7 @@ public class ReceiptApi { ...@@ -69,7 +69,7 @@ public class ReceiptApi {
String gajg_dm = (String) detailedData.get("GAJG_DM"); String gajg_dm = (String) detailedData.get("GAJG_DM");
Long receiptId = receiptListEntity.getId(); Long receiptId = receiptListEntity.getId();
//生成特证详单 //生成特证详单
receiptService.createDetailedList(uploadNo, acceptNo2, name, id, gajg_dm, receiptId, sex,signGovt); receiptService.createDetailedList(uploadNo, acceptNo2, name, id, gajg_dm, receiptId, sex, signGovt);
} else { } else {
//已经生成特证交接单，不做操作。 //已经生成特证交接单，不做操作。
} }
...@@ -116,19 +116,21 @@ public class ReceiptApi { ...@@ -116,19 +116,21 @@ public class ReceiptApi {
String gajg_dm = (String) detailedData.get("GAJG_DM"); String gajg_dm = (String) detailedData.get("GAJG_DM");
int receiptId = Integer.parseInt((BigDecimal) detailedData.get("ID") + ""); int receiptId = Integer.parseInt((BigDecimal) detailedData.get("ID") + "");
//生成详单 //生成详单
receiptService.createDetailedList(uploadNo, acceptNo2, name, receiptListDate.get(n).get("ID_NO").toString(), gajg_dm, receiptId, sex,signGovt); receiptService.createDetailedList(uploadNo, acceptNo2, name, receiptListDate.get(n).get("ID_NO").toString(), gajg_dm, receiptId, sex, signGovt);
} else { } else {
//不做操作 //不做操作
} }
} }
} else { } else {
//已生成交接单 //已生成交接单
} }
// //查询有几个特证
// int specialCardCount = receiptService.selectSpecialCard(receiptListDate.get(i).get("GROUP_NO").toString());
// //减去特证个数
// int finishCount = receiptService.selectCount(receiptListDate.get(i).get("GROUP_NO").toString()) - specialCardCount;
// receiptService.updateFinishCount(receiptListDate.get(i).get("GROUP_NO").toString(), finishCount);
} }
} }
return true; return true;
} }
...@@ -144,19 +146,18 @@ public class ReceiptApi { ...@@ -144,19 +146,18 @@ public class ReceiptApi {
List<Map<String, Object>> resultMap = receiptService.selectReceiptListOfSpecialCard(); List<Map<String, Object>> resultMap = receiptService.selectReceiptListOfSpecialCard();
for (int i = 0; i < resultMap.size(); i++) { for (int i = 0; i < resultMap.size(); i++) {
String groupNo = (String) resultMap.get(i).get("QR_CODE"); String groupNo = (String) resultMap.get(i).get("QR_CODE");
if (groupNo.length()==10){ //判断是否是特证
if (groupNo.length() == 10) {
Map<String, Object> map = receiptService.selectCountTimeT(groupNo); Map<String, Object> map = receiptService.selectCountTimeT(groupNo);
resultMap.get(i).put("download", map.get("DOWNLOAD")); resultMap.get(i).put("download", map.get("DOWNLOAD"));
resultMap.get(i).put("checkerCount", map.get("CHECKERCOUNT")); resultMap.get(i).put("checkerCount", map.get("CHECKERCOUNT"));
resultMap.get(i).put("electricCount", map.get("ELECTRICCOUNT")); resultMap.get(i).put("electricCount", map.get("ELECTRICCOUNT"));
} else {
}else {
Map<String, Object> map = receiptService.selectCountTime(groupNo); Map<String, Object> map = receiptService.selectCountTime(groupNo);
resultMap.get(i).put("download", map.get("DOWNLOAD")); resultMap.get(i).put("download", map.get("DOWNLOAD"));
resultMap.get(i).put("checkerCount", map.get("CHECKERCOUNT")); resultMap.get(i).put("checkerCount", map.get("CHECKERCOUNT"));
resultMap.get(i).put("electricCount", map.get("ELECTRICCOUNT")); resultMap.get(i).put("electricCount", map.get("ELECTRICCOUNT"));
} }
} }
return resultMap; return resultMap;
} }
...@@ -203,6 +204,7 @@ public class ReceiptApi { ...@@ -203,6 +204,7 @@ public class ReceiptApi {
/** /**
* 根据受理号查询详单信息 * 根据受理号查询详单信息
*
* @param jsonStr * @param jsonStr
* @return * @return
*/ */
...@@ -219,6 +221,7 @@ public class ReceiptApi { ...@@ -219,6 +221,7 @@ public class ReceiptApi {
/** /**
* 更改备注信息 * 更改备注信息
*
* @param jsonStr * @param jsonStr
* @return * @return
*/ */
......
src/main/java/com/yxproject/start/entity/CardBodyEntity.java
View file @ 6bfb214c
...@@ -2,13 +2,14 @@ package com.yxproject.start.entity; ...@@ -2,13 +2,14 @@ package com.yxproject.start.entity;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Time; import java.sql.Time;
import java.util.Date;
import java.util.Objects; import java.util.Objects;
@Entity @Entity
@Table(name = "CARD_BODY", schema = "YINGXIN", catalog = "") @Table(name = "CARD_BODY", schema = "YINGXIN", catalog = "")
public class CardBodyEntity { public class CardBodyEntity {
private long cardBodyId; private long cardBodyId;
private Time saveDate; private Date saveDate;
private Long cardType; private Long cardType;
private Long totalCount; private Long totalCount;
private String note; private String note;
...@@ -25,11 +26,11 @@ public class CardBodyEntity { ...@@ -25,11 +26,11 @@ public class CardBodyEntity {
@Basic @Basic
@Column(name = "SAVE_DATE") @Column(name = "SAVE_DATE")
public Time getSaveDate() { public Date getSaveDate() {
return saveDate; return saveDate;
} }
public void setSaveDate(Time saveDate) { public void setSaveDate(Date saveDate) {
this.saveDate = saveDate; this.saveDate = saveDate;
} }
......
src/main/java/com/yxproject/start/entity/PlasticFilmEntity.java
View file @ 6bfb214c
...@@ -2,13 +2,14 @@ package com.yxproject.start.entity; ...@@ -2,13 +2,14 @@ package com.yxproject.start.entity;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Time; import java.sql.Time;
import java.util.Date;
import java.util.Objects; import java.util.Objects;
@Entity @Entity
@Table(name = "PLASTIC_FILM", schema = "YINGXIN", catalog = "") @Table(name = "PLASTIC_FILM", schema = "YINGXIN", catalog = "")
public class PlasticFilmEntity { public class PlasticFilmEntity {
private long plasticFilmId; private long plasticFilmId;
private Time saveDate; private Date saveDate;
private Long totalCount; private Long totalCount;
private Long plasticFilmType; private Long plasticFilmType;
private String note; private String note;
...@@ -25,11 +26,11 @@ public class PlasticFilmEntity { ...@@ -25,11 +26,11 @@ public class PlasticFilmEntity {
@Basic @Basic
@Column(name = "SAVE_DATE") @Column(name = "SAVE_DATE")
public Time getSaveDate() { public Date getSaveDate() {
return saveDate; return saveDate;
} }
public void setSaveDate(Time saveDate) { public void setSaveDate(Date saveDate) {
this.saveDate = saveDate; this.saveDate = saveDate;
} }
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ 6bfb214c
...@@ -59,7 +59,6 @@ public interface ReceiptMapper { ...@@ -59,7 +59,6 @@ public interface ReceiptMapper {
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID") @Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
public boolean createReceiptList(ReceiptListEntity receiptListEntity); public boolean createReceiptList(ReceiptListEntity receiptListEntity);
//根据身份证号查询交接单详单信息 //根据身份证号查询交接单详单信息
@Select("select prod_card_t.upload_no," + @Select("select prod_card_t.upload_no," +
"PROD_CARD_T.ACCEPT_NO," + "PROD_CARD_T.ACCEPT_NO," +
...@@ -92,15 +91,11 @@ public interface ReceiptMapper { ...@@ -92,15 +91,11 @@ public interface ReceiptMapper {
"where prod_card_t.id_no=#{id}") "where prod_card_t.id_no=#{id}")
public Map<String,Object>selectDetailedData2(String id); public Map<String,Object>selectDetailedData2(String id);
//生成交接单详单 //生成交接单详单
@Insert("INSERT INTO DETAIL_RECEIPT_LIST (UPLOAD_NO,accept_no,name,card_id,POLICE_CODE,RECEIPT_ID,SEX,SIGN_GOVT)" + @Insert("INSERT INTO DETAIL_RECEIPT_LIST (UPLOAD_NO,accept_no,name,card_id,POLICE_CODE,RECEIPT_ID,SEX,SIGN_GOVT)" +
"VALUES(#{UPLOAD_NO},#{ACCEPT_NO},#{NAME},#{CARD_ID},#{GAJG_DM},#{RECEIPT_ID},#{SEX},#{signGovt})") "VALUES(#{UPLOAD_NO},#{ACCEPT_NO},#{NAME},#{CARD_ID},#{GAJG_DM},#{RECEIPT_ID},#{SEX},#{signGovt})")
public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")long RECEIPT_ID,@Param("SEX")String SEX,@Param("signGovt")String signGovt); public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")long RECEIPT_ID,@Param("SEX")String SEX,@Param("signGovt")String signGovt);
//根据组号查询特证表 //根据组号查询特证表
@Select("SELECT count(*) FROM SPECIAL_CARD WHERE subStr(ACCEPT_NO,0,8) =#{GROUP_NO}") @Select("SELECT count(*) FROM SPECIAL_CARD WHERE subStr(ACCEPT_NO,0,8) =#{GROUP_NO}")
public int selectSpecialCard(@Param("GROUP_NO") String GROUP_NO); public int selectSpecialCard(@Param("GROUP_NO") String GROUP_NO);
...@@ -112,15 +107,12 @@ public interface ReceiptMapper { ...@@ -112,15 +107,12 @@ public interface ReceiptMapper {
@Update("update RECEIPT_LIST set FINISH_COUNT=#{count} where QR_CODE=#{GROUP_NO}") @Update("update RECEIPT_LIST set FINISH_COUNT=#{count} where QR_CODE=#{GROUP_NO}")
public boolean updateFinishCount(@Param("GROUP_NO") String GROUP_NO,@Param("count") int count); public boolean updateFinishCount(@Param("GROUP_NO") String GROUP_NO,@Param("count") int count);
//根据身份证号查询特证表count //根据身份证号查询特证表count
@Select("select count(*) from SPECIAL_CARD \n" + @Select("select count(*) from SPECIAL_CARD \n" +
"left join prod_card_t@prod_link on special_card.accept_no = prod_card_t.accept_no\n" + "left join prod_card_t@prod_link on special_card.accept_no = prod_card_t.accept_no\n" +
"where prod_card_t.id_no = #{id}") "where prod_card_t.id_no = #{id}")
public int selectSpecialCardByAcceptNo(@Param("id") String id); public int selectSpecialCardByAcceptNo(@Param("id") String id);
//查询未复核交接单 //查询未复核交接单
@Select("SELECT RECEIPT_LIST.* ,GAJG_DM.GAJG_MC FROM RECEIPT_LIST LEFT JOIN GAJG_DM ON RECEIPT_LIST.POLICE_CODE=GAJG_DM.GAJG_DM where state=0\n") @Select("SELECT RECEIPT_LIST.* ,GAJG_DM.GAJG_MC FROM RECEIPT_LIST LEFT JOIN GAJG_DM ON RECEIPT_LIST.POLICE_CODE=GAJG_DM.GAJG_DM where state=0\n")
public List<Map<String,Object>>selectReceiptListOfSpecialCard (); public List<Map<String,Object>>selectReceiptListOfSpecialCard ();
...@@ -131,12 +123,10 @@ public interface ReceiptMapper { ...@@ -131,12 +123,10 @@ public interface ReceiptMapper {
"WHERE PROD_CARD_T.ID_NO =#{id}") "WHERE PROD_CARD_T.ID_NO =#{id}")
public Map<String,Object> selectReceiptList(@Param("id") String id); public Map<String,Object> selectReceiptList(@Param("id") String id);
//根据交接单号查详单信息 //根据交接单号查详单信息
@Select("select * from detail_receipt_list where receipt_id=#{receiptId}") @Select("select * from detail_receipt_list where receipt_id=#{receiptId}")
public List<Map<String,Object>> selectDetailList(@Param("receiptId") String receiptId); public List<Map<String,Object>> selectDetailList(@Param("receiptId") String receiptId);
//根据传入的交接单ID和复核人ID插入复核人、复核时间、更改状态 //根据传入的交接单ID和复核人ID插入复核人、复核时间、更改状态
@Update("update receipt_list set \n" + @Update("update receipt_list set \n" +
"check_date = #{date},\n" + "check_date = #{date},\n" +
...@@ -155,12 +145,10 @@ public interface ReceiptMapper { ...@@ -155,12 +145,10 @@ public interface ReceiptMapper {
@Select("select count(*) from RECEIPT_LIST where QR_CODE=(select accept_no from prod_card_t@prod_link where id_no=#{id})") @Select("select count(*) from RECEIPT_LIST where QR_CODE=(select accept_no from prod_card_t@prod_link where id_no=#{id})")
public int selectCountById(@Param("id") String id); public int selectCountById(@Param("id") String id);
//根据输入id查询是否生成详单 //根据输入id查询是否生成详单
@Select("select count(*) from DETAIL_RECEIPT_LIST where ACCEPT_NO=(select accept_no from prod_card_t@prod_link where id_no=#{id})") @Select("select count(*) from DETAIL_RECEIPT_LIST where ACCEPT_NO=(select accept_no from prod_card_t@prod_link where id_no=#{id})")
public int selectReceiptById(@Param("id") String id); public int selectReceiptById(@Param("id") String id);
@Select("select \n" + @Select("select \n" +
"count(prod_trace_t.download_no)as download,\n" + "count(prod_trace_t.download_no)as download,\n" +
"count(prod_trace_t.checker_no) as checkerCount,\n" + "count(prod_trace_t.checker_no) as checkerCount,\n" +
...@@ -169,8 +157,6 @@ public interface ReceiptMapper { ...@@ -169,8 +157,6 @@ public interface ReceiptMapper {
"WHERE (subStr(ACCEPT_NO,0,8) = #{groupNo} or ACCEPT_NO=#{groupNo}) and prod_trace_t.accept_no not in (select special_card.accept_no from special_card ) ") "WHERE (subStr(ACCEPT_NO,0,8) = #{groupNo} or ACCEPT_NO=#{groupNo}) and prod_trace_t.accept_no not in (select special_card.accept_no from special_card ) ")
public Map<String,Object> selectCountTime(@Param("groupNo") String groupNo); public Map<String,Object> selectCountTime(@Param("groupNo") String groupNo);
@Select("select \n" + @Select("select \n" +
"count(prod_trace_t.download_no)as download,\n" + "count(prod_trace_t.download_no)as download,\n" +
"count(prod_trace_t.checker_no) as checkerCount,\n" + "count(prod_trace_t.checker_no) as checkerCount,\n" +
...@@ -179,7 +165,6 @@ public interface ReceiptMapper { ...@@ -179,7 +165,6 @@ public interface ReceiptMapper {
"WHERE ACCEPT_NO=#{groupNo}") "WHERE ACCEPT_NO=#{groupNo}")
public Map<String,Object> selectCountTimeT(@Param("groupNo") String groupNo); public Map<String,Object> selectCountTimeT(@Param("groupNo") String groupNo);
@Select("select \n" + @Select("select \n" +
"prod_trace_t.DOWNLOAD_DATE as downloadDate,\n" + "prod_trace_t.DOWNLOAD_DATE as downloadDate,\n" +
"prod_trace_t.CHECK_DATE as checkDate,\n" + "prod_trace_t.CHECK_DATE as checkDate,\n" +
...@@ -206,7 +191,6 @@ public interface ReceiptMapper { ...@@ -206,7 +191,6 @@ public interface ReceiptMapper {
" where to_char(CHECK_DATE,'yyyyMMdd') = ${date} and RECEIPT_LIST.POLICE_CODE in (${string}) and CARD_TYPE_DIC.CARD_TYPE_ID=${type} ") " where to_char(CHECK_DATE,'yyyyMMdd') = ${date} and RECEIPT_LIST.POLICE_CODE in (${string}) and CARD_TYPE_DIC.CARD_TYPE_ID=${type} ")
public List<Map<String,Object>> selectReceiptDate(@Param("date") String date,@Param("string") String string,@Param("type") long type); public List<Map<String,Object>> selectReceiptDate(@Param("date") String date,@Param("string") String string,@Param("type") long type);
@Select("select DETAIL_RECEIPT_LIST.* , GAJG_DM.GAJG_MC from DETAIL_RECEIPT_LIST LEFT JOIN GAJG_DM ON GAJG_DM.GAJG_DM =DETAIL_RECEIPT_LIST.POLICE_CODE where ACCEPT_NO=#{acceptNo} or card_id=#{acceptNo}") @Select("select DETAIL_RECEIPT_LIST.* , GAJG_DM.GAJG_MC from DETAIL_RECEIPT_LIST LEFT JOIN GAJG_DM ON GAJG_DM.GAJG_DM =DETAIL_RECEIPT_LIST.POLICE_CODE where ACCEPT_NO=#{acceptNo} or card_id=#{acceptNo}")
@Options(useGeneratedKeys=true, keyProperty="gajg_mc", keyColumn="GAJG_MC") @Options(useGeneratedKeys=true, keyProperty="gajg_mc", keyColumn="GAJG_MC")
public DetailReceiptListEntity selectDetailByAcceptNo(@Param("acceptNo") String acceptNo); public DetailReceiptListEntity selectDetailByAcceptNo(@Param("acceptNo") String acceptNo);
......
src/main/resources/static/dialogs/confirmToDownload.html
View file @ 6bfb214c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
提示 提示
</div> </div>
<div class="ui-dialog-content"> <div class="ui-dialog-content">
<div>确认下载{{count}}条记录吗？</div> <div>下载格口文件导入日期为：{{importDate}} 的<strong>{{count}}</strong>条记录</div>
</div> </div>
<div class="ui-dialog-confirm"> <div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-click="confirmDownload()">确认</button> <button type="submit" class="btn btn-info" ng-click="confirmDownload()">确认</button>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ 6bfb214c
...@@ -42,13 +42,12 @@ ...@@ -42,13 +42,12 @@
<td><input type="text" class="form-control" ng-model="emailNo" placeholder="邮件号"></td> <td><input type="text" class="form-control" ng-model="emailNo" placeholder="邮件号"></td>
</tr> </tr>
<tr> <tr>
<td>打印状态:</td> <td>数据状态:</td>
<td style="text-align: left;"> <td style="text-align: left;">
<select class="form-control select2" id="print" <select class="form-control select2" id="notNull" ng-model="isValid">
ng-model="isPrint"> <option value="">--请选择数据状态--</option>
<option value="">--请选择打印状态--</option> <option value="1">有效记录</option>
<option value="1">已打印</option> <option value="0">无效记录</option>
<option value="0">未打印</option>
</select> </select>
</td> </td>
<td >格口:</td> <td >格口:</td>
...@@ -72,12 +71,13 @@ ...@@ -72,12 +71,13 @@
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
<td>数据状态:</td> <td>打印状态:</td>
<td style="text-align: left;"> <td style="text-align: left;">
<select class="form-control select2" id="notNull" ng-model="isValid"> <select class="form-control select2" id="print"
<option value="">--请选择数据状态--</option> ng-model="isPrint">
<option value="1">有效记录</option> <option value="">--请选择打印状态--</option>
<option value="0">无效记录</option> <option value="1">已打印</option>
<option value="0">未打印</option>
</select> </select>
</td> </td>
<td colspan="2"> <td colspan="2">
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ 6bfb214c
...@@ -205,6 +205,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -205,6 +205,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}) })
} }
$scope.downloadExcel = function(){ $scope.downloadExcel = function(){
var date =$('#datepicker').val();
ngDialog.open({ ngDialog.open({
template: 'dialogs/confirmToDownload.html' + urlTimeStamp(), template: 'dialogs/confirmToDownload.html' + urlTimeStamp(),
width: 800, width: 800,
...@@ -212,6 +213,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -212,6 +213,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
closeByDocument:false, closeByDocument:false,
controller: ['$scope',function ($scope) { controller: ['$scope',function ($scope) {
getCount() getCount()
$scope.importDate = date;
$scope.confirmDownload = function () { $scope.confirmDownload = function () {
var url = '../personPostApi/download?'; var url = '../personPostApi/download?';
var a = document.createElement("a"); var a = document.createElement("a");
......
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