Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 7ec8068f authored by wuzhilong's avatar wuzhilong
Browse files
Options

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

# Conflicts:
#	src/main/resources/static/views/searchCard/searchCard.html
#	src/main/resources/static/views/task/taskListSorting.html
parents 9f87dfd3 92077503
Hide whitespace changes
Inline Side-by-side
Showing with 195 additions and 148 deletions
src/main/java/com/yxproject/start/api/FailedCardApi.java
View file @ 7ec8068f
...@@ -79,7 +79,7 @@ public class FailedCardApi { ...@@ -79,7 +79,7 @@ public class FailedCardApi {
} else { } else {
idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId")); idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));
} }
int initiator = Integer.parseInt(jsonObject.getString("initiator")) - 2; int initiator = Integer.parseInt(jsonObject.getString("initiator")) - 1;
failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note")); failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"));
} }
return true; return true;
......
src/main/java/com/yxproject/start/api/InfoManagementApi.java
View file @ 7ec8068f
...@@ -37,16 +37,16 @@ public class InfoManagementApi { ...@@ -37,16 +37,16 @@ public class InfoManagementApi {
/** /**
* 查询制证信息数据条数 * 查询制证信息数据条数
* @param beginFileName * @param beginFileId 开始包号
* @param endFileName * @param endFileId 结束包号
* @param gajgMc * @param gajgMc 派出所代码
* @param beginDate * @param beginDate
* @param endDate * @param endDate
* @return * @return
*/ */
@RequestMapping("selectCount") @RequestMapping("selectCount")
public long selectCount(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){ public long selectCount(@Param("beginFileId")String beginFileId, @Param("endFileId")String endFileId, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){
long count= infoManagementService.count(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate)); long count= infoManagementService.count(beginFileId,endFileId,gajgMc,replaceDate(beginDate),replaceDate(endDate));
return count; return count;
} }
......
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ 7ec8068f
package com.yxproject.start.api; package com.yxproject.start.api;
import com.yxproject.start.entity.DetailReceiptListEntity; import com.yxproject.start.entity.DetailReceiptListEntity;
import com.yxproject.start.entity.ReceiptListEntity;
import com.yxproject.start.service.ReceiptService; import com.yxproject.start.service.ReceiptService;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -42,14 +43,19 @@ public class ReceiptApi { ...@@ -42,14 +43,19 @@ public class ReceiptApi {
if (countAccept == 0) { if (countAccept == 0) {
//查询特证交接单所需数据 //查询特证交接单所需数据
Map<String, Object> resultDate = receiptService.selectReceiptListDate(id); Map<String, Object> resultDate = receiptService.selectReceiptListDate(id);
String acceptNo = (String) resultDate.get("ACCEPT_NO"); ReceiptListEntity receiptListEntity = new ReceiptListEntity();
String GAJG_DM = (String) resultDate.get("GAJG_DM"); receiptListEntity.setPoliceCode(resultDate.get("GAJG_DM").toString());
int cardType = (int) resultDate.get("CARD_TYPE"); receiptListEntity.setCardTypeId(Long.valueOf((BigDecimal)resultDate.get("CARD_TYPE")+""));
int oldCardType = (int) resultDate.get("OLD_CARD_TYPE"); if ("null".equals(resultDate.get("OLD_CARD_TYPE")+"")){
int state = 0;
int count = (int) resultDate.get("COUNT"); }else {
receiptListEntity.setOldCardTypeId(Long.valueOf(resultDate.get("OLD_CARD_TYPE")+""));
}
receiptListEntity.setFinishCount(Long.valueOf(resultDate.get("VALID_COUNT").toString()));
receiptListEntity.setQrCode(resultDate.get("GROUP_NO").toString());
receiptListEntity.setState((long)0);
//生成特证交接单 //生成特证交接单
receiptService.createReceiptList(acceptNo, GAJG_DM, count, state,cardType,oldCardType); receiptService.createReceiptList(receiptListEntity);
//查询特证详单所需数据 //查询特证详单所需数据
Map<String, Object> detailedData = receiptService.selectDetailedData(id); Map<String, Object> detailedData = receiptService.selectDetailedData(id);
...@@ -68,18 +74,23 @@ public class ReceiptApi { ...@@ -68,18 +74,23 @@ public class ReceiptApi {
} else { } else {
//查询交接单所需数据 //查询交接单所需数据
Map<String, Object> receiptListDate = receiptService.selectReceiptListDate(id); Map<String, Object> receiptListDate = receiptService.selectReceiptListDate(id);
String groupNo = (String) receiptListDate.get("GROUP_NO"); ReceiptListEntity receiptListEntity = new ReceiptListEntity();
String GAJG_DM = (String) receiptListDate.get("GAJG_DM"); receiptListEntity.setPoliceCode(receiptListDate.get("GAJG_DM").toString());
int cardType = (int) receiptListDate.get("CARD_TYPE"); receiptListEntity.setCardTypeId(Long.valueOf((BigDecimal)receiptListDate.get("CARD_TYPE")+""));
int oldCardType = (int) receiptListDate.get("OLD_CARD_TYPE"); if ("null".equals(receiptListDate.get("OLD_CARD_TYPE")+"")){
int count = Integer.valueOf(receiptListDate.get("VALID_COUNT").toString());
int state = 0; }else {
receiptListEntity.setOldCardTypeId(Long.valueOf(receiptListDate.get("OLD_CARD_TYPE")+""));
}
receiptListEntity.setFinishCount(Long.valueOf(receiptListDate.get("VALID_COUNT").toString()));
receiptListEntity.setQrCode(receiptListDate.get("GROUP_NO").toString());
receiptListEntity.setState((long)0);
//查询这个组号是否生成了交接单 //查询这个组号是否生成了交接单
int countGroup = receiptService.selectByGroupNo(groupNo); int countGroup = receiptService.selectByGroupNo(receiptListDate.get("GROUP_NO").toString());
//没有生成交接单 //没有生成交接单
if (countGroup == 0) { if (countGroup == 0) {
//生成交接单 //生成交接单
receiptService.createReceiptList(groupNo,GAJG_DM,count,state,cardType,oldCardType); receiptService.createReceiptList(receiptListEntity);
//查询这个身份证是否生成了详单 //查询这个身份证是否生成了详单
int receiptCount = receiptService.selectReceiptById(id); int receiptCount = receiptService.selectReceiptById(id);
//没有生成交接单详单 //没有生成交接单详单
...@@ -118,10 +129,10 @@ public class ReceiptApi { ...@@ -118,10 +129,10 @@ public class ReceiptApi {
} }
} }
//查询有几个特证 //查询有几个特证
int specialCardCount = receiptService.selectSpecialCard(groupNo); int specialCardCount = receiptService.selectSpecialCard(receiptListDate.get("GROUP_NO").toString());
//减去特证个数 //减去特证个数
int finishCount = receiptService.selectCount(groupNo) - specialCardCount; int finishCount = receiptService.selectCount(receiptListDate.get("GROUP_NO").toString()) - specialCardCount;
receiptService.updateFinishCount(groupNo, finishCount); receiptService.updateFinishCount(receiptListDate.get("GROUP_NO").toString(), finishCount);
} }
......
src/main/java/com/yxproject/start/api/SelectApi.java
View file @ 7ec8068f
...@@ -41,25 +41,20 @@ public class SelectApi { ...@@ -41,25 +41,20 @@ public class SelectApi {
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByGroupNo(id); List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByGroupNo(id);
List<Map<String, Object>> ACCdata = new ArrayList<>(); List<Map<String, Object>> ACCdata = new ArrayList<>();
List<Map<String, Object>> PRODData = new ArrayList<>(); List<Map<String, Object>> PRODData = new ArrayList<>();
resultMap.put("workOrderData", workOrderData); resultMap.put("workOrderData", workOrderData);
resultMap.put("ACCdata", ACCdata); resultMap.put("ACCdata", ACCdata);
resultMap.put("PRODData", PRODData); resultMap.put("PRODData", PRODData);
} else if (id.length() == 10 || id.length() == 18) { } else if (id.length() == 10 || id.length() == 18) {
//查询是否是特证，如果是，返回新的任务单信息 //查询是否是特证，如果是，返回新的任务单信息
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id);
List<Map<String, Object>> mapList = groupNoService.selectAcceptNo(id); if (workOrderData.size()!=0){
if (mapList.size()>0){
id = mapList.get(0).get("ACCEPT_NO").toString();
}
if (selectSerialNumberService.selectCount(id)==0){
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
resultMap.put("workOrderData", workOrderData); resultMap.put("workOrderData", workOrderData);
}else { }else {
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id); List<Map<String, Object>> workOrderData2 = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
resultMap.put("workOrderData", workOrderData); resultMap.put("workOrderData", workOrderData2);
} }
List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id); List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id);
List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id); List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id);
......
src/main/java/com/yxproject/start/mapper/FileNameDicMapper.java
View file @ 7ec8068f
...@@ -43,7 +43,7 @@ public interface FileNameDicMapper { ...@@ -43,7 +43,7 @@ public interface FileNameDicMapper {
"<if test='analysisState != -1 ' >" + "<if test='analysisState != -1 ' >" +
" and STATE =#{analysisState}" + " and STATE =#{analysisState}" +
"</if>" + "</if>" +
"<if test='uploadDate !=null' >" + "<if test='uploadDate !=\"\" ' >" +
" and substr(UPLOAD_DATE,0,8) =#{uploadDate}" + " and substr(UPLOAD_DATE,0,8) =#{uploadDate}" +
"</if>" + "</if>" +
"<if test='fileName != null ' >" + "<if test='fileName != null ' >" +
...@@ -65,7 +65,7 @@ public interface FileNameDicMapper { ...@@ -65,7 +65,7 @@ public interface FileNameDicMapper {
"<if test='analysisState != -1' >" + "<if test='analysisState != -1' >" +
" and STATE =#{analysisState}" + " and STATE =#{analysisState}" +
"</if>" + "</if>" +
"<if test='uploadDate !=null' >" + "<if test='uploadDate !=\"\"' >" +
" and substr(UPLOAD_DATE,0,8) = #{uploadDate}" + " and substr(UPLOAD_DATE,0,8) = #{uploadDate}" +
"</if>" + "</if>" +
"<if test='fileName != null ' >" + "<if test='fileName != null ' >" +
......
src/main/java/com/yxproject/start/mapper/InfoManagementMapper.java
View file @ 7ec8068f
...@@ -18,10 +18,10 @@ public interface InfoManagementMapper { ...@@ -18,10 +18,10 @@ public interface InfoManagementMapper {
"FROM (select * from new_files \n" + "FROM (select * from new_files \n" +
"where 1=1\n" + "where 1=1\n" +
"<if test='beginFileName != \"\" '>" + "<if test='beginFileName != \"\" '>" +
"and (NEW_FILE_NAME between(#{beginFileName})and (#{endFileName}))\n" + "and (id between #{beginFileName} and #{endFileName} )\n" +
"</if>" + "</if>" +
"<if test='gajgMc != \"\" '>" + "<if test='gajgMc != \"\" '>" +
"and DWMC=#{gajgMc}\n" + "and DWMC like #{gajgMc} \n" +
"</if>" + "</if>" +
"<if test='beginDate != \"\" '>" + "<if test='beginDate != \"\" '>" +
"and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate}))"+ "and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate}))"+
...@@ -38,10 +38,10 @@ public interface InfoManagementMapper { ...@@ -38,10 +38,10 @@ public interface InfoManagementMapper {
"SELECT COUNT(*) FROM NEW_FILES \n" + "SELECT COUNT(*) FROM NEW_FILES \n" +
"where 1=1\n" + "where 1=1\n" +
"<if test='beginFileName != \"\" '>" + "<if test='beginFileName != \"\" '>" +
"and (NEW_FILE_NAME between(#{beginFileName})and (#{endFileName}))\n" + "and (id between #{beginFileName})and #{endFileName}))\n" +
"</if>" + "</if>" +
"<if test='gajgMc != \"\" '>" + "<if test='gajgMc != \"\" '>" +
"and DWMC=#{gajgMc}\n" + "and DWMC like #{gajgMc}\n" +
"</if>" + "</if>" +
"<if test='beginDate != \"\" '>" + "<if test='beginDate != \"\" '>" +
"and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate}))"+ "and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate}))"+
......
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ 7ec8068f
...@@ -78,7 +78,7 @@ public interface LogMapper { ...@@ -78,7 +78,7 @@ public interface LogMapper {
" FROM (SELECT NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC " + " FROM (SELECT NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC " +
" FROM NEW_FILES " + " FROM NEW_FILES " +
" RIGHT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" + " RIGHT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" +
" where 1=1 " + " where 1=1 and PREPRO_PERSON.NEW_FILE_ID is not null " +
" <if test='newFileName !=\"\"' >" + " <if test='newFileName !=\"\"' >" +
" and NEW_FILES.NEW_FILE_NAME=#{newFileName} " + " and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
" </if>" + " </if>" +
...@@ -89,7 +89,7 @@ public interface LogMapper { ...@@ -89,7 +89,7 @@ public interface LogMapper {
" and substr(NEW_FILES.CREATE_DATE,0,8)=#{createDate}" + " and substr(NEW_FILES.CREATE_DATE,0,8)=#{createDate}" +
" </if>" + " </if>" +
" <if test='cardId !=\"\"' >" + " <if test='cardId !=\"\"' >" +
" and PREPRO_PERSON.GMSFHM=#{cardId} " + " and PREPRO_PERSON.GMSFHM=#{cardId} ORDER by CREATE_DATE " +
" </if>" + " </if>" +
" ) " + " ) " +
" A" + " A" +
...@@ -102,9 +102,7 @@ public interface LogMapper { ...@@ -102,9 +102,7 @@ public interface LogMapper {
public List<CountyDicEntity> getCountyListData(); public List<CountyDicEntity> getCountyListData();
@Select("<script> " + @Select("<script> " +
"SELECT COUNT(*) FROM NEW_FILES \n" + "SELECT COUNT(*) fileCount, PREPRO_PERSON.NEW_FILE_ID FROM NEW_FILES LEFT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID where 1=1 and PREPRO_PERSON.NEW_FILE_ID is not null " +
"LEFT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID " +
" where 1=1 " +
" <if test='newFileName !=\"\"' >" + " <if test='newFileName !=\"\"' >" +
" and NEW_FILES.NEW_FILE_NAME=#{newFileName} " + " and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
" </if>" + " </if>" +
...@@ -117,16 +115,17 @@ public interface LogMapper { ...@@ -117,16 +115,17 @@ public interface LogMapper {
" <if test='cardId !=\"\"' >" + " <if test='cardId !=\"\"' >" +
" and PREPRO_PERSON.GMSFHM=#{cardId} " + " and PREPRO_PERSON.GMSFHM=#{cardId} " +
" </if>" + " </if>" +
" group by PREPRO_PERSON.NEW_FILE_ID" +
"</script>") "</script>")
public int selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate, @Param("uploadCountyCode") String uploadCountyName); public List<Map<String,Object>> selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate, @Param("uploadCountyCode") String uploadCountyName);
// TODO 解析日志总数 // TODO 解析日志总数
@Select("<script> " + @Select("<script> " +
"SELECT COUNT(*) FROM FILES \n" + "SELECT COUNT(*) FROM ANALYSIS \n" +
"LEFT JOIN ANALYSIS ON ANALYSIS.FILE_ID =FILES.ID "+ "LEFT JOIN FILES ON ANALYSIS.FILE_ID =FILES.ID "+
"LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=ANALYSIS.FILE_DIC_ID " + "LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=ANALYSIS.FILE_DIC_ID " +
"where 1=1 " + "where 1=1 " +
"<if test='fileName !=\"\"' >" + "<if test='fileName !=\"\"' >" +
"and FILES.SOURCE_FILE_NAME=#{fileName} " + "and FILES.SOURCE_FILE_NAME=#{fileName} " +
"</if>" + "</if>" +
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ 7ec8068f
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import com.yxproject.start.entity.DetailReceiptListEntity; import com.yxproject.start.entity.DetailReceiptListEntity;
import com.yxproject.start.entity.ReceiptListEntity;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
import java.util.Date; import java.util.Date;
...@@ -27,8 +28,17 @@ public interface ReceiptMapper { ...@@ -27,8 +28,17 @@ public interface ReceiptMapper {
public int selectByGroupNo(String groupNo); public int selectByGroupNo(String groupNo);
//生成交接单 //生成交接单
@Insert("INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID,OLD_CARD_TYPE_ID)VALUES(#{GROUP_NO},#{GAJG_DM},#{count},#{state},#{cardType},#{oldCardType})") @Insert("<script>" +
public boolean createReceiptList(@Param("GROUP_NO")String GROUP_NO,@Param("GAJG_DM")String GAJG_DM,@Param("count")int count,@Param("state")int state,@Param("cardType")int cardType,@Param("oldCardType")int oldCardType); " INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID" +
"<if test ='oldCardTypeId !=null'> " +
",OLD_CARD_TYPE_ID" +
"</if> " +
")VALUES(#{qrCode},#{policeCode},#{finishCount},#{state},#{cardTypeId}" +
"<if test ='oldCardTypeId !=null'> " +
",#{oldCardTypeId}" +
"</if> " +
") </script>")
public boolean createReceiptList(ReceiptListEntity receiptListEntity);
......
src/main/java/com/yxproject/start/mapper/SelectSerialNumberMapper.java
View file @ 7ec8068f
...@@ -60,7 +60,7 @@ public interface SelectSerialNumberMapper { ...@@ -60,7 +60,7 @@ public interface SelectSerialNumberMapper {
"from TASK \n" + "from TASK \n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" + "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" + "LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" + "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"WHERE GROUP_NO.GROUP_NO =#{id} \n" + "WHERE GROUP_NO.GROUP_NO =#{id} \n" +
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" + "group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" + "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
...@@ -77,45 +77,66 @@ public interface SelectSerialNumberMapper { ...@@ -77,45 +77,66 @@ public interface SelectSerialNumberMapper {
public int selectCount(String id); public int selectCount(String id);
@Select("select DISTINCT " + //查询制证库
"TASK.TASK_ID," + @Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME," + "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
"COUNTY_DIC.COUNTY_CODE," + "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
"CARD_TYPE_DIC.CARD_TYPE," + "TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count\n" +
"CARD_TYPE_DIC.CARD_TYPE_ID," + "from TASK \n" +
"TASK.ISSUED_DATE," + "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"TASK.PRINT_OUT_DATE," + "LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n" +
"TASK.POSITION_DATE," + "LEFT JOIN PROD_CARD_T@PROD_LINK ON SUBSTR(PROD_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO "+
"TASK.CONCORA_CRUSH_DATE, "+ "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"TASK.PUNCHING_DATE," + "WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO=#{id} and GROUP_NO.GROUP_NO is not null\n" +
"TASK.SORTING_DATE," + "group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.QUALITY_TEST_DATE\n" + "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"from TASK\n" + "TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n" +
"LEFT JOIN SPECIAL_CARD ON SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" + "UNION all \n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" + "select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" + "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
"LEFT JOIN GROUP_NO ON TASK.TASK_ID=GROUP_NO.TASK_ID\n" + "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
"LEFT JOIN PROD_DBA.PROD_CARD_T ON subStr(PROD_CARD_T.ACCEPT_NO ,0,8)=GROUP_NO.GROUP_NO \n" + "TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count\n" +
"LEFT JOIN PREPRO_PERSON ON PREPRO_PERSON.GMSFHM = PROD_DBA.PROD_CARD_T.ID_NO\n" + "from TASK \n" +
"WHERE SPECIAL_CARD.ACCEPT_NO=#{id} OR PROD_CARD_T.ID_NO=#{id}") "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"LEFT JOIN PROD_CARD_T@PROD_LINK ON PROD_CARD_T.ACCEPT_NO=SPECIAL_CARD.ACCEPT_NO "+
"WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO=#{id} \n" +
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE")
public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList2(String id); public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList2(String id);
/**
* 查询任务单信息
* @param id
* @return
*/
@Select("select GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
"from TASK\n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"LEFT JOIN GROUP_NO ON TASK.TASK_ID=GROUP_NO.TASK_ID\n" +
"LEFT JOIN PROD_DBA.PROD_CARD_T ON subStr(PROD_CARD_T.ACCEPT_NO ,0,8)=GROUP_NO.GROUP_NO \n" +
"LEFT JOIN PREPRO_PERSON ON PREPRO_PERSON.GMSFHM = PROD_DBA.PROD_CARD_T.ID_NO\n" +
"WHERE PREPRO_PERSON.GMSFHM =#{id} OR PROD_CARD_T.ACCEPT_NO=#{id}")
public List<Map<String,Object>> selectByAcceptNoOrCardIdFromTaskList(String id);
//查询受理库
@Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
"CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
"TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count\n" +
"from TASK \n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN ACC_CARD_T@ACCU_LINK ON SUBSTR(ACC_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO "+
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"WHERE ACC_CARD_T.ACCEPT_NO =#{id} OR ACC_CARD_T.ID_NO=#{id} and GROUP_NO.GROUP_NO is not null\n" +
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n" +
"UNION all \n" +
"select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
"CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
"TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count\n" +
"from TASK \n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"LEFT JOIN ACC_CARD_T@ACCU_LINK ON ACC_CARD_T.ACCEPT_NO=SPECIAL_CARD.ACCEPT_NO "+
"WHERE ACC_CARD_T.ACCEPT_NO =#{id} OR ACC_CARD_T.ID_NO=#{id} \n" +
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE")
public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList(String id);
@Select("SELECT ACC_CARD_T.ACCEPT_NO,\n" + @Select("SELECT ACC_CARD_T.ACCEPT_NO,\n" +
"COUNTY_DIC.COUNTYNAME,\n" + "COUNTY_DIC.COUNTYNAME,\n" +
......
src/main/java/com/yxproject/start/service/ReceiptService.java
View file @ 7ec8068f
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.DetailReceiptListEntity; import com.yxproject.start.entity.DetailReceiptListEntity;
import com.yxproject.start.entity.ReceiptListEntity;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Date; import java.util.Date;
...@@ -11,7 +12,7 @@ public interface ReceiptService { ...@@ -11,7 +12,7 @@ public interface ReceiptService {
public Map<String,Object> selectReceiptListDate(String id); public Map<String,Object> selectReceiptListDate(String id);
public boolean createReceiptList(@Param("GROUP_NO")String GROUP_NO, @Param("GAJG_DM")String GAJG_DM, @Param("count")int count,@Param("state")int state,@Param("cardType")int cardType,@Param("oldCardType")int oldCardType); public boolean createReceiptList(ReceiptListEntity receiptListEntity);
public Map<String,Object>selectDetailedData(String id); public Map<String,Object>selectDetailedData(String id);
......
src/main/java/com/yxproject/start/service/SelectSerialNumberService.java
View file @ 7ec8068f
...@@ -10,8 +10,6 @@ public interface SelectSerialNumberService { ...@@ -10,8 +10,6 @@ public interface SelectSerialNumberService {
List<Map<String, Object>> selectByWorkOrderFromYX(String id); List<Map<String, Object>> selectByWorkOrderFromYX(String id);
/*根据组号查询辅助库*/ /*根据组号查询辅助库*/
List<Map<String, Object>> selectByGroupNo(String id); List<Map<String, Object>> selectByGroupNo(String id);
/*根据身份证号或受理号查询辅助库*/
List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList(String id);
/*根据身份证号或受理号查询受理库*/ /*根据身份证号或受理号查询受理库*/
List<Map<String, Object>> selectByAcceptNoOrCardIdFromACC(String id); List<Map<String, Object>> selectByAcceptNoOrCardIdFromACC(String id);
/*根据身份证号或受理号查询制证库*/ /*根据身份证号或受理号查询制证库*/
...@@ -19,6 +17,8 @@ public interface SelectSerialNumberService { ...@@ -19,6 +17,8 @@ public interface SelectSerialNumberService {
/*查询是否是特证*/ /*查询是否是特证*/
public int selectCount(String id); public int selectCount(String id);
public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList(String id);
public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList2(String id); public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList2(String id);
} }
......
src/main/java/com/yxproject/start/service/impl/InfoManagementServiceImpl.java
View file @ 7ec8068f
...@@ -15,16 +15,16 @@ public class InfoManagementServiceImpl implements InfoManagementService { ...@@ -15,16 +15,16 @@ public class InfoManagementServiceImpl implements InfoManagementService {
@Override @Override
public List<NewFilesEntity> selectInfoManagement(String beginFileName, String endFileName, String gajgMc, String beginDate, String endDate,long currPage,long pageSize) { public List<NewFilesEntity> selectInfoManagement(String beginId, String endId, String gajgMc, String beginDate, String endDate,long currPage,long pageSize) {
List<NewFilesEntity> newFilesEntities = infoManagementMapper.selectInfoManagement(beginFileName, endFileName, gajgMc, beginDate, endDate,currPage * pageSize,(currPage - 1) * pageSize + 1); List<NewFilesEntity> newFilesEntities = infoManagementMapper.selectInfoManagement(beginId, endId, "%"+gajgMc+"%", beginDate, endDate,currPage * pageSize,(currPage - 1) * pageSize + 1);
return newFilesEntities; return newFilesEntities;
} }
@Override @Override
public long count(String beginFileName, String endFileName, String gajgMc, String beginDate, String endDate) { public long count(String beginId, String endId, String gajgMc, String beginDate, String endDate) {
long count= infoManagementMapper.count(beginFileName,endFileName,gajgMc,beginDate,endDate); long count= infoManagementMapper.count(beginId,endId,"%"+gajgMc+"%",beginDate,endDate);
return count; return count;
} }
......
src/main/java/com/yxproject/start/service/impl/LogServiceImpl.java
View file @ 7ec8068f
...@@ -24,8 +24,11 @@ public class LogServiceImpl implements LogService { ...@@ -24,8 +24,11 @@ public class LogServiceImpl implements LogService {
@Override @Override
public int selectNewFileLogCount(String newFileName, String cardId, String createDate, String uploadCountyCode) { public int selectNewFileLogCount(String newFileName, String cardId, String createDate, String uploadCountyCode) {
int count= logMapper.selectNewFileLogCount(newFileName,cardId,createDate,uploadCountyCode); List<Map<String, Object>> mapList = logMapper.selectNewFileLogCount(newFileName, cardId, createDate, uploadCountyCode);
return count; if (mapList.size()>0){
return Integer.valueOf(mapList.get(0).get("FILECOUNT")+"");
}
return 0;
} }
@Override @Override
......
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ 7ec8068f
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.DetailReceiptListEntity; import com.yxproject.start.entity.DetailReceiptListEntity;
import com.yxproject.start.entity.ReceiptListEntity;
import com.yxproject.start.mapper.ReceiptMapper; import com.yxproject.start.mapper.ReceiptMapper;
import com.yxproject.start.service.ReceiptService; import com.yxproject.start.service.ReceiptService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -20,8 +21,8 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -20,8 +21,8 @@ public class ReceiptServiceImpl implements ReceiptService {
} }
@Override @Override
public boolean createReceiptList(String GROUP_NO, String GAJG_DM, int count,int state,int cardType,int oldCardType) { public boolean createReceiptList(ReceiptListEntity receiptListEntity) {
receiptMapper.createReceiptList(GROUP_NO,GAJG_DM,count,state,cardType,oldCardType); receiptMapper.createReceiptList(receiptListEntity);
return true; return true;
} }
......
src/main/java/com/yxproject/start/service/impl/SelectSerialNumberServiceImpl.java
View file @ 7ec8068f
...@@ -26,11 +26,7 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService{ ...@@ -26,11 +26,7 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService{
return result; return result;
} }
@Override
public List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList(String id) {
List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromTaskList(id);
return result;
}
@Override @Override
public List<Map<String, Object>> selectByAcceptNoOrCardIdFromACC(String id) { public List<Map<String, Object>> selectByAcceptNoOrCardIdFromACC(String id) {
...@@ -50,6 +46,12 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService{ ...@@ -50,6 +46,12 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService{
return selectSerialNumberMapper.selectCount(id); return selectSerialNumberMapper.selectCount(id);
} }
@Override
public List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList(String id) {
List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromTaskList(id);
return result;
}
@Override @Override
public List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList2(String id) { public List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList2(String id) {
List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromTaskList2(id); List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromTaskList2(id);
......
src/main/resources/static/js/app.js
View file @ 7ec8068f
...@@ -162,20 +162,26 @@ angular.module('AvatarCheck', [ ...@@ -162,20 +162,26 @@ angular.module('AvatarCheck', [
console.log($rootScope.tab) console.log($rootScope.tab)
} }
$scope.doSearch = function (searchInput) { $scope.doSearch = function (searchInput) {
$scope.msg=""; $scope.msg="";
$scope.alertMsg=""; $scope.alertMsg="";
var pattern = /^[0-9]*$/ $scope.disabledAdd=false;
if(angular.isUndefined(searchInput)||!pattern.test(searchInput)){ // var pattern = /^[0-9]*$/
if(angular.isUndefined(searchInput)){
$location.path("/searchCard"); $location.path("/searchCard");
$scope.msg = "请输入正确的受理号/身份证号/任务单编号"; $scope.msg = "请输入正确的受理号/身份证号/任务单编号";
}else{ }else{
HttpService.searchCards(searchInput, function (data) { HttpService.searchCards(searchInput, function (data) {
if(data==''){ if(data==''){
$scope.searchResult={}
$scope.msg=""; $scope.msg="";
$scope.alertMsg = "暂无数据"; $scope.alertMsg = "暂无数据";
}else{ }else{
$scope.searchResult = data; $scope.searchResult = data;
if($scope.searchResult.workOrderData[0].CARD_TYPE==1){
$scope.disabledAdd=true;
}
console.log($scope.searchResult,"searchResult") console.log($scope.searchResult,"searchResult")
console.log($scope.searchResult.workOrderData,"searchResult.workOrderData") console.log($scope.searchResult.workOrderData,"searchResult.workOrderData")
console.log($scope.searchResult.ACCdata,"searchResult.ACCdata") console.log($scope.searchResult.ACCdata,"searchResult.ACCdata")
......
src/main/resources/static/js/service.js
View file @ 7ec8068f
...@@ -235,9 +235,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -235,9 +235,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(state)){ if(angular.isUndefined(state)){
state=-1; state=-1;
} }
if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(fileName,state,date) console.log(fileName,state,date)
$http({ $http({
method: 'GET', method: 'GET',
...@@ -258,9 +255,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -258,9 +255,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(state)){ if(angular.isUndefined(state)){
state=-1; state=-1;
} }
if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(fileName,state,currentPage,itemsPerPage,date) console.log(fileName,state,currentPage,itemsPerPage,date)
$http({ $http({
method: 'GET', method: 'GET',
...@@ -293,13 +287,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -293,13 +287,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
selectXmlDataCount:function (startPackageNo,endPackageNo,pcs_name,startDate,endDate,success) { selectXmlDataCount:function (startId,endId,pcs_name,startDate,endDate,success) {
$http({ $http({
method: 'GET', method: 'GET',
url: "../InfoManagementApi/selectCount"+urlTimeStamp(), url: "../InfoManagementApi/selectCount"+urlTimeStamp(),
params:{ params:{
beginFileName:startPackageNo, beginFileId:startId,
endFileName:endPackageNo, endFileId:endId,
gajgMc:pcs_name, gajgMc:pcs_name,
beginDate:startDate, beginDate:startDate,
endDate:endDate endDate:endDate
...@@ -319,13 +313,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -319,13 +313,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
deleteProdCards:function (startPackageNo,endPackageNo,pcs_name,startDate,endDate,success) { deleteProdCards:function (startId,endId,pcs_name,startDate,endDate,success) {
$http({ $http({
method: 'GET', method: 'GET',
url: "../InfoManagementApi/deleteInfo"+urlTimeStamp(), url: "../InfoManagementApi/deleteInfo"+urlTimeStamp(),
params:{ params:{
beginFileName:startPackageNo, beginFileName:startId,
endFileName:endPackageNo, endFileName:endId,
gajgMc:pcs_name, gajgMc:pcs_name,
beginDate:startDate, beginDate:startDate,
endDate:endDate endDate:endDate
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ 7ec8068f
...@@ -34,13 +34,13 @@ ...@@ -34,13 +34,13 @@
<div class="box box-primary"> <div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
<td>新包号:</td> <td>文件ID:</td>
<td> <td>
<input type="text" class="form-control" ng-model="startPackageNo" placeholder="起始包号"> <input type="text" class="form-control" ng-model="startId" placeholder="起始ID">
</td> </td>
<td>-</td> <td>-</td>
<td> <td>
<input type="text" class="form-control" ng-model="endPackageNo" placeholder="截至包号"> <input type="text" class="form-control" ng-model="endId" placeholder="截至ID">
</td> </td>
<td>派出所名称：</td> <td>派出所名称：</td>
...@@ -95,8 +95,8 @@ ...@@ -95,8 +95,8 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in xmlDatas"> <tr ng-repeat="item in xmlDatas | orderBy:'id'">
<td>{{$index+1}}</td> <td>{{item.id}}</td>
<td>{{item.dwdm}}</td> <td>{{item.dwdm}}</td>
<td>{{item.dwmc}}</td> <td>{{item.dwmc}}</td>
<td>{{item.recordNumber}}</td> <td>{{item.recordNumber}}</td>
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js
View file @ 7ec8068f
...@@ -13,6 +13,7 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -13,6 +13,7 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
$rootScope.hasOpen = false; $rootScope.hasOpen = false;
$scope.id ='id';
$('.select2').select2(); $('.select2').select2();
//Initialize Select2 Elements //Initialize Select2 Elements
...@@ -54,11 +55,11 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -54,11 +55,11 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
$scope.doXmlQuery = function() { $scope.doXmlQuery = function() {
var startDate=$("#datepicker1").val(); var startDate=$("#datepicker1").val();
var endDate =$("#datepicker2").val(); var endDate =$("#datepicker2").val();
if(angular.isUndefined($scope.startPackageNo)){ if(angular.isUndefined($scope.startId)){
$scope.startPackageNo=''; $scope.startId='';
} }
if(angular.isUndefined($scope.endPackageNo)){ if(angular.isUndefined($scope.endId)){
$scope.endPackageNo=''; $scope.endId='';
} }
if(angular.isUndefined($scope.pcs_name)){ if(angular.isUndefined($scope.pcs_name)){
$scope.pcs_name=''; $scope.pcs_name='';
...@@ -66,13 +67,13 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -66,13 +67,13 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')){ if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')){
MessageService.showAlert("请选择起始日期和结束日期") MessageService.showAlert("请选择起始日期和结束日期")
}else{ }else{
console.log($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage) console.log($scope.startId,$scope.endId,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage)
HttpService.selectXmlDataCount($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,function(data){ HttpService.selectXmlDataCount($scope.startId,$scope.endId,$scope.pcs_name,startDate,endDate,function(data){
$scope.paginationConf.totalItems=data; $scope.paginationConf.totalItems=data;
console.log($scope.paginationConf.totalItems,"count") console.log($scope.paginationConf.totalItems,"count")
}) })
HttpService.selectXmlData($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function (data) { HttpService.selectXmlData($scope.startId,$scope.endId,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function (data) {
$scope.xmlDatas = data; $scope.xmlDatas = data;
console.log($scope.xmlDatas) console.log($scope.xmlDatas)
}) })
...@@ -87,14 +88,14 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -87,14 +88,14 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
$scope.deleteXml = function() { $scope.deleteXml = function() {
var startDate=$("#datepicker1").val(); var startDate=$("#datepicker1").val();
var endDate =$("#datepicker2").val(); var endDate =$("#datepicker2").val();
var startPackageNo = $scope.startPackageNo; var startId = $scope.startId;
var endPackageNo=$scope.endPackageNo; var endId=$scope.endId;
var pcs_name=$scope.pcs_name; var pcs_name=$scope.pcs_name;
if(angular.isUndefined(startPackageNo)){ if(angular.isUndefined(startId)){
startPackageNo=''; startId='';
} }
if(angular.isUndefined(endPackageNo)){ if(angular.isUndefined(endId)){
endPackageNo=''; endId='';
} }
if(angular.isUndefined(pcs_name)){ if(angular.isUndefined(pcs_name)){
pcs_name=''; pcs_name='';
...@@ -110,12 +111,12 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -110,12 +111,12 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
controller: ['$scope', function ($scope) { controller: ['$scope', function ($scope) {
$scope.startDate = startDate; $scope.startDate = startDate;
$scope.endDate = endDate; $scope.endDate = endDate;
HttpService.selectXmlDataCount(startPackageNo,endPackageNo,pcs_name,startDate,endDate,function(data){ HttpService.selectXmlDataCount(startId,endId,pcs_name,startDate,endDate,function(data){
$scope.total=data; $scope.total=data;
console.log($scope.total,"count") console.log($scope.total,"count")
}) })
$scope.confirmDelete = function () { $scope.confirmDelete = function () {
HttpService.deleteProdCards(startPackageNo,endPackageNo,pcs_name,startDate,endDate, function (data) { HttpService.deleteProdCards(startId,endId,pcs_name,startDate,endDate, function (data) {
if(data){ if(data){
MessageService.showAlert("删除成功"); MessageService.showAlert("删除成功");
$scope.closeThisDialog(); $scope.closeThisDialog();
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.html
View file @ 7ec8068f
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
</div> </div>
<input type="text" <input type="text"
class="form-control pull-right" class="form-control pull-right"
ng-model="choseDate"
id="datepicker3" readonly/> id="datepicker3" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
<td>文件名称:</td> <td>文件名称:</td>
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.js
View file @ 7ec8068f
...@@ -28,6 +28,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -28,6 +28,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
$('#datepicker2').datetimepicker({ $('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN', language: 'zh-CN',
...@@ -42,11 +43,13 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -42,11 +43,13 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.uploadExcel = function () { $scope.uploadExcel = function () {
var fd = new FormData(); var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files; var files = document.querySelector('input#id_file_photo_for_check').files;
......
src/main/resources/static/views/searchCard/searchCard.html
View file @ 7ec8068f
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
<td>{{item.COUNTYNAME}}</td> <td>{{item.COUNTYNAME}}</td>
<td>{{item.CARD_TYPE}}</td> <td>{{item.CARD_TYPE}}</td>
<td>{{item.VALID_COUNT}}</td> <td>{{item.VALID_COUNT}}</td>
<td>{{item.SUBMIT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.ISSUED_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td> <td>{{item.ISSUED_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.PRINT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td> <td>{{item.PRINT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.POSITION_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td> <td>{{item.POSITION_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
...@@ -94,8 +93,8 @@ ...@@ -94,8 +93,8 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div style="text-align:right;padding: 10px;padding-top: 0;"> <div style="text-align:right;padding: 10px;padding-top: 0;" ng-if="loginData.roleList[0].process==1">
<button class="btn btn-info" ng-click="addQuickCardAccu()">添加快证</button> <button class="btn btn-info" ng-disabled="disabledAdd" ng-click="addQuickCardAccu()">添加快证</button>
<button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button> <button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button>
</div> </div>
</div> </div>
...@@ -145,8 +144,8 @@ ...@@ -145,8 +144,8 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div style="text-align:right;padding: 10px;padding-top: 0;"> <div style="text-align:right;padding: 10px;padding-top: 0;" ng-if="loginData.roleList[0].process==1">
<button class="btn btn-info" ng-click="addQuickCardProd()">添加快证</button> <button class="btn btn-info" ng-disabled="disabledAdd" ng-click="addQuickCardProd()">添加快证</button>
<button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button> <button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button>
</div> </div>
</div> </div>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ 7ec8068f
...@@ -106,6 +106,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -106,6 +106,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{ }else{
json.uploadDate = $("#datepicker").val(); json.uploadDate = $("#datepicker").val();
} }
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1
}
json.firstIndex=$scope.paginationConf.currentPage; json.firstIndex=$scope.paginationConf.currentPage;
json.pageSize=$scope.paginationConf.itemsPerPage; json.pageSize=$scope.paginationConf.itemsPerPage;
return json; return json;
...@@ -120,8 +123,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -120,8 +123,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
console.log(data) console.log(data)
}) })
} }
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目 // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doQuery); $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doQuery);
......
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