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

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

@@ -74,7 +74,6 @@ public class AdminApi {
         flag = userInfoService.addUser(userInfo, Integer.parseInt(jsonObject.getString("roleId")));
         if (flag) {
             map.put("resultMsg", "添加成功");
-
         } else {
             map.put("resultMsg", "添加失败");
         }

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

@@ -5,6 +5,7 @@ import com.yxproject.start.entity.TaskList.CountGajgEntity;
 import com.yxproject.start.entity.TaskList.TaskListEntity;
 import com.yxproject.start.service.TaskListService;
 import net.sf.json.JSONObject;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -77,4 +78,68 @@ public class TaskListApi {
         return true;
     }
 
+    /**
+     * 根据上传时间查询数据(用于生成任务单)
+     * @param date
+     * @return
+     */
+    @RequestMapping("selectByDate")
+    public String selectByDate(@Param("date") String date){
+
+        String result = "[\n" +
+                "    {\n" +
+                "        typeCode: '1',\n" +
+                "        typeName: '普通证',\n" +
+                "        typeSum: 300,\n" +
+                "        isActive: 'true',\n" +
+                "        countyList: [\n" +
+                "            {\n" +
+                "                taskId: '20190228001',\n" +
+                "                county: '西城区',\n" +
+                "                groupNo: '00234653-03687587',\n" +
+                "                valid: 240,\n" +
+                "                invalid: 0\n" +
+                "            },\n" +
+                "            {\n" +
+                "                taskId: '20190228001',\n" +
+                "                county: '东城区',\n" +
+                "                groupNo: '00234653-03687587',\n" +
+                "                valid: 240,\n" +
+                "                invalid: 0\n" +
+                "            },\n" +
+                "            {\n" +
+                "                taskId: '20190228001',\n" +
+                "                county: '海淀区',\n" +
+                "                groupNo: '00234653-03687587',\n" +
+                "                valid: 240,\n" +
+                "                invalid: 0\n" +
+                "            }\n" +
+                "        ]\n" +
+                "    },\n" +
+                "    {\n" +
+                "        typeCode: '9',\n" +
+                "        typeName: '邮寄证',\n" +
+                "        typeSum: 500,\n" +
+                "        isActive: 'false',\n" +
+                "        countyList: [\n" +
+                "            {\n" +
+                "                taskId: '20190228001',\n" +
+                "                county: '朝阳区',\n" +
+                "                groupNo: '00234653-03687587',\n" +
+                "                valid: 240,\n" +
+                "                invalid: 0\n" +
+                "            },\n" +
+                "            {\n" +
+                "                taskId: '20190228001',\n" +
+                "                county: '昌平区',\n" +
+                "                groupNo: '00234653-03687587',\n" +
+                "                valid: 240,\n" +
+                "                invalid: 0\n" +
+                "            }\n" +
+                "        ]\n" +
+                "    }\n" +
+                "]";
+        return result;
+    }
+
 }

src/main/java/com/yxproject/start/entity/PersonPostEntity.java

@@ -5,12 +5,12 @@ import java.sql.Time;
 import java.util.Objects;
 
 @Entity
