修改查询搜索框详情 任务单出现两个

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

@@ -17,7 +17,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

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

@@ -8,7 +8,6 @@ import com.yxproject.start.service.NewFilesService;
 import com.yxproject.start.service.PreproPersonService;
 import com.yxproject.start.utils.QuerySequenceSercive;
 import com.yxproject.start.utils.ZipUtils;
-import org.apache.commons.lang.time.DateFormatUtils;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
@@ -20,7 +19,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.zip.ZipOutputStream;

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

@@ -3,7 +3,6 @@ package com.yxproject.start.api;
 import com.yxproject.start.entity.FailedCardReasonDicEntity;
 import com.yxproject.start.entity.SpecialCardEntity;
 import com.yxproject.start.entity.TaskEntity;
-import com.yxproject.start.entity.TaskList.TaskListEntity;
 import com.yxproject.start.service.FailedCardService;
 import com.yxproject.start.service.TaskListService;
 import net.sf.json.JSONArray;
@@ -15,7 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 添加废证

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

 package com.yxproject.start.api;
 
-import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
 import com.yxproject.start.entity.CountyDicEntity;
 import com.yxproject.start.service.LogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+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.io.FileOutputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

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

@@ -5,7 +5,6 @@ import com.yxproject.start.entity.PersonPostEntity;
 import com.yxproject.start.service.PersonPostService;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
-import org.apache.ibatis.annotations.Param;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
@@ -19,14 +18,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.DefaultValue;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 

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

@@ -9,7 +9,6 @@ import com.yxproject.start.utils.YXJSONResponse;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -4,11 +4,12 @@ import com.yxproject.start.entity.DetailReceiptListEntity;
 import com.yxproject.start.entity.ReceiptListEntity;
 import com.yxproject.start.service.ReceiptService;
 import net.sf.json.JSONArray;
-import org.apache.ibatis.annotations.Param;
-import org.omg.CORBA.PUBLIC_MEMBER;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
 import java.text.ParseException;

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

@@ -8,21 +8,19 @@ import com.yxproject.start.service.GroupNoService;
 import com.yxproject.start.service.PreproPersonService;
 import com.yxproject.start.service.SpecialCardService;
 import com.yxproject.start.service.TaskListService;
-import com.yxproject.start.utils.YXJSONResponse;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import sun.net.idn.StringPrep;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.transaction.Transactional;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author Administrator

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

@@ -7,8 +7,13 @@ import org.apache.shiro.authc.IncorrectCredentialsException;
 import org.apache.shiro.authc.UnknownAccountException;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
-import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * @author Administrator

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

@@ -2,7 +2,6 @@ package com.yxproject.start.api;
 
 import com.yxproject.start.entity.PreproPersonEntity;
 import com.yxproject.start.service.PreproPersonService;
-import com.yxproject.start.utils.YXJSONResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;

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

@@ -2,6 +2,7 @@ package com.yxproject.start.entity;
 
 import javax.persistence.*;
 import java.sql.Time;
