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

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

@@ -275,18 +275,7 @@ public class TaskListApi {
         String date = jsonObject.getString("date");
         String name = jsonObject.getString("name");
 
-//        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<Map<String, Object>> objects = taskListService.selectGroupAtACCU(replaceDate(date), typeCode, countyCode);
-//                boolean b = taskListService.saveTask(objects, name, 0 + "");
-//            }
-//        }
         //生成某几个组的区县任务单
         if (jsonGroup.size() > 0) {
             List<List<String>> listList = jsonGroup;
@@ -304,9 +293,6 @@ public class TaskListApi {
                 boolean b = taskListService.saveTask(objects, name, 0 + "");
             }
 
-//            List<String> groupList = (List<String>) jsonGroup;
-
-
         }
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("msg", "成功生成任务单");

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

@@ -74,7 +74,7 @@ public interface FailedCardMapper {
 
 
     @Select("select prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,6) as COUNTY_CODE,task.CARD_TYPE\n" +
-            " ,task.work_gruop from prod_card_t@prod_link\n" +
+            " ,task.work_group from prod_card_t@prod_link\n" +
             "left join group_no on subStr(prod_card_t.ACCEPT_NO,0,8)=group_no.group_no "+
             "left join task on group_no.task_id = task.task_id "+
             "where  prod_card_t.accept_no=#{acceptNo} or prod_card_t.ID_NO=#{acceptNo}")

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

 package com.yxproject.start.service.impl;
 
-import com.yxproject.start.entity.CardDetailedListEntity;
 import com.yxproject.start.entity.DetailReceiptListEntity;
 import com.yxproject.start.mapper.CardDetailedListMapper;
 import com.yxproject.start.service.CardDetailedListService;

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

@@ -1230,6 +1230,7 @@ public class TaskListServiceImpl implements TaskListService {
                 String countyName = null;
                 String countyCode = null;
                 Object submitDate = null;
+                String workGroup = null;
                 List<Map<String, Object>> countyMapList = mapList.get(taskId);
                 for (Map<String, Object> countyMap : countyMapList) {
                     submitDate = countyMap.get("SUBMIT_DATE");
@@ -1241,6 +1242,7 @@ public class TaskListServiceImpl implements TaskListService {
                     validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
                     specialCount += Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
+                    workGroup = countyMap.get("WORK_GROUP") + "";
                 }
                 if (countyMapList.size() == 1) {
                     countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
@@ -1271,6 +1273,7 @@ public class TaskListServiceImpl implements TaskListService {
                 countyMapGroup.put("countyName", countyName);
                 countyMapGroup.put("countyValidCount", validCount);
                 countyMapGroup.put("countyInvalidCount", invalidCount);
+                countyMapGroup.put("workGroup",workGroup);
                 countyList.add(countyMapGroup);
             }
             mapType.put("typeCode", typeName);

src/main/resources/static/dialogs/gotoDistributeByMdy.html

@@ -20,7 +20,7 @@
 </div>
 <div class="ui-dialog-confirm">
     <div style="text-align: right;margin-bottom: 10px;">本次转出总数：{{selectCount}}</div>
-    <button type="submit" class="btn btn-info create" ng-click="confirmGoTo()">确认下发</button>
+    <button type="submit" class="btn btn-info create" ng-click="confirmGoTo()">确认</button>
     <button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
 </div>
 

src/main/resources/static/dialogs/gotoDistributeByYdw.html

@@ -22,7 +22,7 @@
 </div>
 <div class="ui-dialog-confirm">
     <div style="text-align: right;margin-bottom: 10px;">本次转出总数：{{selectCount}}</div>
-    <button type="submit" class="btn btn-info create" ng-click="confirmGoTo()">确认下发</button>
+    <button type="submit" class="btn btn-info create" ng-click="confirmGoTo()">确认</button>
     <button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
 </div>
 

src/main/resources/static/views/dispatchTask/dispatchTask.html

@@ -129,6 +129,7 @@
                             <th>合格数量</th>
                             <th>不合格数量</th>
                             <th>特殊证件数量</th>
+                            <th>工作组</th>
                             <th></th>
                         </tr>
                       </thead>
@@ -140,6 +141,8 @@
                         <td class="mailbox-attachment">{{task.countyValidCount}}</td>
                         <td class="mailbox-date">{{task.countyInvalidCount}}</td>
                         <td class="mailbox-date">{{task.specialCount}}</td>
+                          <td class="mailbox-attachment text-red" ng-if="task.workGroup==1">A组</td>
+                          <td class="mailbox-attachment text-green" ng-if="task.workGroup==2">B组</td>
                         <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
                       </tr>
                        <tr ng-if="task.taskId==taskId">

src/main/resources/static/views/task/taskListPrint.html

@@ -149,7 +149,8 @@
                         <td class="mailbox-subject">{{task.countyValidCount}}</td>
                         <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                         <td class="mailbox-attachment">{{task.specialCount}}</td>
-                        <td class="mailbox-attachment">{{task.workGroup}}</td>
+                          <td class="mailbox-attachment text-red" ng-if="task.workGroup==1">A组</td>
+                          <td class="mailbox-attachment text-green" ng-if="task.workGroup==2">B组</td>
                         <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
                       </tr>
                       <tr ng-if="task.taskId==taskId">