添加并修改查询组号列表信息 受理库

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

@@ -101,12 +101,27 @@ public class TaskListApi {
         return objects;
 
     }
+    /**
+     * 查询组号列表详情
+     *  受理库
+     * @param date 查询时间
+     * @param typeCode 制证类型
+     * @param countyCode  区县代码
+     * @param resp
+     * @return
+     */
+    @RequestMapping("queryByGroupNoAtACCU")
+    public Map<String ,Object> queryByPoliceAtACCU(@RequestParam("date") String date,@RequestParam("typeCode") String typeCode,@RequestParam("countyCode") String countyCode,@RequestParam("currPage") String currPage,@RequestParam("pageSize") String pageSize, HttpServletResponse resp){
+        Map<String ,Object> objects = taskListService.selectByGroupNoAtACCU(replaceDate(date), typeCode, countyCode,Long.valueOf(currPage),Long.valueOf(pageSize));
+        return objects;
+
+    }
+
 
     /**
      * 查询任务单详情
      * (辅助库)
      * @param process 工序
-     * @param date 查询时间
      * @param resp
      * @return
      */
@@ -169,20 +184,7 @@ public class TaskListApi {
 
 
 
-//    /**
-//     * 查询派出所列表详情
-//     * @param date 查询时间
-//     * @param typeCode 制证类型
-//     * @param countyCode  区县代码
-//     * @param resp
-//     * @return
-//     */
-//    @RequestMapping("queryByPoliceAtACCU")
-//    public List<Object> queryByPoliceAtACCU(@RequestParam("state") String date,@RequestParam("typeCode") String typeCode,@RequestParam("countyCode") String countyCode, HttpServletResponse resp){
-//        List<Object> objects = taskListService.selectByPoliceAtACCU(date, typeCode, countyCode);
-//        return objects;
-//
-//    }
+
 
 
     /**

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

@@ -38,8 +38,18 @@ public class PreproPersonEntity {
     private Long cardTypeId;
     private Long newFileId;
     private Long state;
-
+    private long id;
     @Id
+    @Column(name = "ID")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @Basic
     @Column(name = "JMSFZSLH")
     public String getJmsfzslh() {
         return jmsfzslh;
@@ -351,11 +361,12 @@ public class PreproPersonEntity {
                 Objects.equals(fileId, that.fileId) &&
                 Objects.equals(cardTypeId, that.cardTypeId) &&
                 Objects.equals(newFileId, that.newFileId) &&
+                Objects.equals(id, that.id) &&
                 Objects.equals(state, that.state);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(jmsfzslh, gmsfhm, xm, xbdm, mzdm, csrq, ssxqdm, dzmc, sdxp, zwyZwtxsj, zwyZwtzsj, zweZwtxsj, zweZwtzsj, qfjgGajgmc, yxqqsrq, yxqjzrq, jmsfzslyydm, jmsfzzzlxdm, jmsfzlzfsdm, sjrXm, sjrLxdh, sjrYzbm, sjrTxdz, sid, fileId, cardTypeId, newFileId, state);
+        return Objects.hash(id,jmsfzslh, gmsfhm, xm, xbdm, mzdm, csrq, ssxqdm, dzmc, sdxp, zwyZwtxsj, zwyZwtzsj, zweZwtxsj, zweZwtzsj, qfjgGajgmc, yxqqsrq, yxqjzrq, jmsfzslyydm, jmsfzzzlxdm, jmsfzlzfsdm, sjrXm, sjrLxdh, sjrYzbm, sjrTxdz, sid, fileId, cardTypeId, newFileId, state);
     }
 }

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

@@ -9,8 +9,8 @@ import java.util.List;
 @Mapper
 public interface FilesMapper {
 
-    @Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREATE_TIME,SOURCE_FILE_NAME,UPLOAD_DATE)" +
-            "VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{createTime},#{sourceFileName},#{upload_date})")
+    @Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREATE_TIME,SOURCE_FILE_NAME)" +
+            "VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{createTime},#{sourceFileName})")
     @Options(useGeneratedKeys=true, keyProperty="id", keyColumn="id")
     public long insertFiles(FilesEntity filesEntity);
 

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

@@ -43,6 +43,44 @@ public interface TaskListMapper {
             "where county_dic.COUNTY_CODE is not null and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{submitDate}")
     public List<Map<String,Object>> selectByCountyAtACCU(@Param("submitDate") String submitDate);
 
+    /**
+     * 组号列表查询
+     * 受理库
+     * @param date 查询时间
+     * @param typeCode 制证类型
+     * @param countyCode 区县代码
+     * @param maxNum
+     * @param minNum
+     * @return
+     */
+    @Select("select * from (select a.*,rownum rn  from (select DISTINCT  ACC_GROUP_T.* from ACC_CARD_T@ACCU_LINK  \n" +
+            "left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH = acc_card_t.upload_no \n" +
+            "left join ACC_GROUP_T@ACCU_LINK on substr(acc_card_t.accept_no,0,8) = ACC_GROUP_T.group_no\n" +
+            "left join CARD_TYPE_DIC on PREPRO_PERSON.card_type_id =  CARD_TYPE_DIC.CARD_TYPE_ID\n" +
+            "left join county_dic on substr(PREPRO_PERSON.JMSFZSLH,0,6)=  county_dic.COUNTY_CODE\n" +
+            "where county_dic.COUNTY_CODE = #{countyCode} and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{date}" +
+            " and PREPRO_PERSON.card_type_id = #{typeCode}" +
+            ") a ) where rn BETWEEN #{minNum} and #{maxNum}")
+    public List<Map<String,Object>> selectByGroupNoAtACCU(@Param("date") String date,@Param("typeCode")String typeCode,@Param("countyCode")String countyCode,@Param("maxNum")long maxNum,@Param("minNum")long minNum );
+
+
+    /**
+     * 组号列表查询总数量
+     * 受理库
+     * @param date 查询时间
+     * @param typeCode 制证类型
+     * @param countyCode 区县代码
+     * @return
+     */
+    @Select("select DISTINCT  ACC_GROUP_T.* from ACC_CARD_T@ACCU_LINK  \n" +
+            "left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH = acc_card_t.upload_no \n" +
+            "left join ACC_GROUP_T@ACCU_LINK on substr(acc_card_t.accept_no,0,8) = ACC_GROUP_T.group_no\n" +
+            "left join CARD_TYPE_DIC on PREPRO_PERSON.card_type_id =  CARD_TYPE_DIC.CARD_TYPE_ID\n" +
+            "left join county_dic on substr(PREPRO_PERSON.JMSFZSLH,0,6)=  county_dic.COUNTY_CODE\n" +
+            "where county_dic.COUNTY_CODE = #{countyCode} and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{date}" +
+            " and PREPRO_PERSON.card_type_id = #{typeCode}")
+    public List<Map<String,Object>> selectByGroupNoAtACCUCount(@Param("date") String date,@Param("typeCode")String typeCode,@Param("countyCode")String countyCode );
+
 
     /**
      * 查询组号列表

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

@@ -22,6 +22,8 @@ public interface TaskListService {
 
     public List<Object> selectByCountyAtACCU(String date);
 
+    public Map<String ,Object> selectByGroupNoAtACCU(String date, String typeCode, String countyCode,long currPage, long pageSize);
+
     public List<Object> selectByCountyAtAuxiliary(String process);
 
     public List<Object> selectGroupAtACCU(String date,String typeCode,String countyCode);

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

@@ -149,6 +149,25 @@ public class TaskListServiceImpl implements TaskListService {
         return list;
     }
 
+    /**
+     * 查询组号列表详情
+     * 受理库
+     * @param date 查询时间
+     * @param typeCode 制证类型
+     * @param countyCode  区县代码
+     * @param currPage 当前页
+     * @param pageSize  页面数量
+     * @return
+     */
+    @Override
+    public Map<String ,Object> selectByGroupNoAtACCU(String date, String typeCode, String countyCode, long currPage, long pageSize) {
+        List<Map<String, Object>> mapList = taskListMapper.selectByGroupNoAtACCU(date, typeCode, countyCode, currPage * pageSize, (currPage - 1) * pageSize + 1);
+        List<Map<String, Object>> mapList1 = taskListMapper.selectByGroupNoAtACCUCount(date, typeCode, countyCode);
+        Map<String,Object> map = new LinkedHashMap<>();
+        map.put("count",mapList1.size());
+        map.put("groupList",mapList);
+        return map;
+    }
 
     /**
      * 查询任务单详情
@@ -159,6 +178,7 @@ public class TaskListServiceImpl implements TaskListService {
     @Override
     public List<Object> selectByCountyAtAuxiliary(String process) {
 //        taskListMapper
+                //todo 写逻辑0.0........
         return null;
     }