-@Table(name = "PERSON_POST", schema = "YINGXIN", catalog = "")
+@Table(name = "PERSON_POST", schema = "YX", catalog = "")
 public class PersonPostEntity {
     private String waybillNumber;
     private String backWaybillNumber;
     private String orderNumber;
-    private Time createDate;
+    private String createDate;
     private String openid;
     private String wcPlayOrderNumber;
     private String playState;
@@ -37,7 +37,12 @@ public class PersonPostEntity {
     private Time validPeriodEnd;
     private String note;
     private Long state;
+    private Time uploadDate;
     private Long fileId;
+    private Time analysisDate;
+    private Time printDate;
+    private Time formStartTime;
+    private Time formDeadline;
 
     @Id
     @Column(name = "WAYBILL_NUMBER")
@@ -71,11 +76,11 @@ public class PersonPostEntity {
 
     @Basic
     @Column(name = "CREATE_DATE")
-    public Time getCreateDate() {
+    public String getCreateDate() {
         return createDate;
     }
 
-    public void setCreateDate(Time createDate) {
+    public void setCreateDate(String createDate) {
         this.createDate = createDate;
     }
 
@@ -339,6 +344,15 @@ public class PersonPostEntity {
         this.state = state;
     }
 
+    @Basic
+    @Column(name = "UPLOAD_DATE")
+    public Time getUploadDate() {
+        return uploadDate;
+    }
+
+    public void setUploadDate(Time uploadDate) {
+        this.uploadDate = uploadDate;
+    }
 
     @Basic
     @Column(name = "FILE_ID")
@@ -350,6 +364,45 @@ public class PersonPostEntity {
         this.fileId = fileId;
     }
 
+    @Basic
+    @Column(name = "ANALYSIS_DATE")
+    public Time getAnalysisDate() {
+        return analysisDate;
+    }
+
+    public void setAnalysisDate(Time analysisDate) {
+        this.analysisDate = analysisDate;
+    }
+
+    @Basic
+    @Column(name = "PRINT_DATE")
+    public Time getPrintDate() {
+        return printDate;
+    }
+
+    public void setPrintDate(Time printDate) {
+        this.printDate = printDate;
+    }
+
+    @Basic
+    @Column(name = "FORM_START_TIME")
+    public Time getFormStartTime() {
+        return formStartTime;
+    }
+
+    public void setFormStartTime(Time formStartTime) {
+        this.formStartTime = formStartTime;
+    }
+
+    @Basic
+    @Column(name = "FORM_DEADLINE")
+    public Time getFormDeadline() {
+        return formDeadline;
+    }
+
+    public void setFormDeadline(Time formDeadline) {
+        this.formDeadline = formDeadline;
+    }
 
     @Override
     public boolean equals(Object o) {
@@ -386,11 +439,16 @@ public class PersonPostEntity {
                 Objects.equals(validPeriodEnd, that.validPeriodEnd) &&
                 Objects.equals(note, that.note) &&
                 Objects.equals(state, that.state) &&
-                Objects.equals(fileId, that.fileId) ;
+                Objects.equals(uploadDate, that.uploadDate) &&
+                Objects.equals(fileId, that.fileId) &&
+                Objects.equals(analysisDate, that.analysisDate) &&
+                Objects.equals(printDate, that.printDate) &&
+                Objects.equals(formStartTime, that.formStartTime) &&
+                Objects.equals(formDeadline, that.formDeadline);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(waybillNumber, backWaybillNumber, orderNumber, createDate, openid, wcPlayOrderNumber, playState, orderState, applicantName, senderName, senderPhone, senderAddress, recipientName, recipientPhone, recipientAddress, orderBlankNumber, getToProvince, getToCity, getToCounty, businessType, latticeMouthInformation, natureOfTheInternal, natureOfTheInformation, firstWhite, idCard, acceptTheMatter, beginUsefulLife, validPeriodEnd, note, state, fileId);
+        return Objects.hash(waybillNumber, backWaybillNumber, orderNumber, createDate, openid, wcPlayOrderNumber, playState, orderState, applicantName, senderName, senderPhone, senderAddress, recipientName, recipientPhone, recipientAddress, orderBlankNumber, getToProvince, getToCity, getToCounty, businessType, latticeMouthInformation, natureOfTheInternal, natureOfTheInformation, firstWhite, idCard, acceptTheMatter, beginUsefulLife, validPeriodEnd, note, state, uploadDate, fileId, analysisDate, printDate, formStartTime, formDeadline);
     }
 }

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

-package com.yxproject.start.mapper;
-
-/**
- * 废证
- * @param
- * @return
- */
-public interface CrippledCardMapper {
-
-}

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

-package com.yxproject.start.mapper;
-
-/**
- * 退证
- */
-public interface ExitCardMapper {
-}

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

-package com.yxproject.start.mapper;
-
-/**
- * 快证
- */
-public interface FastCardMapper {
-
-}

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

-package com.yxproject.start.mapper;
-
-/**
- * 交接单
- */
-public interface HandoverSheetMapper {
-}

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

-package com.yxproject.start.mapper;
-
-/**
- * 余证mapper
- */
-public interface NeedlessCredMapper {
-
-}

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

@@ -12,7 +12,10 @@ import java.util.List;
  */
 @Mapper
 public interface PersonPostMapper {
-    @Update("insert into PERSON_POST ( WAYBILL_NUMBER,BACK_WAYBILL_NUMBER,ORDER_NUMBER,CREATE_DATE,OPENID,WC_PLAY_ORDER_NUMBER,PLAY_STATE,ORDER_STATE,APPLICANT_NAME,SENDER_NAME,SENDER_PHONE,SENDER_ADDRESS,RECIPIENT_NAME,RECIPIENT_PHONE,RECIPIENT_ADDRESS,ORDER_BLANK_NUMBER,GET_TO_PROVINCE,GET_TO_CITY,GET_TO_COUNTY,BUSINESS_TYPE,LATTICE_MOUTH_INFORMATION,NATURE_OF_THE_INTERNAL,NATURE_OF_THE_INFORMATION,FIRST_WHITE,UPLOAD_DATE) values (#{waybillNumber},#{backWaybillNumber},#{orderNumber},#{createDate},#{openid},#{wcPlayOrderNumber},#{playState},#{orderState},#{applicantName},#{senderName},#{senderPhone},#{senderAddress},#{recipientName},#{recipientPhone},#{recipientAddress},#{orderBlankNumber},#{getToProvince},#{getToCity},#{getToCounty},#{businessType},#{latticeMouthInformation},#{natureOfTheInternal},#{natureOfTheInformation},#{firstWhite},#(uploadDate))")
+    @Update("insert into PERSON_POST " +
+            "( WAYBILL_NUMBER,BACK_WAYBILL_NUMBER,ORDER_NUMBER,CREATE_DATE,OPENID,WC_PLAY_ORDER_NUMBER,PLAY_STATE,ORDER_STATE,APPLICANT_NAME,SENDER_NAME,SENDER_PHONE,SENDER_ADDRESS,RECIPIENT_NAME,RECIPIENT_PHONE,RECIPIENT_ADDRESS,ORDER_BLANK_NUMBER,GET_TO_PROVINCE,GET_TO_CITY,GET_TO_COUNTY,BUSINESS_TYPE,LATTICE_MOUTH_INFORMATION,NATURE_OF_THE_INTERNAL,NATURE_OF_THE_INFORMATION,FIRST_WHITE) " +
+            "values " +
+            "(#{waybillNumber},#{backWaybillNumber},#{orderNumber},#{createDate},#{openid},#{wcPlayOrderNumber},#{playState},#{orderState},#{applicantName},#{senderName},#{senderPhone},#{senderAddress},#{recipientName},#{recipientPhone},#{recipientAddress},#{orderBlankNumber},#{getToProvince},#{getToCity},#{getToCounty},#{businessType},#{latticeMouthInformation},#{natureOfTheInternal},#{natureOfTheInformation},#{firstWhite})")
     public boolean savePersonPost(PersonPostEntity personPostEntity);
 
     @Update("update prepro_person p set IS_POST=9  where p.JMSFZSLH in ( select p.JMSFZSLH from prepro_person p left join files files on p.file_id=files.ID \n" +

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

-package com.yxproject.start.mapper;
-
-/**
- * 查询证件信息
- */
-public interface QueryCardMapper {
-
-}

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

-package com.yxproject.start.mapper;
-
-/**
- * 身份证详单
- */
-public interface SaveCardDetailListMapper {
-}

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

@@ -91,5 +91,11 @@ public interface TaskListMapper {
     public List<CountCountyEntity> selectTaskByCounty(@Param("submitDate") String submitDate,@Param("taskState")String taskState);
 
 
+    /**
+     * 生成快证任务单
+     */
+    @Update("")
+    public boolean createFastCard (@Param("acceptNo")String accept);
+
 
 }

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

@@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.xml.crypto.Data;
+import java.sql.Time;
 import java.util.Date;
 import java.util.List;
 
@@ -27,8 +29,7 @@ public class PersonPostServiceImpl implements PersonPostService {
     @Transactional(rollbackFor = Exception.class)
     public boolean savePersonPost(List<PersonPostEntity> personPostEntities) {
         for (PersonPostEntity personPostEntity: personPostEntities) {
-            personPostEntity.setCreateDate(new java.sql.Time(new Date().getTime()));
-            boolean b = personPostMapper.savePersonPost(personPostEntity);
+            personPostMapper.savePersonPost(personPostEntity);
         }
         return true;
     }

src/main/java/com/yxproject/start/utils/ReadExcel.java

@@ -4,7 +4,9 @@ import jxl.Sheet;
 import jxl.Workbook;
 import jxl.read.biff.BiffException;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -14,12 +16,12 @@ import java.util.List;
 public class ReadExcel {
 
     // 去读Excel的方法readExcel，该方法的入口参数为一个File对象
-    public List readExcel(File  file) {
+    public List readExcel(File file) {
         try {
-            // 创建输入流，读取Excel
-            InputStream is = new FileInputStream(file.getAbsolutePath());
+//            // 创建输入流，读取Excel
+//            InputStream is = new FileInputStream(file.getAbsolutePath());
             // jxl提供的Workbook类
-            Workbook wb = Workbook.getWorkbook(is);
+            Workbook wb = Workbook.getWorkbook(file);
             // Excel的页签数量
             int sheet_size = wb.getNumberOfSheets();
             for (int index = 0; index < sheet_size; index++) {