push

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

@@ -6,10 +6,11 @@ import com.yxproject.start.entity.TaskList.TaskListEntity;
 import com.yxproject.start.service.TaskListService;
 import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
-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 java.util.List;
-import java.util.Map;
 
 /**
  * @author Administrator
@@ -24,6 +25,7 @@ public class TaskListApi {
 
     /**
      * 查询以区为单位的制证数量
+     * 受理库
      * @param submitDate
      * @return
      */
@@ -36,6 +38,7 @@ public class TaskListApi {
 
     /**
      * 查询以派出所为单位的制证数量
+     * 受理库
      * @param submitDate
      * @param countyCode
      * @return
@@ -49,6 +52,7 @@ public class TaskListApi {
 
     /**
      * 生成任务单
+     * 受理库
      * @param submitDate
      * @param countyCode
      * @param Gajg
@@ -62,7 +66,8 @@ public class TaskListApi {
     }
 
     /**
-     * 更改任务单状态(用于任务单下发)
+     * 更改任务单状态
+     * (用于任务单下发)
      * @param taskId
      * @return
      */

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

@@ -11,7 +11,8 @@ import org.springframework.web.bind.annotation.RestController;
 public class UpdateStateApi {
     @Autowired
     PreproPersonService preproPersonService;
-    @RequestMapping("updateS")
+
+    @RequestMapping("updateState")
     public boolean updateState(@RequestParam(value = "state") String state,@RequestParam(value = "acceptNo") String acceptNo){
         preproPersonService.uploadState(state,acceptNo);
         return true;

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

@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.Objects;
 
 @Entity
-@Table(name = "APPLY_REASON_T_DIC", schema = "YX", catalog = "")
+@Table(name = "APPLY_REASON_T_DIC", schema = "YINGXIN", catalog = "")
 public class ApplyReasonTDicEntity {
     private long applyReasonCode;
     private String applyReason;

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

@@ -5,7 +5,7 @@ import java.sql.Time;
 import java.util.Objects;
 
 @Entity
-@Table(name = "CARD_BODY", schema = "YX", catalog = "")
+@Table(name = "CARD_BODY", schema = "YINGXIN", catalog = "")
 public class CardBodyEntity {
     private long cardBodyId;
     private Time saveDate;

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

@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.Objects;
 
 @Entity
-@Table(name = "CARD_DETAILED_LIST", schema = "YX", catalog = "")
+@Table(name = "CARD_DETAILED_LIST", schema = "YINGXIN", catalog = "")
 public class CardDetailedListEntity {
     private long cardDetailedListId;
     private String polistListId;

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

@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.Objects;
 
 @Entity
-@Table(name = "CARD_TYPE_DIC", schema = "YX", catalog = "")
+@Table(name = "CARD_TYPE_DIC", schema = "YINGXIN", catalog = "")
 public class CardTypeDicEntity {
     private String cardType;
     private long cardTypeId;

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

@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.Objects;
 
 @Entity
-@Table(name = "COUNTY_DIC", schema = "YX", catalog = "")
+@Table(name = "COUNTY_DIC", schema = "YINGXIN", catalog = "")
 public class CountyDicEntity {
     private String countyCode;
     private String countyname;

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

@@ -5,7 +5,7 @@ import java.sql.Time;
 import java.util.Objects;
 
 @Entity
-@Table(name = "FAILED_CARD", schema = "YX", catalog = "")
+@Table(name = "FAILED_CARD", schema = "YINGXIN", catalog = "")
 public class FailedCardEntity {
     private long failedCardId;
     private Long failedCardReasonId;

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

@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.Objects;
 
 @Entity
-@Table(name = "FAILED_CARD_REASON_DIC", schema = "YX", catalog = "")
+@Table(name = "FAILED_CARD_REASON_DIC", schema = "YINGXIN", catalog = "")
 public class FailedCardReasonDicEntity {
     private long failedCardReasonId;
     private String failedCardReason;

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

@@ -10,7 +10,7 @@ import java.util.Objects;
  * 2019/3/1   10:39
  */
 @Entity
-@Table(name = "FILE_NAME_DIC", schema = "YX", catalog = "")
+@Table(name = "FILE_NAME_DIC", schema = "YINGXIN", catalog = "")
 public class FileNameDicEntity {
     private long fileId;
     private String fileName;

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

@@ -6,7 +6,7 @@ import java.util.Date;
 import java.util.Objects;
 
 @Entity
-@Table(name = "FILES", schema = "YX", catalog = "")
+@Table(name = "FILES", schema = "YINGXIN", catalog = "")
 public class FilesEntity {
     private String versionCode;
     private String dwdm;

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

@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.Objects;
 
 @Entity
-@Table(name = "GAJG_DM", schema = "YX", catalog = "")
+@Table(name = "GAJG_DM", schema = "YINGXIN", catalog = "")
 public class GajgDmEntity {
     private String gajgId;
     private String gajgDm;

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

@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.Objects;
 
 @Entity
-@Table(name = "GROUP_NO", schema = "YX", catalog = "")
+@Table(name = "GROUP_NO", schema = "YINGXIN", catalog = "")
 public class GroupNoEntity {
     private String groupNo;
     private Long taskId;

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

@@ -5,7 +5,7 @@ import java.sql.Time;
 import java.util.Objects;
 
 @Entity
-@Table(name = "PERSON_POST", schema = "YX", catalog = "")
+@Table(name = "PERSON_POST", schema = "YINGXIN", catalog = "")
 public class PersonPostEntity {
     private String waybillNumber;
     private String backWaybillNumber;

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

@@ -5,7 +5,7 @@ import java.sql.Time;
 import java.util.Objects;
 
 @Entity
-@Table(name = "PLASTIC_FILM", schema = "YX", catalog = "")
+@Table(name = "PLASTIC_FILM", schema = "YINGXIN", catalog = "")
 public class PlasticFilmEntity {
     private long plasticFilmId;
     private Time saveDate;

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

@@ -5,7 +5,7 @@ import java.sql.Time;
 import java.util.Objects;
 
 @Entity
-@Table(name = "POLICE_STATION_APPLY_REASON", schema = "YX", catalog = "")
+@Table(name = "POLICE_STATION_APPLY_REASON", schema = "YINGXIN", catalog = "")
 public class PoliceStationApplyReasonEntity {
     private long policeStationApplyReasonId;
     private Time saveDate;

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

@@ -5,7 +5,7 @@ import java.sql.Time;
 import java.util.Objects;
 
 @Entity
-@Table(name = "POLICE_STATION_VAILED", schema = "YX", catalog = "")
+@Table(name = "POLICE_STATION_VAILED", schema = "YINGXIN", catalog = "")
 public class PoliceStationVailedEntity {
     private long policeStationVailedId;
     private Long taskId;

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

@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.Objects;
 
 @Entity
-@Table(name = "PREPRO_PERSON", schema = "YX", catalog = "")
+@Table(name = "PREPRO_PERSON", schema = "YINGXIN", catalog = "")
 public class PreproPersonEntity {
     private String jmsfzslh;
     private String gmsfhm;

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

@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.Objects;
 
 @Entity
-@Table(name = "PRINTER_DIC", schema = "YX", catalog = "")
+@Table(name = "PRINTER_DIC", schema = "YINGXIN", catalog = "")
 public class PrinterDicEntity {
     private long printerId;
     private String printerName;

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

@@ -5,7 +5,7 @@ import java.sql.Time;
 import java.util.Objects;
 
 @Entity
-@Table(name = "RECEIPT_LIST", schema = "YX", catalog = "")
+@Table(name = "RECEIPT_LIST", schema = "YINGXIN", catalog = "")
 public class ReceiptListEntity {
     private long id;
     private Long taskId;

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

@@ -5,7 +5,7 @@ import java.sql.Time;
 import java.util.Objects;
 
 @Entity
-@Table(name = "SPECIAL_CARD", schema = "YX", catalog = "")
+@Table(name = "SPECIAL_CARD", schema = "YINGXIN", catalog = "")
 public class SpecialCardEntity {
     private long specialCardId;
     private String acceptNo;

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

@@ -5,7 +5,7 @@ import java.sql.Time;
 import java.util.Objects;
 
 @Entity
-@Table(name = "TASK", schema = "YX", catalog = "")
+@Table(name = "TASK", schema = "YINGXIN", catalog = "")
 public class TaskEntity {
     private long taskId;
     private Long cardType;

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

@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.Objects;
 
 @Entity
-@Table(name = "TASK_STATE_DIC", schema = "YX", catalog = "")
+@Table(name = "TASK_STATE_DIC", schema = "YINGXIN", catalog = "")
 public class TaskStateDicEntity {
     private long taskStateId;
     private String taskState;

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

 package com.yxproject.start.mapper;
 
-import com.yxproject.start.entity.TaskList.TaskListEntity;
 import com.yxproject.start.entity.TaskList.CountCountyEntity;
 import com.yxproject.start.entity.TaskList.CountGajgEntity;
+import com.yxproject.start.entity.TaskList.TaskListEntity;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author Administrator
@@ -16,15 +15,16 @@ public interface TaskListMapper {
 
     /**
      * 区县计数查询
+     * 受理库
      * @param submitDate
      * @return
      */
     @Select(" SELECT coun.COUNTYNAME,substr(act.upload_no,0,6),count(*) as count FROM ACC_CARD_T@ACCU_DBLINK act ,count()" +
             "   LEFT JOIN ACC_GROUP_T@ACCU_DBLINK  agt on substr(act.accept_no,0,8) = agt.group_no " +
-            "   LEFT JOIN AUXILIARY.COUNTY_DIC coun on substr(act.upload_no,0,6) = AUXILIARY.coun.county_code " +
-            "   WHERE agt.group_no not in (select AUXILIARY.GROUP_NO.group_no from AUXILIARY.GROUP_NO) " +
+            "   LEFT JOIN COUNTY_DIC coun on substr(act.upload_no,0,6) = coun.county_code " +
+            "   WHERE agt.group_no not in (select GROUP_NO.group_no from GROUP_NO) " +
             "   and to_char(IMPORT_TIME,'yyyymmdd') = #{submitDate} " +
-            "   GROUP by coun.COUNTYNAME,substr(act.upload_no,0,6);")
+            "   GROUP by coun.COUNTYNAME,substr(act.upload_no,0,6)")
     public List<CountCountyEntity> selectByCounty(@Param("submitDate") String submitDate);
 
 
@@ -37,11 +37,11 @@ public interface TaskListMapper {
     @Select("SELECT gajg.gajg_mc,substr(act.upload_no,0,9),count(*) as gajg\n" +
             "  FROM ACC_CARD_T@ACCU_DBLINK act  \n" +
             "  LEFT JOIN ACC_GROUP_T@ACCU_DBLINK  agt on substr(act.accept_no,0,8) = agt.group_no  \n" +
-            "  LEFT JOIN AUXILIARY.GAJG_DM gajg on substr(act.upload_no,0,9) = AUXILIARY.gajg.gajg_dm\n" +
-            "  WHERE agt.group_no not in (select AUXILIARY.GROUP_NO.group_no from AUXILIARY.GROUP_NO) \n" +
+            "  LEFT JOIN GAJG_DM gajg on substr(act.upload_no,0,9) = gajg.gajg_dm\n" +
+            "  WHERE agt.group_no not in (select GROUP_NO.group_no from GROUP_NO) \n" +
             "  and to_char(IMPORT_TIME,'yyyymmdd') = #{submitDate} \n" +
             "  and substr(act.upload_no,0,6) = #{countyCode}\n" +
-            "  GROUP by gajg.GAJG_MC,substr(act.upload_no,0,9);")
+            "  GROUP by gajg.GAJG_MC,substr(act.upload_no,0,9)")
     public List<CountGajgEntity> selectByGajg(@Param("submitDate") String submitDate,@Param("countyCode") String countyCount);
 
 
@@ -54,10 +54,10 @@ public interface TaskListMapper {
      */
     @Select("SELECT act.ACCEPT_NO, agt.deal_flag, gajg.gajg_mc, gajg.gajg_dm, coun.COUNTYNAME,agt.group_no\n" +
             "  FROM ACC_CARD_T@ACCU_DBLINK act \n"+
-            "  LEFT JOIN AUXILIARY.COUNTY_DIC coun on substr(act.upload_no,0,6) = AUXILIARY.coun.county_code " +
+            "  LEFT JOIN COUNTY_DIC coun on substr(act.upload_no,0,6) = coun.county_code " +
             "  LEFT JOIN ACC_GROUP_T@ACCU_DBLINK  agt on substr(act.accept_no,0,8) = agt.group_no  \n" +
-            "  LEFT JOIN AUXILIARY.GAJG_MC gajg on substr(act.upload_no,0,9) = AUXILIARY.gajg.gajg_dm\n"+
-            "  WHERE agt.group_no not in (select AUXILIARY.GROUP_NO.group_no from AUXILIARY.GROUP_NO) " +
+            "  LEFT JOIN GAJG_MC gajg on substr(act.upload_no,0,9) = gajg.gajg_dm\n"+
+            "  WHERE agt.group_no not in (select GROUP_NO.group_no from GROUP_NO) " +
             "  and to_char(IMPORT_TIME,'yyyymmdd') = #{submitDate} " +
             "  and gajg.gajg_dm = #{Gajg} " +
             "  and coun.county_code = #{countyCode}")
@@ -80,8 +80,15 @@ public interface TaskListMapper {
     @Update("UPDATE TASK SET TASK_STATE_ID=1 WHERE TASK_ID = #{taskId} ")
     public boolean updateState(@Param("taskId") String taskId);
 
-    @Update("UPDATE TASK SET TASK_")
-    public boolean updateDate (@Param("unload_date")String unloadDate);
+
+    /**
+     * 区县计数查询
+     * 辅助库
+     * @param submitDate
+     * @return
+     */
+    @Select("")
+    public List<CountCountyEntity> selectTaskByCounty(@Param("submitDate") String submitDate,@Param("taskState")String taskState);