Merge remote-tracking branch 'origin/dev' into dev

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

@@ -248,30 +248,31 @@ public class TaskListApi {
         JSONObject jsonObject = JSONObject.fromObject(str);
         String date = jsonObject.getString("date");
         String name = jsonObject.getString("name");
-//        String process = jsonObject.getString("tag");
         JSONArray jsonCounty = jsonObject.getJSONArray("countyList");
         JSONArray jsonGroup = jsonObject.getJSONArray("groupList");
         List<Map<String, Object>> countyList = (List<Map<String, Object>>) jsonCounty;
+        if (countyList.size()>0){
             //正常生成区县任务单
             for (Map<String, Object> map : countyList) {
                 String typeCode = map.get("typeCode").toString();
                 String countyCode = map.get("countyCode").toString();
-            List<Object> objects = taskListService.selectGroupAtACCU(replaceDate(date), typeCode, countyCode);
+                List<Map<String,Object>> objects = taskListService.selectGroupAtACCU(replaceDate(date), typeCode, countyCode);
                 boolean b = taskListService.saveTask(objects, name, 0 + "");
             }
+        }
         //生成某几个组的区县任务单
         if (jsonGroup.size() > 0) {
             List<String> groupList = (List<String>) jsonGroup;
             //查询组号详情
-            String groupNo = "(";
+            String groupNo = "";
             for (int i = 0; i < groupList.size(); i++) {
                 if (i != groupList.size() - 1) {
-                    groupNo = groupNo + groupList.get(i) + ",";
+                    groupNo = ""+groupNo + groupList.get(i) + ",";
                 } else {
-                    groupNo = groupNo + groupList.get(i) + ")";
+                    groupNo = ""+groupNo + groupList.get(i) + "";
                 }
             }
-            List<Object> objects = taskListService.selectGroupAtACCU(groupNo);
+            List<Map<String,Object>> objects = taskListService.selectGroupAtACCU(groupNo);
             boolean b = taskListService.saveTask(objects, name, 0 + "");
         }
         Map<String,Object> map = new LinkedHashMap<>();

src/main/java/com/yxproject/start/entity/TaskList/GroupEntity.java

+package com.yxproject.start.entity.TaskList;
+
+import org.springframework.stereotype.Component;
+
+import java.util.Objects;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/15   19:46
+ */
+@Component
+public class GroupEntity {
+    private long cardTypeId;
+    private String groupNo;
+    private long validCount;
+    private long invalidCount;
+    private String countyCode;
+
+    public long getCardTypeId() {
+        return cardTypeId;
+    }
+
+    public void setCardTypeId(long cardTypeId) {
+        this.cardTypeId = cardTypeId;
+    }
+
+    public String getGroupNo() {
+        return groupNo;
+    }
+
+    public void setGroupNo(String groupNo) {
+        this.groupNo = groupNo;
+    }
+
+    public long getValidCount() {
+        return validCount;
+    }
+
+    public void setValidCount(long validCount) {
+        this.validCount = validCount;
+    }
+
+    public long getInvalidCount() {
+        return invalidCount;
+    }
+
+    public void setInvalidCount(long invalidCount) {
+        this.invalidCount = invalidCount;
+    }
+
+    public String getCountyCode() {
+        return countyCode;
+    }
+
+    public void setCountyCode(String countyCode) {
+        this.countyCode = countyCode;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GroupEntity that = (GroupEntity) o;
+        return cardTypeId == that.cardTypeId &&
+                validCount == that.validCount &&
+                invalidCount == that.invalidCount &&
+                Objects.equals(groupNo, that.groupNo) &&
+                Objects.equals(countyCode, that.countyCode);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(cardTypeId, groupNo, validCount, invalidCount, countyCode);
+    }
+}

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

@@ -4,6 +4,7 @@ import com.yxproject.start.entity.GroupNoEntity;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface GroupNoMapper {
@@ -38,4 +39,22 @@ public interface GroupNoMapper {
      */
     @Update("update GROUP_NO set SPECIAL_CARD_COUNT = #{specialCardCount} where id = #{id}")
     public boolean updateGroupNoSpecialCount(GroupNoEntity groupNoEntity);
+
+    /**
+     * 查询组号列表
+     * 受理库
+     * @param groupNo 组号信息
+     * @return
+     */
+    @Select("select DISTINCT CARD_TYPE_DIC.card_type_id, ACC_GROUP_T.group_no ,ACC_GROUP_T.valid_count,ACC_GROUP_T.invalid_count, county_dic.county_code\n" +
+            "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 is not null and ACC_GROUP_T.deal_flag =3 and" +
+            " ACC_GROUP_T.group_no in  (#{groupNo} ) ")
+    public List<Map<String,Object>> selectGroupAtACCUByGroupNo(@Param("groupNo") String groupNo);
+
+
 }

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

@@ -105,21 +105,6 @@ public interface TaskListMapper {
             "and decode(substr(ORIGINAL_NO,3,2),'99',6,substr(ORIGINAL_NO,21,1)) =#{typeCode} and substr(acc_card_t.upload_no,0,6) =#{countyCode}")
     public List<Map<String,Object>> selectGroupAtACCUByCountyCode(@Param("date") String date,@Param("typeCode") String typeCode,@Param("countyCode") String countyCode);
 
-    /**
-     * 查询组号列表
-     * 受理库
-     * @param groupNo 组号信息
-     * @return
-     */
-    @Select("select DISTINCT CARD_TYPE_DIC.card_type_id, ACC_GROUP_T.group_no ,ACC_GROUP_T.valid_count,ACC_GROUP_T.invalid_count, county_dic.county_code\n" +
-            "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 is not null and ACC_GROUP_T.deal_flag =3 and" +
-            " ACC_GROUP_T.group_no in #{groupNo} ")
-    public List<Map<String,Object>> selectGroupAtACCUByGroupNo(@Param("groupNo") String groupNo);
 
 
     /**

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

@@ -39,13 +39,13 @@ public interface TaskListService {
 
     public List<Object> selectByCountyAtAuxiliary3(long process);
 
-    public List<Object> selectGroupAtACCU(String date,String typeCode,String countyCode);
+    public List<Map<String,Object>> selectGroupAtACCU(String date,String typeCode,String countyCode);
 
-    public List<Object> selectGroupAtACCU(String groupNo);
+    public List<Map<String,Object>> selectGroupAtACCU(String groupNo);
 
     public boolean saveTask(TaskEntity taskEntity);
 
-    public boolean saveTask(List<Object> list,String submitName,String process);
+    public boolean saveTask(List<Map<String,Object>> list,String submitName,String process);
 
     public List<Map<String,Object>> selectFastCardAtACCU(String groupNo);
 

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

@@ -453,7 +453,7 @@ public class TaskListServiceImpl implements TaskListService {
      * @return
      */
     @Override
-    public List selectGroupAtACCU(String date, String typeCode, String countyCode) {
+    public List<Map<String,Object>> selectGroupAtACCU(String date, String typeCode, String countyCode) {
         return taskListMapper.selectGroupAtACCUByCountyCode(date, typeCode, countyCode);
     }
 
@@ -465,8 +465,8 @@ public class TaskListServiceImpl implements TaskListService {
      * @return
      */
     @Override
-    public List selectGroupAtACCU(String groupNo) {
-        return taskListMapper.selectGroupAtACCUByGroupNo(groupNo);
+    public List<Map<String,Object>> selectGroupAtACCU(String groupNo) {
+        return groupNoMapper.selectGroupAtACCUByGroupNo(groupNo);
     }
 
     /**
@@ -489,8 +489,8 @@ public class TaskListServiceImpl implements TaskListService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean saveTask(List<Object> list, String submitName, String process) {
-        Map<String, Object> stringObjectMap = (Map<String, Object>) list.get(0);
+    public boolean saveTask(List<Map<String,Object>> list, String submitName, String process) {
+        Map<String, Object> stringObjectMap =  list.get(0);
         TaskEntity taskEntity = new TaskEntity();
         taskEntity.setCardType(Long.valueOf(stringObjectMap.get("CARD_TYPE_ID") + ""));
         taskEntity.setCountyCode(stringObjectMap.get("COUNTY_CODE") + "");