Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_REFACTORING into dev

# Conflicts:
#	src/main/java/com/yxproject/start/api/UserInfoApi.java

pom.xml

@@ -63,6 +63,11 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>3.13</version>
+		</dependency>
 
 		<!--引入log4j2作为日志组件-->
 		<!--<dependency>-->

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

@@ -463,11 +463,11 @@ public class UserInfoApi {
     @Path("findProductionTaskListByState")
     @Produces(MediaType.APPLICATION_JSON)
     @RequiresPermissions("userInfo.add")//权限管理;
-    public String findProductionTaskListByState(@RequestParam("state") String state, @Context HttpServletResponse resp){
+    public String findProductionTaskListByState(@QueryParam("state") String state, @Context HttpServletResponse resp){
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
-        List<ProductionTaskListEntity> taskListEntityList = productionTaskListService.findProductionTaskListEntityByState(Integer.valueOf(state));
-        yxjsonResponse.outPutSuccess(taskListEntityList);
+        List<Map<String, Object>> productionTaskInfoList = productionTaskListService.findProductionTaskListEntityByState(Integer.valueOf(state));
+        yxjsonResponse.outPutSuccess(productionTaskInfoList);
         return yxjsonResponse.toJSONString();
     }
 
@@ -489,7 +489,7 @@ public class UserInfoApi {
 
 
     /**
-     * 打印装箱单
+     * 下载装箱单
      */
     @GET
     @Path("printPackingList")
@@ -630,18 +630,18 @@ public class UserInfoApi {
             row.setHeightInPoints(Short.parseShort("16"));//设置行高
             //创建单元格并且添加数据
             cell = row.createCell(0);
-            cell.setCellValue((String) map.get("countyName"));
+            cell.setCellValue((String) map.get("COUNTYNAME"));
             cell.setCellStyle(style);
             cell = row.createCell(1);
 
-            cell.setCellValue(map.get("download").toString().equals("0") ? "" : map.get("download").toString());
+            cell.setCellValue(map.get("DOWNLOAD").toString().equals("0") ? "" : map.get("DOWNLOAD").toString());
             cell.setCellStyle(style);
             cell = row.createCell(2);
             cell.setCellValue("");
             cell.setCellStyle(style);
             cell = row.createCell(3);
-            cell.setCellValue(((Integer.parseInt(map.get("download").toString()) % 250==0?Integer.parseInt(map.get("download").toString()) / 250:Integer.parseInt(map.get("download").toString()) / 250+1)) + "");
-            num += ((Integer.parseInt(map.get("download").toString()) % 250==0?Integer.parseInt(map.get("download").toString()) / 250:Integer.parseInt(map.get("download").toString()) / 250+1));
+            cell.setCellValue(((Integer.parseInt(map.get("DOWNLOAD").toString()) % 250==0?Integer.parseInt(map.get("DOWNLOAD").toString()) / 250:Integer.parseInt(map.get("DOWNLOAD").toString()) / 250+1)) + "");
+            num += ((Integer.parseInt(map.get("DOWNLOAD").toString()) % 250==0?Integer.parseInt(map.get("DOWNLOAD").toString()) / 250:Integer.parseInt(map.get("DOWNLOAD").toString()) / 250+1));
             cell.setCellStyle(style);
             cell = row.createCell(4);
             cell.setCellValue("");
@@ -844,7 +844,7 @@ public class UserInfoApi {
         for (int a = 0; a < countyInfoList.size(); a++) {
             Map<String, Object> map = countyInfoList.get(a);
             //第二步创建sheet
-            if (map.get("countyName").toString().contains("区")) {
+            if (map.get("COUNTYNAME").toString().contains("区")) {
                 //第三步创建行row:添加表头0行
                 row = mergeSheet.createRow(0);
                 row.setHeightInPoints(Short.parseShort("20"));//设置行高
@@ -899,19 +899,19 @@ public class UserInfoApi {
                 row.setHeightInPoints(Short.parseShort("16"));//设置行高
                 //创建单元格并且添加数据
                 cell = row.createCell(0);
-                cell.setCellValue(map.get("countyName").toString());
+                cell.setCellValue(map.get("COUNTYNAME").toString());
                 cell.setCellStyle(style);
                 cell = row.createCell(1);
-                cell.setCellValue(map.get("download") + "");
-                mergeSum += Integer.valueOf(map.get("download") + "");
+                cell.setCellValue(map.get("DOWNLOAD") + "");
+                mergeSum += Integer.valueOf(map.get("DOWNLOAD") + "");
                 cell.setCellStyle(style);
                 cell = row.createCell(2);
                 cell.setCellValue("");
                 cell.setCellStyle(style);
                 cell = row.createCell(3);
                 cell.setCellStyle(style);
-                cell.setCellValue(((Integer.parseInt(map.get("download") + "") % 250==0?Integer.parseInt(map.get("download") + "") / 250:Integer.parseInt(map.get("download") + "") / 250+1)) + "");
-                boxNum += ((Integer.parseInt(map.get("download") + "") % 250==0?Integer.parseInt(map.get("download") + "") / 250:Integer.parseInt(map.get("download") + "") / 250+1));
+                cell.setCellValue(((Integer.parseInt(map.get("DOWNLOAD") + "") % 250==0?Integer.parseInt(map.get("DOWNLOAD") + "") / 250:Integer.parseInt(map.get("DOWNLOAD") + "") / 250+1)) + "");
+                boxNum += ((Integer.parseInt(map.get("DOWNLOAD") + "") % 250==0?Integer.parseInt(map.get("DOWNLOAD") + "") / 250:Integer.parseInt(map.get("DOWNLOAD") + "") / 250+1));
                 cell = row.createCell(4);
                 cell.setCellValue("");
                 cell.setCellStyle(style);
@@ -1025,7 +1025,7 @@ public class UserInfoApi {
                 mergeSheet.addMergedRegion(callRangeb);
                 lineNum++;
             } else {
-                sheet = wb.createSheet(a + "-" + (String) map.get("countyName"));
+                sheet = wb.createSheet(a + "-" + (String) map.get("COUNTYNAME"));
 
                 sheet.setColumnWidth(0, (int) 30 * 100);
                 sheet.setColumnWidth(1, (int) 30 * 70);
@@ -1093,17 +1093,17 @@ public class UserInfoApi {
                 row.setHeightInPoints(Short.parseShort("16"));//设置行高
                 //创建单元格并且添加数据
                 cell = row.createCell(0);
-                cell.setCellValue(map.get("countyName").toString());
+                cell.setCellValue(map.get("COUNTYNAME").toString());
                 cell.setCellStyle(style);
                 cell = row.createCell(1);
-                cell.setCellValue(map.get("download") + "");
+                cell.setCellValue(map.get("DOWNLOAD") + "");
                 cell.setCellStyle(style);
                 cell = row.createCell(2);
                 cell.setCellValue("");
                 cell.setCellStyle(style);
                 cell = row.createCell(3);
                 cell.setCellStyle(style);
-                cell.setCellValue(((Integer.parseInt(map.get("download") + "") % 250==0?Integer.parseInt(map.get("download") + "") / 250:Integer.parseInt(map.get("download") + "") / 250+1)) + "");
+                cell.setCellValue(((Integer.parseInt(map.get("DOWNLOAD") + "") % 250==0?Integer.parseInt(map.get("DOWNLOAD") + "") / 250:Integer.parseInt(map.get("DOWNLOAD") + "") / 250+1)) + "");
                 cell = row.createCell(4);
                 cell.setCellValue("");
                 cell.setCellStyle(style);
@@ -1128,7 +1128,7 @@ public class UserInfoApi {
                 cell.setCellValue("合计");
                 cell.setCellStyle(style);
                 cell = row.createCell(1);
-                cell.setCellValue(Integer.valueOf(map.get("download") + ""));
+                cell.setCellValue(Integer.valueOf(map.get("DOWNLOAD") + ""));
                 cell.setCellStyle(style);
                 cell = row.createCell(2);
                 cell.setCellValue("制证车间");
@@ -1144,7 +1144,7 @@ public class UserInfoApi {
                 }
                 cell.setCellStyle(style);
                 cell = row.createCell(3);
-                cell.setCellValue(((Integer.parseInt(map.get("download") + "") % 250==0?Integer.parseInt(map.get("download") + "") / 250:Integer.parseInt(map.get("download") + "") / 250+1)) + "");
+                cell.setCellValue(((Integer.parseInt(map.get("DOWNLOAD") + "") % 250==0?Integer.parseInt(map.get("DOWNLOAD") + "") / 250:Integer.parseInt(map.get("DOWNLOAD") + "") / 250+1)) + "");
                 cell.setCellStyle(style);
                 cell = row.createCell(4);
                 cell.setCellValue(permanentPositionDate);
@@ -1222,8 +1222,8 @@ public class UserInfoApi {
         //第六步将生成excel文件保存到指定路径下
         FileOutputStream fout = null;
         try {
-            fout = new FileOutputStream("E:\\Excel\\" + simpleDateFormat.format(new Date()) + countyInfoList.get(0).get("countyName") + ".xls");
-//            fout = new FileOutputStream("D:\\" + simpleDateFormat.format(new Date()) + list.get(0).getString("countyName") + ".xls");
+            fout = new FileOutputStream("F:\\Excel\\" + simpleDateFormat.format(new Date()) + countyInfoList.get(0).get("COUNTYNAME") + ".xls");
+//            fout = new FileOutputStream("D:\\" + simpleDateFormat.format(new Date()) + list.get(0).getString("COUNTYNAME") + ".xls");
             wb.write(fout);
             fout.close();
         } catch (IOException e) {
@@ -1231,8 +1231,8 @@ public class UserInfoApi {
         }
 
         System.out.println("Excel文件生成成功..." + new Date());
-        return "E:\\Excel\\" + simpleDateFormat.format(new Date()) +countyInfoList.get(0).get("countyName") + ".xls";
-//        return "D:\\" + simpleDateFormat.format(new Date()) + list.get(0).getString("countyName") + ".xls";
+        return "F:\\Excel\\" + simpleDateFormat.format(new Date()) +countyInfoList.get(0).get("COUNTYNAME") + ".xls";
+//        return "D:\\" + simpleDateFormat.format(new Date()) + list.get(0).getString("COUNTYNAME") + ".xls";
     }
 
 

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

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+import java.util.Objects;
+
+/**
+ * Created by zhangyusheng on 2018/11/7 14:04
+ */
+@Entity
+@Table(name = "ACCEPT_NO_INFO", schema = "DAHAI", catalog = "")
+public class AcceptNoInfoEntity {
+    private String accept_No_Info_Id;
+    private String accept_No;
+    private String cyclesheetid;
+    private Long accept_Type;
+    private String group_No;
+
+    @Id
+    @Column(name = "ACCEPT_NO_INFO_ID", nullable = false, length = 20)
+    public String getAccept_No_Info_Id() {
+        return accept_No_Info_Id;
+    }
+
+    public void setAccept_No_Info_Id(String accept_No_Info_Id) {
+        this.accept_No_Info_Id = accept_No_Info_Id;
+    }
+
+    @Basic
+    @Column(name = "ACCEPT_NO", nullable = true, length = 20)
+    public String getAccept_No() {
+        return accept_No;
+    }
+
+    public void setAccept_No(String accept_No) {
+        this.accept_No = accept_No;
+    }
+
+    @Basic
+    @Column(name = "ACCEPT_TYPE", nullable = true, precision = 0)
+    public Long getAccept_Type() {
+        return accept_Type;
+    }
+
+    public void setAccept_Type(Long accept_Type) {
+        this.accept_Type = accept_Type;
+    }
+
+    @Basic
+    @Column(name = "CYCLESHEETID", nullable = true, length = 20)
+    public String getCyclesheetid() {
+        return cyclesheetid;
+    }
+
+    public void setCyclesheetid(String cyclesheetid) {
+        this.cyclesheetid = cyclesheetid;
+    }
+    @Basic
+    @Column(name = "GROUP_NO", nullable = true, length = 20)
+    public String getGroup_No() {
+        return group_No;
+    }
+
+    public void setGroup_No(String group_No) {
+        this.group_No = group_No;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AcceptNoInfoEntity that = (AcceptNoInfoEntity) o;
+        return Objects.equals(accept_No_Info_Id, that.accept_No_Info_Id) &&
+                Objects.equals(accept_No, that.accept_No) &&
+                Objects.equals(cyclesheetid, that.cyclesheetid) &&
+                Objects.equals(group_No, that.group_No) &&
+                Objects.equals(accept_Type, that.accept_Type);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(accept_No_Info_Id, accept_No, cyclesheetid, accept_Type,group_No);
+    }
+
+
+}

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

@@ -9,10 +9,9 @@ public class GroupinfoEntity {
     private String groupid;
     private String groupno;
     private String cyclesheetid;
-    private Long grouptype;
     private Long valid_Count;
     private Long invalid_Count;
-
+    private Long special_Card_Count;
 
     @Id
     @Column(name = "GROUPID", nullable = false, length = 20)
@@ -44,16 +43,6 @@ public class GroupinfoEntity {
         this.cyclesheetid = cyclesheetid;
     }
 
-    @Basic
-    @Column(name = "GROUPTYPE", nullable = true, precision = 0)
-    public Long getGrouptype() {
-        return grouptype;
-    }
-
-    public void setGrouptype(Long grouptype) {
-        this.grouptype = grouptype;
-    }
-
     @Basic
     @Column(name = "VAILD_COUNT", nullable = true, precision = 0)
     public Long getValid_Count() {
@@ -73,7 +62,15 @@ public class GroupinfoEntity {
     public void setInvalid_Count(Long invalid_Count) {
         this.invalid_Count = invalid_Count;
     }
+    @Basic
+    @Column(name = "SPECIAL_CARD_COUNT", nullable = true, precision = 0)
+    public Long getSpecial_Card_Count() {
+        return special_Card_Count;
+    }
 
+    public void setSpecial_Card_Count(Long special_Card_Count) {
+        this.special_Card_Count = special_Card_Count;
+    }
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -82,13 +79,14 @@ public class GroupinfoEntity {
         return Objects.equals(groupid, that.groupid) &&
                 Objects.equals(groupno, that.groupno) &&
                 Objects.equals(cyclesheetid, that.cyclesheetid) &&
-                Objects.equals(grouptype, that.grouptype) &&
                 Objects.equals(valid_Count, that.valid_Count) &&
+                Objects.equals(special_Card_Count, that.special_Card_Count) &&
                 Objects.equals(invalid_Count, that.invalid_Count);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(groupid, groupno, cyclesheetid, grouptype, valid_Count, invalid_Count);
+        return Objects.hash(groupid, groupno, cyclesheetid, valid_Count, special_Card_Count,invalid_Count);
     }
+
 }

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

+package com.yxproject.start.mapper;
+
+import com.yxproject.start.entity.AcceptNoInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * Created by zhangyusheng on 2018/11/7 15:06
+ */
+@Mapper
+public interface AcceptNoInfoMapper {
+    public List<AcceptNoInfoEntity> findAcceptNoInfoEntityByAcceptNo(String acceptNo);
+    public void saveAcceptNoInfoEntity(AcceptNoInfoEntity acceptNoInfoEntity);
+    public void updateAcceptNoInfoEntity(AcceptNoInfoEntity acceptNoInfoEntity);
+    public List<AcceptNoInfoEntity> findAcceptNoInfoEntityByGroupNo(String groupNo);
+
+}

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

@@ -20,10 +20,10 @@ public interface GroupinfoMapper {
 
     public List<GroupinfoEntity> findGroupinfoEntityListByProductionTaskListId(String cyclesheetid);
 
-    public List<Map<String, Object>> findCountyInfoList8_10(String groupinfo10, String groupinfo8);
+    public int findGroupInfoCountByProductionTaskListId(String cyclesheetid);
 
-    public List<Map<String, Object>> findCountyInfoList8(String groupinfo8);
+    public List<Map<String,Object>> findSpecialCountyList(String cyclesheetid);
 
-    public List<Map<String, Object>> findCountyInfoList10(String groupinfo10);
+    public List<Map<String,Object>> findNormalCountyList(String cyclesheetid);
 
 }

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

@@ -26,8 +26,11 @@ public interface UtilMapper {
     /**
      * 查询废证信息表序列值
      */
-    @Select(" select FAILEDINFO_SEQ.nextval from  dual")
     public int findFailedinfoSequenceNextValue();
+    /**
+     * 查询受理号表序列值
+     */
+    public int findAcceptInfoSequenceNextValue();
 }
 
 

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

@@ -6,6 +6,7 @@ import com.yxproject.start.entity.PoliceStationVailedInfoEntity;
 import com.yxproject.start.entity.ProductionTaskListEntity;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ProductionTaskListService {
 
@@ -25,7 +26,7 @@ public interface ProductionTaskListService {
 
     public List<PoliceStationVailedInfoEntity> find(String id);
 
-    public List<ProductionTaskListEntity> findProductionTaskListEntityByState(int state);
+    public List<Map<String,Object>> findProductionTaskListEntityByState(int state);
 
 }
 

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

 package com.yxproject.start.service.impl;
 
-import com.yxproject.start.entity.GroupinfoEntity;
 import com.yxproject.start.mapper.GroupinfoMapper;
 import com.yxproject.start.service.GroupinfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,46 +19,14 @@ public class GroupinfoServiceImpl implements GroupinfoService {
 
     @Override
     public List<Map<String, Object>> findCountyInfoList(String cyclesheetid) {
-        List<Map<String, Object>> countyInfoList = new ArrayList<>();
-        List<GroupinfoEntity> groupinfoEntityList = groupinfoMapper.findGroupinfoEntityListByProductionTaskListId(cyclesheetid);
-        List<String> groupnoLength10 = new ArrayList<String>();
-        List<String> groupnoLength8 = new ArrayList<String>();
-        for (GroupinfoEntity groupinfoEntity : groupinfoEntityList) {
-            if (groupinfoEntity.getGroupno().length() == 10) {
-                groupnoLength10.add(groupinfoEntity.getGroupno());
-
-            } else {
-                groupnoLength8.add(groupinfoEntity.getGroupno());
-            }
-        }
-        String group_no10 = "";
-        for (int i = 0; i < groupnoLength10.size(); i++) {
-            if (i != groupnoLength10.size() - 1) {
-                group_no10 += "'" + groupnoLength10.get(i) + "',";
-            } else {
-                group_no10 += "'" + groupnoLength10.get(i) + "'";
-            }
-        }
-        String group_no8 = "";
-        for (int i = 0; i < groupnoLength8.size(); i++) {
-            if (i != groupnoLength8.size() - 1) {
-                group_no8 += "'" + groupnoLength8.get(i) + "',";
-            } else {
-                group_no8 += "'" + groupnoLength8.get(i) + "'";
-            }
-        }
-        //数组中有长度为10和8 的
-        if (groupnoLength8.size() != 0 && groupnoLength10.size() != 0) {
-            countyInfoList = groupinfoMapper.findCountyInfoList8_10(group_no10, group_no8);
-        } else if (groupnoLength8.size() == 0 && groupnoLength10.size() != 10) {
-            //数组中只有长度为10 的
-            countyInfoList = groupinfoMapper.findCountyInfoList10(group_no10);
-        } else if (groupnoLength8.size() != 0 && groupnoLength10.size() == 0) {
-            //数组中只有长度为8 的
-            countyInfoList = groupinfoMapper.findCountyInfoList8(group_no8);
-        }
-
-        return countyInfoList;
+        int count = groupinfoMapper.findGroupInfoCountByProductionTaskListId(cyclesheetid);
+        List<Map<String,Object>> list = new ArrayList<>();
+        if (count==0){
+            list = groupinfoMapper.findSpecialCountyList(cyclesheetid);
+        }else{
+            list = groupinfoMapper.findNormalCountyList(cyclesheetid);
+        }
+        return list;
     }
 
 }

src/main/resources/mapper/AcceptNoInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yxproject.start.mapper.AcceptNoInfoMapper">
+    <resultMap id="AcceptNoInfoMapper" type="com.yxproject.start.entity.AcceptNoInfoEntity">
+        <id column="ACCEPT_NO_INFO_ID" property="accept_No_Info_Id"  jdbcType="VARCHAR"/>
+        <result column="ACCEPT_NO" property="accept_No" jdbcType="VARCHAR"/>
+        <result column="CYCLESHEETID" property="cyclesheetid" jdbcType="VARCHAR"/>
+        <result column="GROUP_NO" property="group_No" jdbcType="VARCHAR"/>
+        <result column="ACCEPT_TYPE" property="accept_Type"  jdbcType="NUMERIC"/>
+    </resultMap>
+    <select id="findAcceptNoInfoEntityByAcceptNo" resultType="com.yxproject.start.entity.AcceptNoInfoEntity" parameterType="String">
+        select * from ACCEPT_NO_INFO where ACCEPT_NO =#{accept_No}
+    </select>
+    <insert id="saveAcceptNoInfoEntity" parameterType="com.yxproject.start.entity.AcceptNoInfoEntity">
+    INSERT INTO ACCEPT_NO_INFO (ACCEPT_NO_INFO_ID, ACCEPT_NO, CYCLESHEETID, ACCEPT_TYPE,GROUP_NO) VALUES (#{accept_No_Info_Id}, #{accept_No}, #{cyclesheetid}, #{accept_Type},#{group_No})
+    </insert>
+
+    <update id="updateAcceptNoInfoEntity" parameterType="com.yxproject.start.entity.AcceptNoInfoEntity">
+        update ACCEPT_NO_INFO
+        <set>
+            <if test="accept_No" >accept_No=#{accept_No} </if>
+            <if test="cyclesheetid" >cyclesheetid=#{cyclesheetid} </if>
+            <if test="group_No" >group_No=#{group_No} </if>
+            <if test="accept_Type" >accept_Type=#{accept_Type} </if>
+        </set>
+        where accept_No_Info_Id =#{accept_No_Info_Id}
+    </update>
+
+    <select id="findAcceptNoInfoEntityByGroupNo" resultType="com.yxproject.start.entity.AcceptNoInfoEntity" parameterType="String">
+        select * from ACCEPT_NO_INFO where GROUP_NO =#{group_No}
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/FailedinfoMapper.xml

@@ -34,6 +34,7 @@ update FAILEDINFO
     <if test="print_Date" >print_Date=#{print_Date} </if>
     <if test="state" >state=#{state} </if>
 </set>
+        where failedinfoid =#{failedinfoid}
     </update>
 
 </mapper>
\ No newline at end of file

src/main/resources/mapper/GroupinfoMapper.xml

@@ -5,9 +5,9 @@
         <id column="GROUPID" property="groupid"  jdbcType="VARCHAR"/>
         <result column="GROUPNO" property="groupno" jdbcType="VARCHAR"/>
         <result column="CYCLESHEETID" property="cyclesheetid" jdbcType="VARCHAR"/>
-        <result column="GROUPTYPE" property="grouptype"  jdbcType="NUMERIC"/>
-        <result column="VAILD_COUNT" property="vaildCount"  jdbcType="NUMERIC"/>
-        <result column="INVALID_COUNT" property="invalidCount"  jdbcType="NUMERIC"/>
+        <result column="VAILD_COUNT" property="vaild_Count"  jdbcType="NUMERIC"/>
+        <result column="INVALID_COUNT" property="invalid_Count"  jdbcType="NUMERIC"/>
+        <result column="SPECIAL_CARD_COUNT" property="special_Card_Count"  jdbcType="NUMERIC"/>
     </resultMap>
 
     <select id="findGroupinfoEntityListByProductionTaskListId" resultType="com.yxproject.start.entity.GroupinfoEntity" parameterType="String">
@@ -15,32 +15,35 @@
     </select>
 
     <insert id="insertGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupinfoEntity">
-    Insert into GROUPINFO (GROUPID,GROUPNO,CYCLESHEETID,GROUPTYPE,VAILD_COUNT,INVALID_COUNT) values
-        (#{groupid},#{groupno},#{grouptype},#{cyclesheetid},#{grouptype},#{vaildCount},#{invalidCount})
+    Insert into GROUPINFO (GROUPID,GROUPNO,CYCLESHEETID,VAILD_COUNT,INVALID_COUNT,special_Card_Count) values
+        (#{groupid},#{groupno},#{grouptype},#{cyclesheetid},#{vaildCount},#{invalidCount},#{special_Card_Count})
     </insert>
 
     <select id="findGroupinfoEntityByAcceptNo" resultType="com.yxproject.start.entity.GroupinfoEntity" parameterType="String">
-    select  * from GROUPINFO where GROUPNO =#{acceptNo} or GROUPNO =substr(#{acceptNo},0,8)
+    select  * from GROUPINFO where  GROUPNO =substr(#{acceptNo},0,8)
     </select>
 
     <update id="updateGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupinfoEntity">
         update GROUPINFO set GROUPID=#{groupid}
         <if test="groupno">,groupno =#{groupno}</if>
-        <if test="makeType">,MAKE_TYPE =#{makeType}</if>
         <if test="cyclesheetid">,cyclesheetid =#{cyclesheetid}</if>
         <if test="grouptype">,grouptype =#{grouptype}</if>
         <if test="valid_Count">,valid_Count =#{valid_Count}</if>
         <if test="invalid_Count">,invalid_Count =#{invalid_Count}</if>
+        <if test="special_Card_Count">,special_Card_Count =#{special_Card_Count}</if>
         where GROUPID=#{groupid}
     </update>
 
-    <select id="findCountyInfoList8_10" resultType="java.util.HashMap" parameterType="String">
-    select * from FINDPRODCOUNTYLIST8_10_VIEW where p_view_param.set_param(#{groupinfo10})=#{groupinfo10} AND   p_view_param.set_param2(#{groupinfo8})=#{groupinfo8}
+    <select id="findGroupInfoCountByProductionTaskListId" parameterType="String" resultType="int">
+        select count(GROUPNO) from GROUPINFO where CYCLESHEETID =#{cyclesheetid}
     </select>
-    <select id="findCountyInfoList8" resultType="java.util.HashMap" parameterType="String">
-    select * from FINDPRODCOUNTYLIST8_VIEW where    p_view_param.set_param2(#{groupinfo8})=#{groupinfo8}
+
+    <select id="findSpecialCountyList" resultType="java.util.HashMap" parameterType="String">
+        SELECT * FROM  TABLE(FIND_SPECIAL_COUNTY_LIST.GET_county_infos(#{cyclesheetid}))
     </select>
-    <select id="findCountyInfoList10" resultType="java.util.HashMap" parameterType="String">
-    select * from FINDPRODCOUNTYLIST10_VIEW where p_view_param.set_param(#{groupinfo10})=#{groupinfo10}
+
+    <select id="findNormalCountyList" resultType="java.util.HashMap" parameterType="String">
+        SELECT * FROM  TABLE(find_normal_county_list.GET_county_infos(#{cyclesheetid}))
     </select>
+
 </mapper>
\ No newline at end of file

src/main/resources/mapper/ProdCardTMapper.xml

@@ -24,4 +24,5 @@
         select * from PROD_CARD_T@PROD_LINK where ACCEPT_NO=#{card} or ID_NO =#{card}
     </select>
 
+
 </mapper>
\ No newline at end of file

src/main/resources/mapper/UtilMapper.xml

@@ -10,6 +10,12 @@
     <select id="findPoliceStationVailedSequenceNextValue" resultType="int"  >
     select  POLICE_STATION_VAILED_SEQ.nextval from  dual
     </select>
+    <select id="findFailedinfoSequenceNextValue" resultType="int">
+    select FAILEDINFO_SEQ.nextval from  dual
+    </select>
+    <select id="findAcceptInfoSequenceNextValue" resultType="int">
+    select ACCEPTINFO_SEQ.nextval from  dual
+    </select>
 
 
 </mapper>
\ No newline at end of file