GENGGAIA

src/main/java/com/yxproject/start/api/LogApi.java

@@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.crypto.Data;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -87,12 +90,13 @@ public class LogApi {
 
     /**
      * 根据导入时间查询解析数据
-     * @param uploadName
+     * @param filesId
      * @return
      */
      @RequestMapping("selectAnalysisData")
-     public List<Map<String,Object>> selectAnalysisData(@RequestParam("uploadName")String uploadName){
-         List<Map<String,Object>> resultList = logService.selectAnalysisData(replaceDate(uploadName));
+     public List<Map<String,Object>> selectAnalysisData(@RequestParam("filesId")String filesId){
+
+         List<Map<String,Object>> resultList = logService.selectAnalysisData(filesId);
          return resultList;
      }
 

src/main/java/com/yxproject/start/api/ReceiptApi.java

@@ -70,7 +70,6 @@ public class ReceiptApi {
             } else {
                 //查询交接单所需数据
                 Map<String, Object> receiptListDate = receiptService.selectReceiptListDate(id);
-                System.out.println("111111111111111111111"+receiptListDate);
                 String groupNo = (String) receiptListDate.get("GROUP_NO");
                 String GAJG_DM = (String) receiptListDate.get("GAJG_DM");
                 int cardType = (int) receiptListDate.get("CARD_TYPE");
@@ -79,7 +78,6 @@ public class ReceiptApi {
                 int state = 0;
                 //查询这个组号是否生成了交接单
                 int countGroup = receiptService.selectByGroupNo(groupNo);
-                System.out.println("222222222222222countGroup"+countGroup);
                 //没有生成交接单
                 if (countGroup == 0) {
                     //生成交接单
@@ -95,7 +93,6 @@ public class ReceiptApi {
                         String sex = (String) detailedData.get("SEX");
                         String cardId = (String) detailedData.get("CARD_ID");
                         String gajg_dm = (String) detailedData.get("GAJG_DM");
-                        System.out.println("1111111111111111"+gajg_dm);
                         int receiptId = Integer.parseInt((BigDecimal) detailedData.get("ID") + "");
                         //生成详单
                         receiptService.createDetailedList(uploadNo, acceptNo2, name, id, gajg_dm, receiptId,sex);

src/main/java/com/yxproject/start/mapper/LogMapper.java

@@ -3,6 +3,8 @@ package com.yxproject.start.mapper;
 import com.yxproject.start.entity.CountyDicEntity;
 import org.apache.ibatis.annotations.*;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -11,14 +13,14 @@ public interface LogMapper {
 
 
 
-    @Select("select distinct FILES.UPLOAD_DATE,PERSON_POST.LATTICE_MOUTH_INFORMATION,FILES.RECORD_NUMBER,FILE_NAME_DIC.FORM_START_TIME,FILE_NAME_DIC.FORM_DEADLINE\n" +
+    @Select("select distinct FILES.UPLOAD_DATE,FILES.ID,PERSON_POST.LATTICE_MOUTH_INFORMATION,FILES.RECORD_NUMBER,FILE_NAME_DIC.FORM_START_TIME,FILE_NAME_DIC.FORM_DEADLINE\n" +
             "from PREPRO_PERSON \n" +
             "left join FILES on  PREPRO_PERSON.FILE_ID =FILES.ID\n" +
             "LEFT JOIN PERSON_POST ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH\n" +
             "LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID\n" +
-            "where FILES.CREATE_TIME = #{uploadDate}" +
+            "where FILES.FILES_ID =#{filesId}" +
             "")
-    public List<Map<String,Object>> selectAnalysisData(@Param("uploadDate") String uploadDate);
+    public List<Map<String,Object>> selectAnalysisData(@Param("filesId") String filesId);
 
 
     @Update("UPDATE PREPRO_PERSON SET CARD_TYPE_ID =9 \n" +

src/main/java/com/yxproject/start/mapper/PreproPersonMapper.java

@@ -25,7 +25,7 @@ public interface PreproPersonMapper {
 
 
       /*按条件查询制证数据*/
-    @Select({"<script> select *  from (select a.*,rownum rn from(select JMSFZSLH,xm,XBDM,GMSFHM,CARD_TYPE,PREPRO_PERSON.CARD_TYPE_ID,IS_VALID,SOURCE_FILE_NAME,NEW_FILE_NAME from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = PREPRO_PERSON.CARD_TYPE_ID " +
+    @Select({"<script> select *  from (select a.*,rownum rn from(select JMSFZSLH,xm,XBDM,GMSFHM,CARD_TYPE,PREPRO_PERSON.CARD_TYPE_ID,IS_VALID,FILES.ID,SOURCE_FILE_NAME,NEW_FILE_NAME from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = PREPRO_PERSON.CARD_TYPE_ID " +
             "<where> " +
             " 1=1" +
             "<if test='uploadNo != null '>" +
@@ -56,7 +56,7 @@ public interface PreproPersonMapper {
     public List<Map<String,Object>> selectPreproPerson(@Param("uploadNo") String uploadNo, @Param("IDCard") String IDCard, @Param("oldFile") String oldFile, @Param("newFile") String newFile, @Param("SSXQDM") String SSXQDM, @Param("cardType") String cardType, @Param("state") String state, @Param("uploadDate") String uploadDate, @Param("minNum") long minNum, @Param("maxNum") long maxNum);
 
     /*按条件查询制证数据*/
-    @Select({"<script> select JMSFZSLH,xm,XBDM,GMSFHM,CARD_TYPE,PREPRO_PERSON.CARD_TYPE_ID,IS_VALID,SOURCE_FILE_NAME,NEW_FILE_NAME from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = PREPRO_PERSON.CARD_TYPE_ID " +
+    @Select({"<script> select JMSFZSLH,xm,XBDM,GMSFHM,CARD_TYPE,PREPRO_PERSON.CARD_TYPE_ID,FILES.ID,IS_VALID,SOURCE_FILE_NAME,NEW_FILE_NAME from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = PREPRO_PERSON.CARD_TYPE_ID " +
             "<where> " +
             " 1=1" +
             "<if test='uploadNo != null '>" +

src/main/java/com/yxproject/start/service/LogService.java

@@ -3,6 +3,8 @@ package com.yxproject.start.service;
 
 import com.yxproject.start.entity.CountyDicEntity;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/yxproject/start/service/impl/LogServiceImpl.java

@@ -6,6 +6,8 @@ import com.yxproject.start.service.LogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 @Service