+import java.util.Date;
 import java.util.Objects;
 
 /**
@@ -15,38 +16,38 @@ public class TaskEntity {
     private Long cardType;
     private Long oldCardType;
     private String countyCode;
-    private Time submitDate;
+    private Date submitDate;
     private String submitName;
-    private Time issuedDate;
+    private Date issuedDate;
     private String issuedName;
-    private Time downloadDate;
+    private Date downloadDate;
     private String downloadName;
-    private Time printOutDate;
+    private Date printOutDate;
     private String printOutName;
-    private Time positionDate;
+    private Date positionDate;
     private String positionName;
-    private Time outWorkshopDate;
+    private Date outWorkshopDate;
     private String outWorkshopName;
     private String qualityTestName;
-    private Time qualityTestDate;
+    private Date qualityTestDate;
     private String exceptionInformation;
-    private Time outStorageDate;
+    private Date outStorageDate;
     private String outStorageName;
-    private Time inStorageDate;
+    private Date inStorageDate;
     private String inStorageName;
     private Long taskStateId;
     private Long isException;
     private Long printerId;
     private Long beginPageNumber;
     private Long finishPageNumber;
-    private Time sortOutDate;
-    private Time concoraCrushDate;
+    private Date sortOutDate;
+    private Date concoraCrushDate;
     private String concoraCrushName;
-    private Time punchingDate;
+    private Date punchingDate;
     private String punchingName;
-    private Time sortingDate;
+    private Date sortingDate;
     private String sortingName;
-    private Time connectDate;
+    private Date connectDate;
     private String connectName;
 
     @Id
@@ -91,11 +92,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "SUBMIT_DATE")
-    public Time getSubmitDate() {
+    public Date getSubmitDate() {
         return submitDate;
     }
 
-    public void setSubmitDate(Time submitDate) {
+    public void setSubmitDate(Date submitDate) {
         this.submitDate = submitDate;
     }
 
@@ -111,11 +112,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "ISSUED_DATE")
-    public Time getIssuedDate() {
+    public Date getIssuedDate() {
         return issuedDate;
     }
 
-    public void setIssuedDate(Time issuedDate) {
+    public void setIssuedDate(Date issuedDate) {
         this.issuedDate = issuedDate;
     }
 
@@ -131,11 +132,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "DOWNLOAD_DATE")
-    public Time getDownloadDate() {
+    public Date getDownloadDate() {
         return downloadDate;
     }
 
-    public void setDownloadDate(Time downloadDate) {
+    public void setDownloadDate(Date downloadDate) {
         this.downloadDate = downloadDate;
     }
 
@@ -151,11 +152,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "PRINT_OUT_DATE")
-    public Time getPrintOutDate() {
+    public Date getPrintOutDate() {
         return printOutDate;
     }
 
-    public void setPrintOutDate(Time printOutDate) {
+    public void setPrintOutDate(Date printOutDate) {
         this.printOutDate = printOutDate;
     }
 
@@ -171,11 +172,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "POSITION_DATE")
-    public Time getPositionDate() {
+    public Date getPositionDate() {
         return positionDate;
     }
 
-    public void setPositionDate(Time positionDate) {
+    public void setPositionDate(Date positionDate) {
         this.positionDate = positionDate;
     }
 
@@ -191,11 +192,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "OUT_WORKSHOP_DATE")
-    public Time getOutWorkshopDate() {
+    public Date getOutWorkshopDate() {
         return outWorkshopDate;
     }
 
-    public void setOutWorkshopDate(Time outWorkshopDate) {
+    public void setOutWorkshopDate(Date outWorkshopDate) {
         this.outWorkshopDate = outWorkshopDate;
     }
 
@@ -221,11 +222,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "QUALITY_TEST_DATE")
-    public Time getQualityTestDate() {
+    public Date getQualityTestDate() {
         return qualityTestDate;
     }
 
-    public void setQualityTestDate(Time qualityTestDate) {
+    public void setQualityTestDate(Date qualityTestDate) {
         this.qualityTestDate = qualityTestDate;
     }
 
@@ -241,11 +242,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "OUT_STORAGE_DATE")
-    public Time getOutStorageDate() {
+    public Date getOutStorageDate() {
         return outStorageDate;
     }
 
-    public void setOutStorageDate(Time outStorageDate) {
+    public void setOutStorageDate(Date outStorageDate) {
         this.outStorageDate = outStorageDate;
     }
 
@@ -261,11 +262,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "IN_STORAGE_DATE")
-    public Time getInStorageDate() {
+    public Date getInStorageDate() {
         return inStorageDate;
     }
 
-    public void setInStorageDate(Time inStorageDate) {
+    public void setInStorageDate(Date inStorageDate) {
         this.inStorageDate = inStorageDate;
     }
 
@@ -331,21 +332,21 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "SORT_OUT_DATE")
-    public Time getSortOutDate() {
+    public Date getSortOutDate() {
         return sortOutDate;
     }
 
-    public void setSortOutDate(Time sortOutDate) {
+    public void setSortOutDate(Date sortOutDate) {
         this.sortOutDate = sortOutDate;
     }
 
     @Basic
     @Column(name = "CONCORA_CRUSH_DATE")
-    public Time getConcoraCrushDate() {
+    public Date getConcoraCrushDate() {
         return concoraCrushDate;
     }
 
-    public void setConcoraCrushDate(Time concoraCrushDate) {
+    public void setConcoraCrushDate(Date concoraCrushDate) {
         this.concoraCrushDate = concoraCrushDate;
     }
 
@@ -361,11 +362,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "PUNCHING_DATE")
-    public Time getPunchingDate() {
+    public Date getPunchingDate() {
         return punchingDate;
     }
 
-    public void setPunchingDate(Time punchingDate) {
+    public void setPunchingDate(Date punchingDate) {
         this.punchingDate = punchingDate;
     }
 
@@ -381,11 +382,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "SORTING_DATE")
-    public Time getSortingDate() {
+    public Date getSortingDate() {
         return sortingDate;
     }
 
-    public void setSortingDate(Time sortingDate) {
+    public void setSortingDate(Date sortingDate) {
         this.sortingDate = sortingDate;
     }
 
@@ -401,11 +402,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "CONNECT_DATE")
-    public Time getConnectDate() {
+    public Date getConnectDate() {
         return connectDate;
     }
 
-    public void setConnectDate(Time connectDate) {
+    public void setConnectDate(Date connectDate) {
         this.connectDate = connectDate;
     }
 

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

@@ -2,8 +2,6 @@ package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.FileNameDicEntity;
 import org.apache.ibatis.annotations.*;
-import org.hibernate.validator.constraints.SafeHtml;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 

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

@@ -3,8 +3,6 @@ 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;
 

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

@@ -61,7 +61,7 @@ public interface SelectSerialNumberMapper {
             "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" +
-            "WHERE GROUP_NO.GROUP_NO =#{id} \n" +
+            "WHERE SPECIAL_CARD.accept_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")
@@ -85,7 +85,7 @@ public interface SelectSerialNumberMapper {
             "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 PROD_CARD_T@PROD_LINK ON SUBSTR(PROD_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO "+
+            "LEFT JOIN PROD_CARD_T@PROD_LINK ON PROD_CARD_T.ACCEPT_NO=GROUP_NO.GROUP_NO "+
             "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
             "WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_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" +