修改添加废证循环单工作组

修改查询平压电写入 任务单详情

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

@@ -85,7 +85,7 @@ public class FailedCardApi {
                 idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));
             }
             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"),idMap.get("WORK_GROUP").toString());
         }
         return true;
     }

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

@@ -185,8 +185,8 @@ public class TaskListApi {
      * @return
      */
     @RequestMapping("queryByCountyAtAuxiliaryState1")
-    public Map queryByCountyAtAuxiliaryState1(@RequestParam("process") String process, HttpServletResponse resp) {
-        Map map = taskListService.selectByCountyAtAuxiliary2(Long.valueOf(process));
+    public Map queryByCountyAtAuxiliaryState1(@RequestParam("process") String process,@RequestParam("workGroup") String workGroup, HttpServletResponse resp) {
+        Map map = taskListService.selectByCountyAtAuxiliary2(Long.valueOf(process),workGroup);
         return map;
     }
 

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

@@ -4,19 +4,25 @@ import javax.persistence.*;
 import java.sql.Time;
 import java.util.Objects;
 
+/**
+ * @auther zhangyusheng
+ * 2019/4/1   10:42
+ */
 @Entity
 @Table(name = "FAILED_CARD", schema = "YINGXIN", catalog = "")
 public class FailedCardEntity {
     private long failedCardId;
     private Long failedCardReasonId;
     private String acceptNo;
-    private Long taskId;
+    private String taskId;
     private Time positionDate;
     private Time finishDate;
     private Time allotDate;
     private Time printDate;
     private Long state;
-    private String initiator;
+    private Long initiator;
+    private String note;
+    private Long workGroup;
 
     @Id
     @Column(name = "FAILED_CARD_ID")
@@ -50,11 +56,11 @@ public class FailedCardEntity {
 
     @Basic
     @Column(name = "TASK_ID")
-    public Long getTaskId() {
+    public String getTaskId() {
         return taskId;
     }
 
-    public void setTaskId(Long taskId) {
+    public void setTaskId(String taskId) {
         this.taskId = taskId;
     }
 
@@ -110,14 +116,34 @@ public class FailedCardEntity {
 
     @Basic
     @Column(name = "INITIATOR")
-    public String getInitiator() {
+    public Long getInitiator() {
         return initiator;
     }
 
-    public void setInitiator(String initiator) {
+    public void setInitiator(Long initiator) {
         this.initiator = initiator;
     }
 
+    @Basic
+    @Column(name = "NOTE")
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    @Basic
+    @Column(name = "WORK_GROUP")
+    public Long getWorkGroup() {
+        return workGroup;
+    }
+
+    public void setWorkGroup(Long workGroup) {
+        this.workGroup = workGroup;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -132,11 +158,13 @@ public class FailedCardEntity {
                 Objects.equals(allotDate, that.allotDate) &&
                 Objects.equals(printDate, that.printDate) &&
                 Objects.equals(state, that.state) &&
-                Objects.equals(initiator, that.initiator);
+                Objects.equals(initiator, that.initiator) &&
+                Objects.equals(note, that.note) &&
+                Objects.equals(workGroup, that.workGroup);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(failedCardId, failedCardReasonId, acceptNo, taskId, positionDate, finishDate, allotDate, printDate, state, initiator);
+        return Objects.hash(failedCardId, failedCardReasonId, acceptNo, taskId, positionDate, finishDate, allotDate, printDate, state, initiator, note, workGroup);
     }
 }

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

@@ -2,12 +2,11 @@ package com.yxproject.start.entity;
 
 import javax.persistence.*;
 import java.sql.Time;
-import java.util.Date;
 import java.util.Objects;
 
 /**
  * @auther zhangyusheng
- * 2019/3/8   16:18
+ * 2019/4/1   10:42
  */
 @Entity
 @Table(name = "TASK", schema = "YINGXIN", catalog = "")
@@ -16,39 +15,40 @@ public class TaskEntity {
     private Long cardType;
     private Long oldCardType;
     private String countyCode;
-    private Date submitDate;
+    private Time submitDate;
     private String submitName;
-    private Date issuedDate;
+    private Time issuedDate;
     private String issuedName;
-    private Date downloadDate;
+    private Time downloadDate;
     private String downloadName;
-    private Date printOutDate;
+    private Time printOutDate;
     private String printOutName;
-    private Date positionDate;
+    private Time positionDate;
     private String positionName;
-    private Date outWorkshopDate;
+    private Time outWorkshopDate;
     private String outWorkshopName;
     private String qualityTestName;
-    private Date qualityTestDate;
+    private Time qualityTestDate;
     private String exceptionInformation;
-    private Date outStorageDate;
+    private Time outStorageDate;
     private String outStorageName;
-    private Date inStorageDate;
+    private Time inStorageDate;
     private String inStorageName;
     private Long taskStateId;
     private Long isException;
     private Long printerId;
     private Long beginPageNumber;
     private Long finishPageNumber;
-    private Date sortOutDate;
-    private Date concoraCrushDate;
+    private Time sortOutDate;
+    private Time concoraCrushDate;
     private String concoraCrushName;
-    private Date punchingDate;
+    private Time punchingDate;
     private String punchingName;
-    private Date sortingDate;
+    private Time sortingDate;
     private String sortingName;
-    private Date connectDate;
+    private Time connectDate;
     private String connectName;
+    private Long workGroup;
 
     @Id
     @Column(name = "TASK_ID")
@@ -92,11 +92,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "SUBMIT_DATE")
-    public Date getSubmitDate() {
+    public Time getSubmitDate() {
         return submitDate;
     }
 
-    public void setSubmitDate(Date submitDate) {
+    public void setSubmitDate(Time submitDate) {
         this.submitDate = submitDate;
     }
 
@@ -112,11 +112,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "ISSUED_DATE")
-    public Date getIssuedDate() {
+    public Time getIssuedDate() {
         return issuedDate;
     }
 
-    public void setIssuedDate(Date issuedDate) {
+    public void setIssuedDate(Time issuedDate) {
         this.issuedDate = issuedDate;
     }
 
@@ -132,11 +132,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "DOWNLOAD_DATE")
-    public Date getDownloadDate() {
+    public Time getDownloadDate() {
         return downloadDate;
     }
 
-    public void setDownloadDate(Date downloadDate) {
+    public void setDownloadDate(Time downloadDate) {
         this.downloadDate = downloadDate;
     }
 
@@ -152,11 +152,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "PRINT_OUT_DATE")
-    public Date getPrintOutDate() {
+    public Time getPrintOutDate() {
         return printOutDate;
     }
 
-    public void setPrintOutDate(Date printOutDate) {
+    public void setPrintOutDate(Time printOutDate) {
         this.printOutDate = printOutDate;
     }
 
@@ -172,11 +172,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "POSITION_DATE")
-    public Date getPositionDate() {
+    public Time getPositionDate() {
         return positionDate;
     }
 
-    public void setPositionDate(Date positionDate) {
+    public void setPositionDate(Time positionDate) {
         this.positionDate = positionDate;
     }
 
@@ -192,11 +192,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "OUT_WORKSHOP_DATE")
-    public Date getOutWorkshopDate() {
+    public Time getOutWorkshopDate() {
         return outWorkshopDate;
     }
 
-    public void setOutWorkshopDate(Date outWorkshopDate) {
+    public void setOutWorkshopDate(Time outWorkshopDate) {
         this.outWorkshopDate = outWorkshopDate;
     }
 
@@ -222,11 +222,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "QUALITY_TEST_DATE")
-    public Date getQualityTestDate() {
+    public Time getQualityTestDate() {
         return qualityTestDate;
     }
 
-    public void setQualityTestDate(Date qualityTestDate) {
+    public void setQualityTestDate(Time qualityTestDate) {
         this.qualityTestDate = qualityTestDate;
     }
 
@@ -242,11 +242,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "OUT_STORAGE_DATE")
-    public Date getOutStorageDate() {
+    public Time getOutStorageDate() {
         return outStorageDate;
     }
 
-    public void setOutStorageDate(Date outStorageDate) {
+    public void setOutStorageDate(Time outStorageDate) {
         this.outStorageDate = outStorageDate;
     }
 
@@ -262,11 +262,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "IN_STORAGE_DATE")
-    public Date getInStorageDate() {
+    public Time getInStorageDate() {
         return inStorageDate;
     }
 
-    public void setInStorageDate(Date inStorageDate) {
+    public void setInStorageDate(Time inStorageDate) {
         this.inStorageDate = inStorageDate;
     }
 
@@ -332,21 +332,21 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "SORT_OUT_DATE")
-    public Date getSortOutDate() {
+    public Time getSortOutDate() {
         return sortOutDate;
     }
 
-    public void setSortOutDate(Date sortOutDate) {
+    public void setSortOutDate(Time sortOutDate) {
         this.sortOutDate = sortOutDate;
     }
 
     @Basic
     @Column(name = "CONCORA_CRUSH_DATE")
-    public Date getConcoraCrushDate() {
+    public Time getConcoraCrushDate() {
         return concoraCrushDate;
     }
 
-    public void setConcoraCrushDate(Date concoraCrushDate) {
+    public void setConcoraCrushDate(Time concoraCrushDate) {
         this.concoraCrushDate = concoraCrushDate;
     }
 
@@ -362,11 +362,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "PUNCHING_DATE")
-    public Date getPunchingDate() {
+    public Time getPunchingDate() {
         return punchingDate;
     }
 
-    public void setPunchingDate(Date punchingDate) {
+    public void setPunchingDate(Time punchingDate) {
         this.punchingDate = punchingDate;
     }
 
@@ -382,11 +382,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "SORTING_DATE")
-    public Date getSortingDate() {
+    public Time getSortingDate() {
         return sortingDate;
     }
 
-    public void setSortingDate(Date sortingDate) {
+    public void setSortingDate(Time sortingDate) {
         this.sortingDate = sortingDate;
     }
 
@@ -402,11 +402,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "CONNECT_DATE")
-    public Date getConnectDate() {
+    public Time getConnectDate() {
         return connectDate;
     }
 
-    public void setConnectDate(Date connectDate) {
+    public void setConnectDate(Time connectDate) {
         this.connectDate = connectDate;
     }
 
@@ -420,6 +420,16 @@ public class TaskEntity {
         this.connectName = connectName;
     }
 
+    @Basic
+    @Column(name = "WORK_GROUP")
+    public Long getWorkGroup() {
+        return workGroup;
+    }
+
+    public void setWorkGroup(Long workGroup) {
+        this.workGroup = workGroup;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -461,11 +471,12 @@ public class TaskEntity {
                 Objects.equals(sortingDate, that.sortingDate) &&
                 Objects.equals(sortingName, that.sortingName) &&
                 Objects.equals(connectDate, that.connectDate) &&
-                Objects.equals(connectName, that.connectName);
+                Objects.equals(connectName, that.connectName) &&
+                Objects.equals(workGroup, that.workGroup);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(taskId, cardType, oldCardType, countyCode, submitDate, submitName, issuedDate, issuedName, downloadDate, downloadName, printOutDate, printOutName, positionDate, positionName, outWorkshopDate, outWorkshopName, qualityTestName, qualityTestDate, exceptionInformation, outStorageDate, outStorageName, inStorageDate, inStorageName, taskStateId, isException, printerId, beginPageNumber, finishPageNumber, sortOutDate, concoraCrushDate, concoraCrushName, punchingDate, punchingName, sortingDate, sortingName, connectDate, connectName);
+        return Objects.hash(taskId, cardType, oldCardType, countyCode, submitDate, submitName, issuedDate, issuedName, downloadDate, downloadName, printOutDate, printOutName, positionDate, positionName, outWorkshopDate, outWorkshopName, qualityTestName, qualityTestDate, exceptionInformation, outStorageDate, outStorageName, inStorageDate, inStorageName, taskStateId, isException, printerId, beginPageNumber, finishPageNumber, sortOutDate, concoraCrushDate, concoraCrushName, punchingDate, punchingName, sortingDate, sortingName, connectDate, connectName, workGroup);
     }
 }

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

@@ -27,7 +27,7 @@ public interface CardDetailedListMapper {
 
     @Select("SELECT upload_no,subStr(UPLOAD_NO,0,9),ID_NO,NAME FROM PROD_CARD_T@PROD_LINK WHERE subStr(ACCEPT_NO,0,8) \n" +
             "IN (SELECT GROUP_NO FROM GROUP_NO WHERE TASK_ID=#{taskId} \n" +
-            "AND (subStr(UPLOAD_NO,0,9)=#{gajgId}));")
+            "AND (subStr(UPLOAD_NO,0,9)=#{gajgId}))  ")
     public List<CardDetailedListEntity> selectCardDetailedListData(@Param("taskId")String taskId,@Param("gajgId")String gajgId);
 
 }

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

@@ -47,12 +47,13 @@ public interface FailedCardMapper {
      * @return
      */
     @Insert("INSERT INTO FAILED_CARD (FAILED_CARD_REASON_ID,ACCEPT_NO,TASK_ID,STATE,INITIATOR,NOTE) VALUES (#{failedCardReasonId},#{acceptNo},#{taskId},0,#{initiator},#{note})\n")
-    public boolean insertFailedCard(@Param("failedCardReasonId")String failedCardReasonId,@Param("acceptNo")String acceptNo,@Param("taskId")String taskId,@Param("initiator")String initiator,@Param("note")String note);
+    public boolean insertFailedCard(@Param("failedCardReasonId")String failedCardReasonId,@Param("acceptNo")String acceptNo,@Param("taskId")String taskId,@Param("initiator")String initiator,@Param("note")String note,@Param("workGroup")String workGroup);
 
 
-    @Select("SELECT PROD_CARD_T.ACCEPT_NO,GROUP_NO.TASK_ID \n" +
+    @Select("SELECT PROD_CARD_T.ACCEPT_NO,GROUP_NO.TASK_ID ,task.work_group\n" +
             "FROM PROD_CARD_T@PROD_LINK\n" +
-            "LEFT JOIN GROUP_NO ON  GROUP_NO=subStr(PROD_CARD_T.ACCEPT_NO,0,8)\n" +
+            "LEFT JOIN GROUP_NO ON  GROUP_NO=subStr(PROD_CARD_T.ACCEPT_NO,0,8) " +
+            "left join task on task.TASK_ID = group_no.TASK_ID\n" +
             "WHERE PROD_CARD_T.ID_NO=#{cardId} or PROD_CARD_T.ACCEPT_NO=#{cardId}")
     public Map<String,Object> selectCountIdByCardId(@Param("cardId") String cardId);
 
@@ -137,7 +138,7 @@ public interface FailedCardMapper {
     /**
      * 根据特证表添加废证
      */
-    @Select("select SPECIAL_CARD.ACCEPT_NO,SPECIAL_CARD.TASK_ID FROM SPECIAL_CARD LEFT JOIN prod_card_t@PROD_LINK ON PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO" +
+    @Select("select SPECIAL_CARD.ACCEPT_NO,SPECIAL_CARD.TASK_ID,task.work_group FROM SPECIAL_CARD left join task on task.TASK_ID = special_card.TASK_ID LEFT JOIN prod_card_t@PROD_LINK ON PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO" +
             " WHERE PROD_CARD_T.ID_NO=#{id} or  PROD_CARD_T.ACCEPT_NO=#{id}")
     public Map<String,Object>selectDataById(String id);
 

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

@@ -32,7 +32,7 @@ public interface FilesMapper {
             "select upload_date upload_Date,count(FILE_ID) package_Count,sum(sumCount) cardCount,FILE_ID,sum(ordinaryCount) commonCardCount,sum(postCount) postCardCount ,rownum rn from (SELECT FILES.upload_date,FILE_ID,count(prepro_person.JMSFZSLH) as sumCount, sum(decode(PREPRO_PERSON.CARD_TYPE_ID,0,1,0)) as ordinaryCount ,sum(decode(PREPRO_PERSON.CARD_TYPE_ID,9,1,0)) as postCount \n" +
             "FROM PREPRO_PERSON left join FILES on PREPRO_PERSON.FILE_ID = FILES.ID \n" +
             "where 1=1  and  to_char(FILES.UPLOAD_DATE,'yyyyMMdd')= #{importDate} \n" +
-            "group by FILES.upload_date,FILE_ID)  group by upload_date, rownum, FILE_ID" +
+            "group by FILES.upload_date,FILE_ID)  group by upload_date, rownum, FILE_ID order by upload_date" +
             "</script> ")
     public List<CountDataEntity> selectFiles(@Param("importDate") String importDate,@Param("maxNum")long maxNum,@Param("minNum")long minNum);
 
@@ -56,7 +56,7 @@ public interface FilesMapper {
                    " and  to_char(FILES.UPLOAD_DATE,'yyyyMMdd')= #{importDate}" +
                    "</if>"+
                     " group by FILES.upload_date,FILES.ID)a" +
-            " group by a.upload_date, rownum " +
+            " group by a.upload_date, rownum order by a.upload_date " +
             "</script>"})
     public List<CountDataEntity> selectFilesCount(@Param("importDate") String importDate);
 

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

@@ -2,7 +2,6 @@ package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.CountyDicEntity;
 import org.apache.ibatis.annotations.*;
-import org.omg.CORBA.PUBLIC_MEMBER;
 
 import java.util.List;
 import java.util.Map;
@@ -68,7 +67,7 @@ public interface LogMapper {
             "<if test='analysisDate !=\"\"' >" +
             "AND subStr(FILE_NAME_DIC.ANALYSIS_DATE,0,8) =subStr( #{analysisDate},0,8) " +
             "</if>" +
-            ")" +
+            "order by ANALYSIS_DATE desc )" +
             "A" +
             ")" +
             "WHERE RN BETWEEN #{end} AND #{begin}" +
@@ -100,7 +99,7 @@ public interface LogMapper {
             "            <if test='cardId !=\"\"' >" +
             "            and PREPRO_PERSON.GMSFHM=#{cardId} ORDER by CREATE_DATE " +
             "            </if>" +
-            "            ) " +
+            "            order by CREATE_DATE desc ) " +
             "            A" +
             "            )" +
             "            WHERE RN BETWEEN #{end} AND #{begin}" +

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

@@ -58,7 +58,7 @@ public interface PreproPersonMapper {
             " <if test='uploadDate != null '>"+
             " and to_char(UPLOAD_DATE,'yyyyMMdd') = #{uploadDate}"+
             " </if>  </where>"+
-                    ") a ) where rn between #{minNum} and #{maxNum} </script>"})
+            " order by JMSFZSLH  ) a ) where rn between #{minNum} and #{maxNum} </script>"})
     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,@Param("downloadState")String downloadState);
 
     /*按条件查询制证数据*/
@@ -95,7 +95,7 @@ public interface PreproPersonMapper {
             " <if test='downloadState == 0 '>"+
             " and PREPRO_PERSON.NEW_FILE_ID is  null"+
             " </if> "+
-            " </where>"+
+            " </where> order by  JMSFZSLH"+
             " </script>"})
     public List<Map<String,Object>> selectPreproPerson1(@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("downloadState") String downloadState);
 

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

@@ -238,6 +238,23 @@ public interface TaskListMapper {
     public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process,@Param("process2") long process2);
 
 
+    /**
+     * 任务单查询
+     *  辅助库 大批证
+     * @param process 工序
+     * @return
+     */
+    @Select("select distinct task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
+            "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO, nvl(fc.faileCount,0) faileCount\n" +
+            "from group_no left join task on group_no.task_id= task.TASK_ID\n" +
+            "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
+            "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
+            "left join (select accept_no, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR  and accept_no  not in (select accept_no from special_card )  group by accept_no ) fc on substr(fc.accept_no,0,8) = group_no.group_no \n" +
+            "where task.TASK_STATE_ID = #{process} and task.work_group = #{workGroup} order by group_no.GROUP_NO")
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_common4(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
+
+
+
     /**
      * 任务单查询历史
      *  辅助库 大批证
@@ -506,6 +523,21 @@ public interface TaskListMapper {
             "where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_fast(@Param("process") long process,@Param("process2") long process2);
 
+    /**
+     * 任务单查询
+     *  辅助库 快证
+     * @param process 工序
+     * @return
+     */
+    @Select("select task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
+            "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
+            "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
+            "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
+            "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
+            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process} and task.work_group = #{workGroup} order by SPECIAL_CARD.ACCEPT_NO")
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_fast4(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
+
     /**
      * 任务单查询历史
      *  辅助库 快证
@@ -707,6 +739,21 @@ public interface TaskListMapper {
 
 
 
+    /**
+     * 循环单查询
+     *  辅助库 余证
+     * @param process 工序
+     * @return
+     */
+    @Select("select task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
+            "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
+            "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
+            "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
+            "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
+            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID = #{process} and task.work_group = #{workGroup} order by SPECIAL_CARD.ACCEPT_NO")
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind4(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
+
     /**
      * 循环单查询
      *  辅助库 余证
@@ -722,6 +769,7 @@ public interface TaskListMapper {
             "where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID = #{process}  order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind(@Param("process") long process,@Param("process2") long process2);
 
+
     /**
      * 循环单查询
      *  辅助库 废证
@@ -733,8 +781,8 @@ public interface TaskListMapper {
             "0 faileCount from FAILED_CARD left join task on FAILED_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR    order by FAILED_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectByCountyAtAuxiliary_failed(@Param("process2") long process2);
+            "where FAILED_CARD.state =#{process2} and FAILED_CARD.work_group = #{workGroup} and FAILED_CARD.state != FAILED_CARD.INITIATOR    order by FAILED_CARD.ACCEPT_NO")
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_failed4(@Param("process2") long process2,@Param("workGroup") long workGroup);
 
     /**
      * 循环单查询

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

@@ -14,7 +14,7 @@ public interface FailedCardService {
 
     public Map<String,Object> selectInfoByCardId(@Param("cardId")String cardId);
 
-    public boolean insertFailedCard(@Param("failedCardReasonId")String failedCardReasonId,@Param("acceptNo")String acceptNo,@Param("taskId")String taskId,@Param("initiator")String initiator,@Param("note")String note);
+    public boolean insertFailedCard(@Param("failedCardReasonId")String failedCardReasonId,@Param("acceptNo")String acceptNo,@Param("taskId")String taskId,@Param("initiator")String initiator,@Param("note")String note,String workGroup);
 
     public Map<String,Object> selectCountIdByCardId(String cardId);
 

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

@@ -35,7 +35,7 @@ public interface TaskListService {
 
     public List selectHistoryTaskAtAuxiliary2(String date);
 
-    public Map selectByCountyAtAuxiliary2(long process);
+    public Map selectByCountyAtAuxiliary2(long process,String workGroup);
 
     public List<Object> selectByCountyAtAuxiliary3(long process);
 

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

@@ -33,8 +33,8 @@ public class FailedCardServiceImpl implements FailedCardService {
     }
 
     @Override
-    public boolean insertFailedCard(String failedCardReasonId, String acceptNo, String taskId, String initiator, String note) {
-        failedCardMapper.insertFailedCard(failedCardReasonId,acceptNo,taskId,initiator,note);
+    public boolean insertFailedCard(String failedCardReasonId, String acceptNo, String taskId, String initiator, String note,String workGroup) {
+        failedCardMapper.insertFailedCard(failedCardReasonId,acceptNo,taskId,initiator,note,workGroup);
         return true;
     }
 

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

@@ -177,6 +177,7 @@ public class TaskListServiceImpl implements TaskListService {
             String typeName = null;
             List<Map<String, Object>> countyList = new ArrayList<>();
             Map<String, List<Map<String, Object>>> mapList = (Map<String, List<Map<String, Object>>>) typeMap.get(type);
+            int num =0;
             for (String county : mapList.keySet()) {
                 Map<String, Object> countyMapGroup = new LinkedHashMap<>();
                 int validCount = 0;
@@ -233,6 +234,8 @@ public class TaskListServiceImpl implements TaskListService {
             mapType.put("typeSum", typeSum);
             mapType.put("typeName", type);
             mapType.put("countyList", countyList);
+            num++;
+            mapType.put("id",num);
             typeList.add(mapType);
         }
         return typeList;
@@ -311,15 +314,15 @@ public class TaskListServiceImpl implements TaskListService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map selectByCountyAtAuxiliary2(long process) {
+    public Map selectByCountyAtAuxiliary2(long process,String workGroup) {
         //查询普通组号列表 在辅助库中
-        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common(process-1,process-1);
+        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common4(process-1,process-1,Long.valueOf(workGroup));
         //查询快证组号列表 在辅助库中
-        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast(process-1,process-1);
+        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast4(process-1,process-1,Long.valueOf(workGroup));
         //查询余证组号列表 在辅助库中
-        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process-1,process-1);
+        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind4(process-1,process-1,Long.valueOf(workGroup));
         //查询废证组号列表 在辅助库中
-        List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed(process-2);
+        List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed4(process-2,Long.valueOf(workGroup));
 
         List<Map<String, Object>> list = new ArrayList<>();
         list = formateMap(mapList_common);

src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: oracle.jdbc.driver.OracleDriver
-    url: jdbc:oracle:thin:@192.168.1.16:1521:yingxin
+    url: jdbc:oracle:thin:@192.168.1.102:1521:yingxin
     username: yingxin
     password: yingxin
   servlet: